Merge branch 'master' of github.com:marko-js/marko

This commit is contained in:
Patrick Steele-Idem 2016-08-25 19:27:37 -06:00
commit 3e15457943

View File

@ -91,15 +91,15 @@ require('./template.marko').render({}, out);
### render(templatePath, templateData, stream.Writable)
Deprecated. Do not use.
Deprecated. Do not use. The method [`Template#render(templateData, stream.Writable)`](#rendertemplatedata-streamwritable) method should be used instead.
### render(templatePath, templateData, callback)
Deprecated. Do not use.
Deprecated. Do not use. The method [`Template#render(templateData, callback)`](#rendertemplatedata-callback) method should be used instead.
### stream(templatePath, templateData) : stream.Readable
Deprecated. Do not use.
Deprecated. Do not use. The method [`Template#stream(templateData)`](#streamtemplatedata--streamreadable) method should be used instead.
## Properties
@ -293,4 +293,4 @@ require('./src/components/app-hello')
.appendTo(document.body);
```
The return value of `render()` will be a [RenderResult](https://github.com/raptorjs/raptor-renderer#renderresult) instance.
The return value of `render()` will be a [RenderResult](https://github.com/raptorjs/raptor-renderer#renderresult) instance.