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 Aug 2, 2021
2 parents f74b856 + 35c9d04 commit 4e37717
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/builds/guides/frameworks/angular.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Note that to allow importing JavaScript files without providing their correspond

### Using the editor with collaboration plugins

The easiest way to integrate [collaboration plugins](https://ckeditor.com/docs/ckeditor5/latest/features/collaboration/collaboration.html) in an Angular application is to create a custom build first and later import it from the Angular application — see [Using a custom CKEditor 5 build](#using-a-custom-ckeditor-5-build).
The easiest way to integrate {@link features/collaboration collaboration plugins} in an Angular application is to create a custom build first and later import it from the Angular application — see [Using a custom CKEditor 5 build](#using-a-custom-ckeditor-5-build).

For such scenario we provide a few ready-to-use integrations featuring collaborative editing in Angular applications:

Expand Down
4 changes: 2 additions & 2 deletions docs/builds/guides/frameworks/react.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ The editor event callbacks (`onChange`, `onBlur`, `onFocus`) receive two argumen

## Context feature

The [`@ckeditor/ckeditor5-react`](https://www.npmjs.com/package/@ckeditor/ckeditor5-react) package provides a ready-to-use component for the [context feature](https://ckeditor.com/docs/ckeditor5/latest/features/collaboration/context-and-collaboration-features.html) that is useful when used together with some [CKEditor 5 collaboration features](https://ckeditor.com/docs/ckeditor5/latest/features/collaboration/collaboration.html).
The [`@ckeditor/ckeditor5-react`](https://www.npmjs.com/package/@ckeditor/ckeditor5-react) package provides a ready-to-use component for the {@link features/context-and-collaboration-features context feature} that is useful when used together with some {@link features/collaboration CKEditor 5 collaboration features}.

```jsx
// This sample assumes that the application is using a CKEditor 5 editor built from source.
Expand Down Expand Up @@ -237,7 +237,7 @@ export default App;

### Using the editor with collaboration plugins

The easiest way to integrate [collaboration plugins](https://ckeditor.com/docs/ckeditor5/latest/features/collaboration/collaboration.html) in a React application is to build the editor from source including the collaboration plugins together with the React application.
The easiest way to integrate {@link features/collaboration collaboration plugins} in a React application is to build the editor from source including the collaboration plugins together with the React application.

For such a scenario we provide a few ready-to-use integrations featuring collaborative editing in React applications:

Expand Down

0 comments on commit 4e37717

Please sign in to comment.