Merge branch 'master' into bufferCount-fix

ReactiveX · Oct 26, 2016 · dde5d8d · dde5d8d
2 parents eb11bb8 + 0271fab
commit dde5d8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/observable/FromEventObservable.ts b/src/observable/FromEventObservable.ts
@@ -84,7 +84,7 @@ export class FromEventObservable<T, R> extends Observable<T> {
    * EventEmitter, NodeList or HTMLCollection to attach the event handler to.
    * @param {string} eventName The event name of interest, being emitted by the
    * `target`.
-   * @parm {EventListenerOptions} [options] Options to pass through to addEventListener
+   * @param {EventListenerOptions} [options] Options to pass through to addEventListener
    * @param {SelectorMethodSignature<T>} [selector] An optional function to
    * post-process results. It takes the arguments from the event handler and
    * should return a single value.

diff --git a/src/observable/GenerateObservable.ts b/src/observable/GenerateObservable.ts
@@ -22,7 +22,7 @@ interface SchedulerState<T, S> {
 
 export interface GenerateBaseOptions<S> {
   /**
-   * Inital state.
+   * Initial state.
   */
   initialState: S;
   /**
@@ -124,7 +124,7 @@ export class GenerateObservable<T, S> extends Observable<T> {
    * Generates an observable sequence by running a state-driven loop
    * producing the sequence's elements, using the specified scheduler
    * to send out observer messages.
-   * The overload accepts options object that might contain inital state, iterate,
+   * The overload accepts options object that might contain initial state, iterate,
    * condition and scheduler.
    *
    * <img src="./img/generate.png" width="100%">
@@ -148,7 +148,7 @@ export class GenerateObservable<T, S> extends Observable<T> {
    * Generates an observable sequence by running a state-driven loop
    * producing the sequence's elements, using the specified scheduler
    * to send out observer messages.
-   * The overload accepts options object that might contain inital state, iterate,
+   * The overload accepts options object that might contain initial state, iterate,
    * condition, result selector and scheduler.
    *
    * <img src="./img/generate.png" width="100%">