ReactiveX#6179 Removing cancellation language since only the `Flowabl…

…e` type has `cancel()`
luis-cortes · Sep 2, 2018 · 58f3909 · 58f3909
1 parent ee99e0b
commit 58f3909
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/io/reactivex/Completable.java b/src/main/java/io/reactivex/Completable.java
@@ -399,7 +399,7 @@ public static Completable error(final Throwable error) {
      *  <dt><b>Error handling:</b></dt>
      *  <dd> If the {@link Action} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link CompletableObserver#onError(Throwable)},
-     *  except when the downstream has canceled or disposed this {@code Completable} source.
+     *  except when the downstream has disposed this {@code Completable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
@@ -426,7 +426,7 @@ public static Completable fromAction(final Action run) {
      *  <dt><b>Error handling:</b></dt>
      *  <dd> If the {@link Callable} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link CompletableObserver#onError(Throwable)},
-     *  except when the downstream has canceled or disposed this {@code Completable} source.
+     *  except when the downstream has disposed this {@code Completable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>

diff --git a/src/main/java/io/reactivex/Maybe.java b/src/main/java/io/reactivex/Maybe.java
@@ -660,7 +660,7 @@ public static <T> Maybe<T> error(Callable<? extends Throwable> supplier) {
      *  <dt><b>Error handling:</b></dt>
      *  <dd> If the {@link Action} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link MaybeObserver#onError(Throwable)},
-     *  except when the downstream has canceled or disposed this {@code Maybe} source.
+     *  except when the downstream has disposed this {@code Maybe} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>

diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java
@@ -1760,7 +1760,7 @@ public static <T> Observable<T> fromArray(T... items) {
      *   <dt><b>Error handling:</b></dt>
      *   <dd> If the {@link Callable} throws an exception, the respective {@link Throwable} is
      *   delivered to the downstream via {@link Observer#onError(Throwable)},
-     *   except when the downstream has canceled or disposed this {@code Observable} source.
+     *   except when the downstream has disposed this {@code Observable} source.
      *   In this latter case, the {@code Throwable} is delivered to the global error handler via
      *   {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}.
      *   </dd>

diff --git a/src/main/java/io/reactivex/Single.java b/src/main/java/io/reactivex/Single.java
@@ -586,7 +586,7 @@ public static <T> Single<T> error(final Throwable exception) {
      *   <dt><b>Error handling:</b></dt>
      *   <dd> If the {@link Callable} throws an exception, the respective {@link Throwable} is
      *   delivered to the downstream via {@link SingleObserver#onError(Throwable)},
-     *   except when the downstream has canceled or disposed this {@code Single} source.
+     *   except when the downstream has disposed this {@code Single} source.
      *   In this latter case, the {@code Throwable} is delivered to the global error handler via
      *   {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.exceptions.UndeliverableException UndeliverableException}.
      *   </dd>