8
0
Quellcode durchsuchen

Merge branch 'master' into t/1214

Piotrek Koszuliński vor 7 Jahren
Ursprung
Commit
6add0c9521

+ 1 - 1
docs/builds/guides/faq.md

@@ -78,7 +78,7 @@ By default, CKEditor 5 has no global registry of editor instances. But if necess
 
 ## How to enable image drag&drop and upload? Where should I start?
 
-The {@link features/image Image} and {@link features/image-upload Image upload} features are enabled by default in all editor builds. However, to fully enable image upload when installing CKEditor 5 you need to configure one of the available upload adapters ({@link features/image-upload#easy-image Easy Image} or {@link module:adapter-ckfinder/uploadadapter~CKFinderAdapterConfig CKFinder adapter}) or {@link module:upload/filerepository~UploadAdapter implement and use your own upload adapter}.
+The {@link features/image Image} and {@link features/image-upload Image upload} features are enabled by default in all editor builds. However, to fully enable image upload when installing CKEditor 5 you need to configure one of the available upload adapters ({@link features/image-upload#easy-image Easy Image} or {@link module:ckfinder/ckfinder~CKFinderConfig CKFinder adapter}) or {@link module:upload/filerepository~UploadAdapter implement and use your own upload adapter}.
 
 See the {@link features/image Image} and {@link features/image-upload Image upload} feature guides to learn more.
 

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
docs/builds/guides/migrate.md


+ 1 - 1
docs/builds/guides/whats-new.md

@@ -90,7 +90,7 @@ Read more about {@linkTODO collaboration in the CKEditor 5 Framework documentati
 
 With [collaboration services provided by CKEditor Cloud Services](https://ckeditor.com/ckeditor-cloud-services/) it is now extremely easy to provide collaboration features inside your application.
 
-Check the {@link @ckeditor5 features/overview collaboration demo} and read how to enable features such as comments, user presence list or showing the selection of other users in your editor.
+Check the {@link @ckeditor5 features/real-time-collaboration collaboration demo} and read how to enable features such as comments, user presence list or showing the selection of other users in your editor.
 
 [Letters](https://ckeditor.com/letters/) is an example of an application using the power of CKEditor 5 for collaboration.
 

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
docs/framework/guides/overview.md


+ 7 - 1
docs/umberto.json

@@ -6,13 +6,19 @@
 	"path": "docs",
 	"observablesdocs": "module:utils/observablemixin~ObservableMixin",
 	"redirects": {
+		"api/module_adapter-ckfinder_uploadadapter-CKFinderAdapterConfig.html": "api/module_ckfinder_ckfinder-CKFinderConfig.html",
 		"builds/guides/license-and-legal.html": "builds/guides/support/license-and-legal.html",
 		"builds/guides/browser-compatibility.html": "builds/guides/support/browser-compatibility.html",
 		"builds/guides/reporting-issues.html": "builds/guides/support/reporting-issues.html",
 		"builds/guides/development/installing-plugins.html": "builds/guides/integration/installing-plugins.html",
 		"framework/guides/ui/theme-customization.html": "framework/guides/deep-dive/ui/theme-customization.html",
 		"framework/guides/ui/external-ui.html": "framework/guides/deep-dive/ui/external-ui.html",
-		"framework/guides/ui/document-editor.html": "framework/guides/deep-dive/ui/document-editor.html"
+		"framework/guides/ui/document-editor.html": "framework/guides/deep-dive/ui/document-editor.html",
+		"features/collaboration/overview.html": "features/collaboration/real-time-collaboration/real-time-collaboration.html",
+		"features/collaboration/collaborative-editing.html": "features/collaboration/real-time-collaboration/real-time-collaborative-editing.html",
+		"features/collaboration/collaborative-comments.html": "features/collaboration/real-time-collaboration/real-time-collaborative-comments.html",
+		"features/collaboration/presence-list.html": "features/collaboration/real-time-collaboration/presence-list.html",
+		"features/collaboration/comment-only-mode.html": "features/collaboration/comments/comment-only-mode.html"
 	},
 	"scripts": {
 		"snippet-adapter": "../scripts/docs/snippetadapter",