Merge branch 'master' of https://github.com/fdecampredon/rx-react

fdecampredon · Nov 9, 2015 · 2600261 · 2600261
2 parents 6e9f335 + c1f355b
commit 2600261
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/stateStreamMixin.js b/lib/stateStreamMixin.js
@@ -24,8 +24,8 @@ function isObservable(obj) {
 }
 
 /**
- * A Mixin for explicitly boudn the state of a component to an RxJS Observable,
- * subscrition will be disposed on unmount.
+ * A Mixin for explicitly bound the state of a component to an RxJS Observable,
+ * subscription will be disposed on unmount.
  * 
  * var Timer = React.createClass({
  *   mixins: [StateStreamMixin],
@@ -36,7 +36,7 @@ function isObservable(obj) {
  *       };
  *     });
  *   },
- *   render: function(props, state) {
+ *   render: function() {
  *     var secondsElapsed = this.state? this.state.secondsElapsed : 0;
  *     return (
  *       <div>Seconds Elapsed: {secondsElapsed}</div>