Merge stable into master

ckeditor · Mar 11, 2021 · 01f695a · 01f695a
2 parents 88aee85 + 7cec237
commit 01f695a
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/docs/umberto.json b/docs/umberto.json
@@ -8,31 +8,37 @@
 	"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",
 		"builds/guides/integration/frameworks/vuejs.html": "builds/guides/integration/frameworks/vuejs-v3.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",
-		"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-collaboration-integration.html",
+		"builds/guides/license-and-legal.html": "builds/guides/support/license-and-legal.html",
+		"builds/guides/migrate.html": "builds/guides/migration/migration-from-ckeditor-4.html",
+		"builds/guides/reporting-issues.html": "builds/guides/support/reporting-issues.html",
+		"features/blocktoolbar.html": "features/toolbar/blocktoolbar.html",
+		"features/ckfinder.html": "features/image-upload/ckfinder.html",
+		"features/collaboration/annotation-customization/annotations-custom-configuration.html": "features/collaboration/annotations/annotations-custom-configuration.html",
+		"features/collaboration/annotation-customization/annotations-custom-template.html": "features/collaboration/annotations/annotations-custom-template.html",
+		"features/collaboration/annotation-customization/annotations-custom-theme.html": "features/collaboration/annotations/annotations-custom-theme.html",
+		"features/collaboration/annotation-customization/annotations-custom-view.html": "features/collaboration/annotations/annotations-custom-view.html",
+		"features/collaboration/annotation-customization/annotations-customization.html": "features/collaboration/annotations/annotations.html",
 		"features/collaboration/collaborative-comments.html": "features/collaboration/real-time-collaboration/real-time-collaboration-integration.html",
-		"features/collaboration/presence-list.html": "features/collaboration/real-time-collaboration/users-in-real-time-collaboration.html",
+		"features/collaboration/collaborative-editing.html": "features/collaboration/real-time-collaboration/real-time-collaboration-integration.html",
 		"features/collaboration/comment-only-mode.html": "features/collaboration/comments/comment-only-mode.html",
+		"features/collaboration/comments/display-mode.html": "features/collaboration/annotations/display-mode.html",
+		"features/collaboration/comments/integrate-comments-with-application.html": "features/collaboration/comments/comments-integration.html",
+		"features/collaboration/overview.html": "features/collaboration/real-time-collaboration/real-time-collaboration.html",
+		"features/collaboration/presence-list.html": "features/collaboration/real-time-collaboration/users-in-real-time-collaboration.html",
 		"features/collaboration/real-time-collaboration/real-time-collaborative-comments.html": "features/collaboration/real-time-collaboration/real-time-collaboration-integration.html",
 		"features/collaboration/real-time-collaboration/real-time-collaborative-editing.html": "features/collaboration/real-time-collaboration/real-time-collaboration-integration.html",
-		"features/image-upload.html": "features/image-upload/image-upload.html",
-		"features/ckfinder.html": "features/image-upload/ckfinder.html",
-		"features/easy-image.html": "features/image-upload/easy-image.html",
-		"features/collaboration/comments/integrate-comments-with-application.html": "features/collaboration/comments/comments-integration.html",
 		"features/collaboration/track-changes.html": "features/collaboration/track-changes/track-changes.html",
-		"features/paste-from-word.html": "features/pasting/paste-from-word.html",
+		"features/easy-image.html": "features/image-upload/easy-image.html",
+		"features/image-upload.html": "features/image-upload/image-upload.html",
 		"features/mathtype.html": "features/math-equations.html",
+		"features/paste-from-word.html": "features/pasting/paste-from-word.html",
 		"features/spell-checker.html": "features/spelling-and-grammar-checking.html",
-		"features/blocktoolbar.html": "features/toolbar/blocktoolbar.html",
-		"builds/guides/migrate.html": "builds/guides/migration/migration-from-ckeditor-4.html"
+		"framework/guides/ui/document-editor.html": "framework/guides/deep-dive/ui/document-editor.html",
+		"framework/guides/ui/external-ui.html": "framework/guides/deep-dive/ui/external-ui.html",
+		"framework/guides/ui/theme-customization.html": "framework/guides/deep-dive/ui/theme-customization.html"
 	},
 	"scripts": {
 		"snippet-adapter": "../scripts/docs/snippetadapter",
@@ -230,9 +236,9 @@
 							"order": 300
 						},
 						{
-							"name": "Annotation customization",
-							"id": "features-annotation-customization",
-							"slug": "annotation-customization",
+							"name": "Annotations",
+							"id": "features-annotations",
+							"slug": "annotations",
 							"order": 400
 						}
 					]