Merge branch 'develop' into fix/lint-warnings

docsifyjs · Oct 8, 2020 · 05350f3 · 05350f3
2 parents 82f9c6f + 761210c
commit 05350f3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -493,6 +493,19 @@ window.$docsify = {
 };
 ```
 
+## crossOriginLinks
+- type: `Array`  
+
+When `routerMode: 'history'`, you may face the cross-origin issues, See [#1379](https://github.com/docsifyjs/docsify/issues/1379).  
+In Markdown content, there is a simple way to solve it, see extends Markdown syntax `Cross-Origin link` in [helpers](helpers.md).  
+```js
+window.$docsify = {
+  crossOriginLinks:[
+      "https://example.com/cross-origin-link",
+   ],
+};
+```
+
 ## noCompileLinks
 
 - type: `Array`

diff --git a/docs/helpers.md b/docs/helpers.md
@@ -4,7 +4,7 @@ docsify extends Markdown syntax to make your documents more readable.
 
 > Note: For the special code syntax cases, you'd better put them within a code backticks to avoid any conflicting from configurations or emojis.
 
-## important content
+## Important content
 
 Important content like: