Permalink
Browse files

Reordering and clarifying propagation section.

  • Loading branch information...
domenic committed Jan 18, 2012
1 parent 0bd77b3 commit cd6960725eecab88baa641c334cdac1aae737488
Showing with 6 additions and 6 deletions.
  1. +6 −6 README.md
View
@@ -78,17 +78,17 @@ be responsible for resolving ``bar``.
that promise. Being able to become a new promise is useful for
managing delays, combining results, or recovering from errors.
-If the ``foo()`` promise gets fulfilled and you omit the value
-handler, the **value** will go to ``bar``.
+If the ``foo()`` promise gets rejected and you omit the error handler,
+the **error** will go to ``bar``:
```javascript
var bar = foo()
.then(function (value) {
})
```
-If the ``foo()`` promise gets rejected and you omit the error handler,
-the **error** will go to ``bar``.
+If the ``foo()`` promise gets fulfilled and you omit the value
+handler, the **value** will go to ``bar``:
```javascript
var bar = foo()
@@ -97,7 +97,7 @@ var bar = foo()
```
Q promises provide a ``fail`` shorthand for ``then`` when you are only
-interested in handling the error.
+interested in handling the error:
```javascript
var bar = foo()
@@ -108,7 +108,7 @@ var bar = foo()
They also have a ``fin`` function that is like a ``finally`` clause.
The final handler gets called, with no arguments, when the promise
returned by ``foo()`` either returns a value or throws an error. The
-value or error passes directly to ``bar``.
+value returned or error thrown passes directly to ``bar``.
```javascript
var bar = foo()

0 comments on commit cd69607

Please sign in to comment.