Merge branch 'develop' into joost

markdown/dev/guides/markdown/code-blocks/en.md

@@ -46,3 +46,11 @@ The following language codes are supported:
 - `mdx` for MDX
 - `jsx` for JSX
 - `json` for JSON
+
+<Note>
+
+Note that `mermaid` code blocks will be rendered as
+[Mermaid](https://mermaid.js.org/) diagrams.  Refer to the docs on [custom
+tags](/guides/markdown/custom-components#mermaid) for an example.
+</Note>
+

markdown/dev/guides/markdown/custom-components/en.md

@@ -124,6 +124,37 @@ or can't fix it now.
 </Tab>
 </Tabs>
 
+## Mermaid
+
+Not strictly speaking a custom tag, but by using a fenced code block with the
+`mermaid` language, you can generate [Mermaid](https://mermaid.js.org/)
+diagrams. Like this:
+
+<Tabs tabs="example, markdown">
+<Tab>
+```mermaid
+graph LR;
+    A--> B & C & D;
+    B--> A & E;
+    C--> A & E;
+    D--> A & E;
+    E--> B & C & D;
+```
+</Tab>
+<Tab>
+````markdown
+```mermaid
+graph LR;
+    A--> B & C & D;
+    B--> A & E;
+    C--> A & E;
+    D--> A & E;
+    E--> B & C & D;
+```
+````
+</Tab>
+</Tabs>
+
 ## Note
 
 Use **Note** to add something that stands out to draw attention.

markdown/dev/guides/plugins/store/en.md

@@ -8,7 +8,7 @@ within a pattern.
 
 ## Signature
 
-To provide one or more store methods, your plugin should have a `macros` property that
+To provide one or more store methods, your plugin should have a `store` property that
 is an array where each member is itself an array with two members:
 
 - The first member holds the key to attach the method to (in dot notation)