- sequenceDiagram
- Alice->>John: Hello John, how are you?
- loop Healthcheck
- John->>John: Fight against hypochondria
+
+ flowchart LR
+ a --> b
+
+ subgraph id1 [Test]
+ a --apa--> c
+ b
+ c-->b
+ b-->H
+ end
+ G-->H
+ G-->c
+
+
+ flowchart LR
+ subgraph id1 [Test]
+ b
+ end
+ a-->id1
+
+
+ stateDiagram
+ [*] --> Still
+ Still --> [*]
+
+
+ stateDiagram-v2
+ [*] --> Still
+ Still --> [*]
+ Still --> Moving
+ Moving --> Still
+ Moving --> Crash
+ Crash --> [*]
+
+
+ stateDiagram-v2
+ State1: The state with a note
+ note right of State1
+ Important information! You can write
+ notes.
+ end note
+ State1 --> State2
+ note left of State2 : This is the note to the left.
+
+
+ stateDiagram-v2
+ [*]-->TV
+
+ state TV {
+ [*] --> Off: Off to start with
+ On --> Off : Turn off
+ Off --> On : Turn on
+ }
+
+ TV--> Console
+
+ state Console {
+ [*] --> Off2: Off to start with
+ On2--> Off2 : Turn off
+ Off2 --> On2 : Turn on
+ On2-->Playing
+
+ state Playing {
+ Alive --> Dead
+ Dead-->Alive
+ }
+ }
+
+
+
+
+
+ stateDiagram-v2
+ state apa {
+ [*] --> Still
+ Still --> [*]
+
+ Still --> Moving
+ Moving --> Still
+ Moving --> Crash
+ Crash --> [*]
+ }
+
+
+
+ flowchart TB
+ a --> b
+
+ subgraph id1 [Test]
+ a --apa--> c
+ b
+ c-->b
+ b-->H
+ end
+ G-->H
+ G-->id1
+ id1 --> I
+ I --> G
+
+
+ flowchart RL
+ a --> b
+
+ subgraph id1 [Test]
+ a --apa--> c
+ b
+ c-->b
+ b-->H
+ end
+ G-->H
+ G-->id1
+ id1 --> I
+ I --> G
+
+
+ flowchart RL
+
+ subgraph id1 [Test]
+ a
end
- Note right of John: Rational thoughts!
- John-->>Alice: Great!
- John->>Bob: How about you?
- Bob-->>John: Jolly good!
+ b-->id1
+
+
+ flowchart RL
+ subgraph id1 [Test1]
+ a
+ end
+ subgraph id2 [Test2]
+ b
+ end
+ a --> id2
+ a --> b
+ b-->id1
+ id1 --> id2
+ new:
+
+ flowchart LR
+ a <--> b
+ b o--o c
+ c x--x d
+ a21([In the box]) --> b2
+ b2((b2)) --o c2
+ c2(c2) --x d2 --> id1{{This is the text in the box}} --> A[(cylindrical
shape
test)]
+
+ old:
+
+ graph LR
+ a((a)) --> b --> id1{{This is the text in the box}}
+ A[(cylindrical
shape
test)]
+
+
diff --git a/docs/entityRelationshipDiagram.md b/docs/entityRelationshipDiagram.md
new file mode 100644
index 0000000000..da5bf4b0d0
--- /dev/null
+++ b/docs/entityRelationshipDiagram.md
@@ -0,0 +1,80 @@
+# Entity Relationship Diagrams
+
+> An entity–relationship model (or ER model) describes interrelated things of interest in a specific domain of knowledge. A basic ER model is composed of entity types (which classify the things of interest) and specifies relationships that can exist between entities (instances of those entity types). Wikipedia.
+
+Note that practitioners of ER modelling almost always refer to entity types simply as entities. For example the CUSTOMER entity type would be referred to simply as the CUSTOMER entity. This is so common it would be inadvisable to do anything else, but technically an entity is an abstract *instance* of an entity type, and this is what an ER diagram shows - abstract instances, and the relationships between them. This is why entities are always named using singular nouns.
+
+Mermaid can render ER diagrams
+```
+erDiagram
+ CUSTOMER ||--o{ ORDER : places
+ ORDER ||--|{ LINE-ITEM : contains
+ CUSTOMER }|..|{ : DELIVERY-ADDRESS : uses
+```
+```mermaid
+erDiagram
+ CUSTOMER ||--o{ ORDER : places
+ ORDER ||--|{ LINE-ITEM : contains
+ CUSTOMER }|..|{ : DELIVERY-ADDRESS : uses
+```
+
+Entity names are often capitalised, although there is no accepted standard on this, and it is not required in Mermaid.
+
+Relationships between entities are represented by lines with end markers representing cardinality. Mermaid uses the most popular crow's foot notation. The crow's foot intuitively conveys the possibility of many instances of the entity that it connects to.
+
+## Status
+
+ER diagrams are a new feature in Mermaid and are **experimental**. There are likely to be a few bugs and constraints, and enhancements will be made in due course.
+
+## Syntax
+
+### Entities and Relationships
+
+Mermaid syntax for ER diagrams is compatible with PlantUML, with an extension to label the relationship. Each statement consists of the following parts, all of which are mandatory:
+```
+
:
+```
+Where:
+
+- `first-entity` is the name of an entity. Names must begin with an alphabetic character and may also contain digits and hyphens
+- `relationship` describes the way that both entities inter-relate. See below.
+- `second-entity` is the name of the other entity
+- `relationship-label` describes the relationship from the perspective of the first entity.
+
+For example:
+
+```
+ PROPERTY ||--|{ ROOM : contains
+```
+
+This statement can be read as *a property contains one or more rooms, and a room is part of one and only one property*. You can see that the label here is from the first entity's perspective: a property contains a room, but a room does not contain a property. When considered from the perspective of the second entity, the equivalent label is usually very easy to infer. (Some ER diagrams label relationships from both perspectives, but this is not supported here, and is usually superfluous).
+
+### Relationship Syntax
+
+The `relationship` part of each statement can be broken down into three sub-components:
+
+- the cardinality of the first entity with respect to the second,
+- whether the relationship confers identity on a 'child' entity
+- the cardinality of the second entity with respect to the first
+
+Cardinality is a property that describes how many elements of another entity can be related to the entity in question. In the above example a `PROPERTY` can have one or more `ROOM` instances associated to it, whereas a `ROOM` can only be associated with one `PROPERTY`. In each cardinality marker there are two characters. The outermost character represents a maximum value, and the innermost character represents a minimum value. The table below summarises possible cardinalities.
+
+| Value (left) | Value (right) | Meaning |
+|:------------:|:-------------:|--------------------------------------------------------|
+| `|o` | `o|` | Zero or one |
+| `||` | `||` | Exactly one |
+| `}o` | `o{` | Zero or more (no upper limit) |
+| `}|` | `|{` | One or more (no upper limit) |
+
+### Identification
+
+Relationships may be classified as either *identifying* or *non-identifying* and these are rendered with either solid or dashed lines respectively. This is relevant when one of the entities in question can not have independent existence without the other. For example a firm that insures people to drive cars might need to store data on `NAMED-DRIVER`s. In modelling this we might start out by observing that a `CAR` can be driven by many `PERSON` instances, and a `PERSON` can drive many `CAR`s - both entities can exist without the other, so this is a non-identifying relationship that we might specify in Mermaid as: `PERSON }|..|{ CAR : "driver"`. Note the two dots in the middle of the relationship that will result in a dashed line being drawn between the two entities. But when this many-to-many relationship is resolved into two one-to-many relationships, we observe that a `NAMED-DRIVER` cannot exist without both a `PERSON` and a `CAR` - the relationships become identifying and would be specified using hyphens, which translate to a solid line:
+
+```
+ CAR ||--o{ NAMED-DRIVER : allows
+ PERSON ||--o{ NAMED-DRIVER : is
+```
+### Other Things
+
+- If you want the relationship label to be more than one word, you must use double quotes around the phrase
+- If you don't want a label at all on a relationship, you must use an empty double-quoted string
diff --git a/docs/flowchart.md b/docs/flowchart.md
index ee4f0e130d..0d964bdcc7 100644
--- a/docs/flowchart.md
+++ b/docs/flowchart.md
@@ -409,6 +409,22 @@ graph TB
end
```
+ You can also set an excplicit id for the subgraph.
+
+```
+graph TB
+ c1-->a2
+ subgraph ide1 [one]
+ a1-->a2
+ end
+ ```
+```mermaid
+graph TB
+ c1-->a2
+ subgraph id1 [one]
+ a1-->a2
+ end
+ ```
## Interaction
@@ -425,10 +441,10 @@ Examples of tooltip usage below:
```
```
```
@@ -448,28 +464,30 @@ graph LR;
```
> **Success** The tooltip functionality and the ability to link to urls are available from version 0.5.2.
+?> Due to limitations with how Docsify handles JavaScript callback functions, an alternate working demo for the above code can be viewed at [this jsfiddle](https://jsfiddle.net/s37cjoau/3/).
+
Beginners tip, a full example using interactive links in a html context:
```
graph LR;
- A-->B;
- click A callback "Tooltip"
- click B "http://www.github.com" "This is a link"
+ A-->B;
+ click A callback "Tooltip"
+ click B "http://www.github.com" "This is a link"