Tweaked some wording around editors, added cross-links

diff --git a/content/docs/user/markdown-editor.md b/content/docs/user/markdown-editor.md
index 14bd26e55027d4f2fe2362e586682d3602abc8f0..0c902c0119cbdb996182d9f09fa0256af601c84c 100644 (file)
--- a/content/docs/user/markdown-editor.md
+++ b/content/docs/user/markdown-editor.md
@@ -6,6 +6,7 @@ type = "user-doc"
 +++
 
 If you prefer to write in a simpler format, a Markdown editor is available in BookStack. Markdown compatibility generally follows that of [CommonMark](https://commonmark.org/), along with a few extensions including tables and task-lists.
+This is an alternative to the default [WYSIWYG Editor](/docs/user/wysiwyg-editor/).
 
 
 ### Switching to the Markdown Editor
@@ -76,7 +77,7 @@ The following shortcuts are available in the Markdown Editor:
     </tr>
     <tr>
       <td><code>Ctrl+9</code> / <code>Cmd+9</code></td>
-      <td>Callout (Keep pressing to toggle through styles info, success, warning, danger)</td>
+      <td>Callout <br> <small><em>(Keep pressing to toggle through styles)</em></small></td>
     </tr>
     <tr>
       <td>

diff --git a/content/docs/user/wysiwyg-editor.md b/content/docs/user/wysiwyg-editor.md
index 677a84cea1c8db53373c71a11724c9cd5b938d1c..aaa5ea130551e8dadcf9b03b811fba799db290f7 100644 (file)
--- a/content/docs/user/wysiwyg-editor.md
+++ b/content/docs/user/wysiwyg-editor.md
@@ -7,6 +7,8 @@ type = "user-doc"
 
 The default editor in BookStack is a 'What You See Is What You Get' (WYSIWYG) editor.
 The usage of this editor is similar to typical word-processing applications such as Word or Google Docs.
+For those that would prefer it, there is an alternative [Markdown Editor](/docs/user/markdown-editor/)
+which can be set as default or switched to where permissions allow.
 
 ### Editor Shortcuts
 
@@ -72,7 +74,7 @@ The following shortcuts are available in the WYSIWYG Editor:
     </tr>
     <tr>
       <td><code>Ctrl+9</code> / <code>Cmd+9</code></td>
-      <td>Callout (Keep pressing to toggle through styles info, success, warning, danger)</td>
+      <td>Callout <br> <small><em>(Keep pressing to toggle through styles)</em></small></td>
     </tr>
     <tr>
       <td>

diff --git a/hacks b/hacks
index c16f41f20c8e6ac2f38c3271a92a5409d0f89a09..9540c0bf1a1fbe43253a919ddfc0f4e13ea5af65 160000 (submodule)
--- a/hacks
+++ b/hacks
@@ -1 +1 @@
-Subproject commit c16f41f20c8e6ac2f38c3271a92a5409d0f89a09
+Subproject commit 9540c0bf1a1fbe43253a919ddfc0f4e13ea5af65