Permalink
Browse files

Merge branch 'live-docs' into dev-master

  • Loading branch information...
ericf committed Apr 4, 2013
2 parents cb9201c + c30875d commit 4fa781cc3ea8950efd15e3d4e5638bba34a54f05
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/promise/docs/component.json
  2. +2 −2 src/promise/docs/index.mustache
@@ -5,7 +5,7 @@
"author" : ["lsmith", "juandopazo"],
"tags": [
- "promise", "async"
+ "utility", "beta", "promise", "async"
],
"use": ["promise"],
@@ -252,7 +252,7 @@ uiUpdated.then(stopSpinner);
// Concise form (more common)
// Note Y.Promise can be called without 'new'
-Promise(function (resolve, reject) { Y.io(...); })
+Y.Promise(function (resolve, reject) { Y.io(...); })
.then(renderTemplates, showError) // returns another promise
.then(stopSpinner); // returns another promise
```
@@ -297,7 +297,7 @@ userDataLoaded
<p>
When a promise is rejected, the `onRejected` callback (the second argument
- to `then()`) is executed. Like `onFulfilled`, it is called with whatever is
+ to `then()`) is executed. Like `onFulfilled`, it is called with whatever is
passed to the executor function's `reject()` function.
</p>

0 comments on commit 4fa781c

Please sign in to comment.