Skip to content

Commit c50178c

Browse files
committed
Merge branch 'master' of https://github.com/knsv/mermaid
Conflicts: README.md
2 parents 96b12e8 + d4b35b5 commit c50178c

File tree

1 file changed

+30
-5
lines changed

1 file changed

+30
-5
lines changed

README.md

+30-5
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,44 @@ This is why mermaid was born, a simple markdown-like script language for generat
1010
The code below would render the following image
1111
<table>
1212
<tr><td>
13-
|```
13+
<pre>
1414
graph TD;
1515
A-->B;
1616
A-->C;
1717
B-->D;
1818
C-->D;
19-
```
20-
</td></tr>
21-
</table>
19+
</pre>
20+
</td>
21+
<td>
22+
would render this lovely chart:
2223

24+
<img src='http://www.sveido.com/mermaid/img/ex1.png' alt='Example 1'>
25+
</td>
26+
</tr>
27+
<tr>
28+
<td>
29+
<pre>
30+
sequenceDiagram
31+
participant Alice
32+
participant Bob
33+
Alice->John: Hello John, how are you?
34+
loop Healthcheck
35+
John->John: Fight against hypochondria
36+
end
37+
Note right of John: Rational thoughts &lt;br/>prevail...
38+
John-->Alice: Great!
39+
John->Bob: How about you?
40+
Bob-->John: Jolly good!
41+
</pre>
42+
</td>
43+
<td>
2344
would render this lovely chart:
2445

25-
![Example 1](http://www.sveido.com/mermaid/img/ex1.png)
46+
<img src='http://www.sveido.com/mermaid/img/seq1.png' alt='Example 2'>
47+
</td>
48+
</tr>
49+
50+
</table>
2651

2752
A page with a live example can be seen [here](http://www.sveido.com/mermaid/demo/html/web.html). You can also look at mermaid in action using [jsbin](http://jsbin.com/faxunexeku/1/edit?html,output). If you want a live demo, there is an editor provided in the mermaid project or you can simply look at this [great editor](http://danielmschmidt.github.io/mermaid-demo/)
2853

0 commit comments

Comments
 (0)