Merge pull request #5985 from umbraco/RTE-branch

Merged content from two articles into one
umbraco · Mar 27, 2024 · 697cb66 · 697cb66
2 parents b653933 + 52c623e
commit 697cb66
Show file tree

Hide file tree

Showing 37 changed files with 835 additions and 1,501 deletions.
diff --git a/10/umbraco-cms/.gitbook.yaml b/10/umbraco-cms/.gitbook.yaml
@@ -6,3 +6,5 @@ root: ./
 
 redirects:
     tutorials/add-azure-active-directory-authentication: tutorials/add-microsoft-entra-id-authentication.md
+    tutorials/editors-manual/working-with-content/rich-text-editor: tutorials/editors-manual/working-with-content.md
+
diff --git a/10/umbraco-cms/SUMMARY.md b/10/umbraco-cms/SUMMARY.md
@@ -445,7 +445,6 @@
     * [Copying a Page](tutorials/editors-manual/getting-started-with-umbraco/copying-a-page.md)
     * [Deleting and Restoring Pages](tutorials/editors-manual/getting-started-with-umbraco/deleting-and-restoring-pages.md)
   * [Working with Rich Text Editor](tutorials/editors-manual/working-with-content/README.md)
-    * [Rich Text Editor](tutorials/editors-manual/working-with-content/rich-text-editor.md)
   * [Version Management](tutorials/editors-manual/version-management/README.md)
     * [Comparing Versions](tutorials/editors-manual/version-management/comparing-versions.md)
     * [Rollback to a Previous Version](tutorials/editors-manual/version-management/rollback-to-a-previous-version.md)

