Merge remote-tracking branch 'origin/next' into next

This commit is contained in:
Leo Horie 2014-11-07 23:37:10 -05:00
commit 289c02b882

View file

@ -248,7 +248,7 @@ m("div", "&times;") //becomes <div>&amp;times;</div>
You can unescape trusted HTML strings by using [`m.trust`](mithril.trust.md) You can unescape trusted HTML strings by using [`m.trust`](mithril.trust.md)
```javascript ```javascript
m("div", m.trust("&times;"() //becomes <div>&times;</div> m("div", m.trust("&times;")) //becomes <div>&times;</div>
``` ```
--- ---
@ -580,4 +580,3 @@ where:
- **returns** VirtualElement - **returns** VirtualElement
The returned VirtualElement is a Javascript data structure that represents the DOM element to be rendered by [`m.render`](mithril.render.md) The returned VirtualElement is a Javascript data structure that represents the DOM element to be rendered by [`m.render`](mithril.render.md)