Merge from master with doc updates

cypress/platform/current.html

@@ -39,11 +39,19 @@ sequenceDiagram
    Bob->>Alice: I'm short though
       </div>
       <div class="mermaid" style="width: 50%; height: 200px;">
-        %%{init: {'config': {'wrap': true }}}%%
-        sequenceDiagram
-        participant A as Extremely utterly
-        A->>Bob:  long line of longness which had preivously overflown the actor box as it is much longer than what it should be
-        Bob-->A: Pasten !      </div>
+        %%{init: {'securityLevel': 'loose'}}%%
+      graph TD
+        A[Christmas] -->|Get money| B(Go shopping)
+        B --> C{{Let me think...<br />Do I want something for work,<br />something to spend every free second with,<br />or something to get around?}}
+        C -->|One| D[Laptop]
+        C -->|Two| E[iPhone]
+        C -->|Three| F[Car]
+        click A "index.html#link-clicked" "link test"
+        click B callback "click test"
+        classDef someclass fill:#f96;
+        class A someclass;
+        class C someclass;
+      </div>
       <div class="mermaid2" style="width: 50%; height: 200px;">
 
       flowchart BT
@@ -80,13 +88,13 @@ stateDiagram-v2
         // arrowMarkerAbsolute: true,
         // themeCSS: '.edgePath .path {stroke: red;} .arrowheadPath {fill: red;}',
         logLevel: 0,
-        flowchart: { curve: 'linear', "htmlLabels": false },
+        flowchart: { curve: 'cardinal', "htmlLabels": false },
         // gantt: { axisFormat: '%m/%d/%Y' },
         sequence: { actorMargin: 50, showSequenceNumbers: true },
         // sequenceDiagram: { actorMargin: 300 } // deprecated
         fontFamily: '"arial", sans-serif',
-        curve: 'linear',
-        securityLevel: 'loose'
+        curve: 'cardinal',
+        securityLevel: 'strict'
       });
       function callback(){alert('It worked');}
     </script>