Skip to content

Commit

Permalink
Merge stable into master
Browse files Browse the repository at this point in the history
  • Loading branch information
CKTravisBot authored Jun 28, 2023
2 parents 1f6fb35 + c6a198c commit 6d2257f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Changelog

![image](https://github.com/ckeditor/ckeditor5/assets/9881379/c3569142-052a-4708-976d-0593f9997e3c)


#### Adjacent lists support

CKEditor 5 introduces an opt-in feature specifically for list handling during Word import or pasting. This feature influences how adjacent lists of the same type (either ordered or unordered) are processed. By default, such lists merge together, but you can prevent this.
Expand Down
8 changes: 4 additions & 4 deletions docs/features/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ Enrich you content further by {@link features/html-embed embedding HTML code} {@

The {@link framework/index CKEditor 5 Framework} was created with {@link features/collaboration collaboration} in mind.

The {@link features/users users API} is used by functions such as {@link features/track-changes track changes} {@icon @ckeditor/ckeditor5-track-changes/theme/icons/track-changes.svg Track changes}, that allow the users to follow any changes made to the edited document in real time. Accepting or rejecting those changes is done with a single click from a convenient side panel.
The {@link features/users users API} is used by functions such as {@link features/track-changes track changes} {@icon @ckeditor/ckeditor5-track-changes/theme/icons/track-changes.svg Track changes}, that allow the users to follow any changes made to the edited document in real-time. Accepting or rejecting those changes is done with a single click from a convenient side panel.

Where tracking changes is not enough, the {@link features/comments comments} {@icon @ckeditor/ckeditor5-comments/theme/icons/add-comment.svg Comments} come in, offering a perfect collaboration communication platform for writing and editing as a team.

Additionally, CKEditor 5 offers the {@link features/restricted-editing restricted editing mode} {@icon @ckeditor/ckeditor5-restricted-editing/theme/icons/contentunlock.svg Enable editing} where only selected parts of the content may be edited by selected users, based on permissions system. And when there is a need for even more control, there is the {@link features/read-only read-only editor mode} that lets the user access the content, but not edit it.
Additionally, CKEditor 5 offers the {@link features/restricted-editing restricted editing mode} {@icon @ckeditor/ckeditor5-restricted-editing/theme/icons/contentunlock.svg Enable editing} where only selected parts of the content may be edited by selected users, based on a permissions system. And when there is a need for even more control, there is the {@link features/read-only read-only editor mode} that lets the user access the content, but not edit it.

{@img assets/img/features-collaboration.png 800 CKEditor 5 collaboration features.}

Expand Down Expand Up @@ -106,7 +106,7 @@ If you want to migrate from CKEditor 4 to CKEditor 5, please check the {@link up

Plenty of these features are included by default in the predefined {@link installation/getting-started/predefined-builds CKEditor 5 builds} and are available out-of-the-box, like {@link features/autoformat autoformatting} or {@link features/keyboard-support keyboard support}.

However, some of the presented features need to be manually included in a customized CKEditor 5 build, for example the {@link features/markdown Markdown processor} which outputs Markdown instead of HTML. These plugins can also be easily and conveniently added to a custom build with the [CKEditor 5 online builder](https://ckeditor.com/ckeditor-5/online-builder/).
However, some of the presented features need to be manually included in a customized CKEditor 5 build, for example, the {@link features/markdown Markdown processor} which outputs Markdown instead of HTML. These plugins can also be easily and conveniently added to a custom build with the [CKEditor 5 online builder](https://ckeditor.com/ckeditor-5/online-builder/).

You can refer to the {@link installation/getting-started/predefined-builds#list-of-plugins-included-in-the-ckeditor-5-predefined-builds full list of features available in each build} for details.

Expand All @@ -117,7 +117,7 @@ We also offer the flexibility of the {@link installation/advanced/dll-builds DLL
Each rich-text editor feature is presented on a separate page, with one or more working demos showcasing a feature along with some customization ideas that you can use in your implementation.

<info-box>
**In most feature demos the number of features enabled is limited** to make the currently highlighted piece of functionality stand out more, as shown in the screenshots above. However, in your CKEditor 5 WYSIWYG editor implementation you are free to choose and combine any features you like from those available. This can be easily and conveniently done in the [CKEditor 5 online builder](https://ckeditor.com/ckeditor-5/online-builder/).
**In most feature demos the number of features enabled is limited** to make the currently highlighted piece of functionality stand out more, as shown in the screenshots above. However, in your CKEditor 5 WYSIWYG editor implementation, you are free to choose and combine any features you like from those available. This can be easily and conveniently done in the [CKEditor 5 online builder](https://ckeditor.com/ckeditor-5/online-builder/).
</info-box>

## Looking for more?
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/integrations/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ We plan to provide more integrations with time. We would like to [hear your idea

## How do I use CKEditor 5 if my framework does not have an official integration?

CKEditor 5 should be compatible with your framework, and initializing it usually requires a single method call. A tighter integration of CKEditor 5 with your framework may require using an existing or writing a new adapter (integration layer) to communicate your framework with CKEditor 5.
CKEditor 5 should be compatible with your framework and initializing it usually requires a single method call. A tighter integration of CKEditor 5 with your framework may require using an existing or writing a new adapter (integration layer) to communicate your framework with CKEditor 5.

When checking how to integrate CKEditor 5 with your framework, you can follow these steps:

Expand Down
2 changes: 1 addition & 1 deletion docs/updating/update-to-38.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ For the entire list of changes introduced in version 38.0.0, see the [release no

Listed below is the minor breaking change that requires your attention when upgrading to CKEditor 5 v38.1.0.

### Changes in the General HTML support feature
### Changes in the General HTML Support feature

The CKEditor 5 version 38.1.0 introduces a minor breaking change. Until this release, the {@link features/general-html-support General HTML Support} (GHS) plugin kept all HTML-specific data in the `htmlAttributes` model attribute, regardless of the element type. However, this approach made it difficult to ensure that attributes did not leak to elements of other types. For example, if you applied some styles to a list, you probably expect new elements in that list to have the same styles, but you do not want them present in the next paragraph or heading.

Expand Down

0 comments on commit 6d2257f

Please sign in to comment.