diff --git a/10/umbraco-cms/tutorials/editors-manual/working-with-content/README.md b/10/umbraco-cms/tutorials/editors-manual/working-with-content/README.md
diff --git a/...tutorials/editors-manual/working-with-content/images/Creating-an-anchor-v11.png b/...tutorials/editors-manual/working-with-content/images/Creating-an-anchor-v11.png
diff --git a/...s/tutorials/editors-manual/working-with-content/images/Delete-an-anchor-v11.png b/...s/tutorials/editors-manual/working-with-content/images/Delete-an-anchor-v11.png
diff --git a/...ls/editors-manual/working-with-content/images/Editing-an-existing-table-v11.png b/...ls/editors-manual/working-with-content/images/Editing-an-existing-table-v11.png
diff --git a/...cms/tutorials/editors-manual/working-with-content/images/Formats-Button-v11.png b/...cms/tutorials/editors-manual/working-with-content/images/Formats-Button-v11.png
diff --git a/...tutorials/editors-manual/working-with-content/images/Formatting-Buttons-v11.png b/...tutorials/editors-manual/working-with-content/images/Formatting-Buttons-v11.png
diff --git a/...cms/tutorials/editors-manual/working-with-content/images/Insert-a-table-v11.png b/...cms/tutorials/editors-manual/working-with-content/images/Insert-a-table-v11.png
diff --git a/...nual/working-with-content/images/Inserting-Image-from-the-Media-Library-v11.png b/...nual/working-with-content/images/Inserting-Image-from-the-Media-Library-v11.png
diff --git a/...ors-manual/working-with-content/images/Inserting-an-Image-from-Computer-v11.png b/...ors-manual/working-with-content/images/Inserting-an-Image-from-Computer-v11.png
diff --git a/...co-cms/tutorials/editors-manual/working-with-content/images/Link-Button-v11.png b/...co-cms/tutorials/editors-manual/working-with-content/images/Link-Button-v11.png
diff --git a/...ms/tutorials/editors-manual/working-with-content/images/Link-from-Image-v11.png b/...ms/tutorials/editors-manual/working-with-content/images/Link-from-Image-v11.png
diff --git a/...orials/editors-manual/working-with-content/images/Link-to-Email-Address-v11.png b/...orials/editors-manual/working-with-content/images/Link-to-Email-Address-v11.png
diff --git a/...tutorials/editors-manual/working-with-content/images/Link-to-Media-File-v11.png b/...tutorials/editors-manual/working-with-content/images/Link-to-Media-File-v11.png
diff --git a/...cms/tutorials/editors-manual/working-with-content/images/Link-to-a-Page-v11.png b/...cms/tutorials/editors-manual/working-with-content/images/Link-to-a-Page-v11.png
diff --git a/...als/editors-manual/working-with-content/images/Link-to-an-external-Page-v11.png b/...als/editors-manual/working-with-content/images/Link-to-an-external-Page-v11.png
diff --git a/.../tutorials/editors-manual/working-with-content/images/Linking-to-Anchor-v11.png b/.../tutorials/editors-manual/working-with-content/images/Linking-to-Anchor-v11.png
diff --git a/...-cms/tutorials/editors-manual/working-with-content/images/Remove-Format-v11.png b/...-cms/tutorials/editors-manual/working-with-content/images/Remove-Format-v11.png
diff --git a/...co-cms/tutorials/editors-manual/working-with-content/images/Remove-link-v11.png b/...co-cms/tutorials/editors-manual/working-with-content/images/Remove-link-v11.png
diff --git a/...o-cms/tutorials/editors-manual/working-with-content/images/Select-Macro-v11.png b/...o-cms/tutorials/editors-manual/working-with-content/images/Select-Macro-v11.png
diff --git a/...aco-cms/tutorials/editors-manual/working-with-content/images/editor_bar_v13.png b/...aco-cms/tutorials/editors-manual/working-with-content/images/editor_bar_v13.png
diff --git a/...s/tutorials/editors-manual/working-with-content/images/table-properties-v11.png b/...s/tutorials/editors-manual/working-with-content/images/table-properties-v11.png
diff --git a/...s/tutorials/editors-manual/working-with-content/images/view-source-code-v11.png b/...s/tutorials/editors-manual/working-with-content/images/view-source-code-v11.png
diff --git a/10/umbraco-cms/tutorials/editors-manual/working-with-content/rich-text-editor.md b/10/umbraco-cms/tutorials/editors-manual/working-with-content/rich-text-editor.md
diff --git a/12/umbraco-cms/.gitbook.yaml b/12/umbraco-cms/.gitbook.yaml
@@ -6,4 +6,5 @@ root: ./
 
 redirects:
     tutorials/add-azure-active-directory-authentication: tutorials/add-microsoft-entra-id-authentication.md
+    tutorials/editors-manual/working-with-content/rich-text-editor: tutorials/editors-manual/working-with-content.md
 
diff --git a/12/umbraco-cms/SUMMARY.md b/12/umbraco-cms/SUMMARY.md
@@ -457,7 +457,6 @@
     * [Copying a Page](tutorials/editors-manual/getting-started-with-umbraco/copying-a-page.md)
     * [Deleting and Restoring Pages](tutorials/editors-manual/getting-started-with-umbraco/deleting-and-restoring-pages.md)
   * [Working with Rich Text Editor](tutorials/editors-manual/working-with-content/README.md)
-    * [Rich Text Editor](tutorials/editors-manual/working-with-content/rich-text-editor.md)
   * [Version Management](tutorials/editors-manual/version-management/README.md)
     * [Comparing Versions](tutorials/editors-manual/version-management/comparing-versions.md)
     * [Rollback to a Previous Version](tutorials/editors-manual/version-management/rollback-to-a-previous-version.md)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,5 @@ root: ./

		redirects:
		tutorials/add-azure-active-directory-authentication: tutorials/add-microsoft-entra-id-authentication.md
		tutorials/editors-manual/working-with-content/rich-text-editor: tutorials/editors-manual/working-with-content.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,5 @@ root: ./

		redirects:
		tutorials/add-azure-active-directory-authentication: tutorials/add-microsoft-entra-id-authentication.md
		tutorials/editors-manual/working-with-content/rich-text-editor: tutorials/editors-manual/working-with-content.md