@@ -1736,8 +1736,8 @@ public static <T> Observable<T> fromCallable(Callable<? extends T> supplier) {
1736
1736
* <p>
1737
1737
* <em>Important note:</em> This ObservableSource is blocking; you cannot dispose it.
1738
1738
* <p>
1739
- * Unlike 1.x, cancelling the Observable won't cancel the future. If necessary, one can use composition to achieve the
1740
- * cancellation effect: {@code futureObservableSource.doOnCancel (() -> future.cancel(true));}.
1739
+ * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
1740
+ * cancellation effect: {@code futureObservableSource.doOnDispose (() -> future.cancel(true));}.
1741
1741
* <dl>
1742
1742
* <dt><b>Scheduler:</b></dt>
1743
1743
* <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1767,8 +1767,8 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future) {
1767
1767
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
1768
1768
* method.
1769
1769
* <p>
1770
- * Unlike 1.x, cancelling the Observable won't cancel the future. If necessary, one can use composition to achieve the
1771
- * cancellation effect: {@code futureObservableSource.doOnCancel (() -> future.cancel(true));}.
1770
+ * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
1771
+ * cancellation effect: {@code futureObservableSource.doOnDispose (() -> future.cancel(true));}.
1772
1772
* <p>
1773
1773
* <em>Important note:</em> This ObservableSource is blocking; you cannot dispose it.
1774
1774
* <dl>
@@ -1805,8 +1805,8 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
1805
1805
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
1806
1806
* method.
1807
1807
* <p>
1808
- * Unlike 1.x, cancelling the Observable won't cancel the future. If necessary, one can use composition to achieve the
1809
- * cancellation effect: {@code futureObservableSource.doOnCancel (() -> future.cancel(true));}.
1808
+ * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
1809
+ * cancellation effect: {@code futureObservableSource.doOnDispose (() -> future.cancel(true));}.
1810
1810
* <p>
1811
1811
* <em>Important note:</em> This ObservableSource is blocking; you cannot dispose it.
1812
1812
* <dl>
@@ -1846,8 +1846,8 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
1846
1846
* return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
1847
1847
* method.
1848
1848
* <p>
1849
- * Unlike 1.x, cancelling the Observable won't cancel the future. If necessary, one can use composition to achieve the
1850
- * cancellation effect: {@code futureObservableSource.doOnCancel (() -> future.cancel(true));}.
1849
+ * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
1850
+ * cancellation effect: {@code futureObservableSource.doOnDispose (() -> future.cancel(true));}.
1851
1851
* <dl>
1852
1852
* <dt><b>Scheduler:</b></dt>
1853
1853
* <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -7497,7 +7497,7 @@ public final Observable<T> delaySubscription(long delay, TimeUnit unit, Schedule
7497
7497
* returned Observable cancels the flow and terminates with that type of terminal event:
7498
7498
* <pre><code>
7499
7499
* Observable.just(createOnNext(1), createOnComplete(), createOnNext(2))
7500
- * .doOnCancel (() -> System.out.println("Cancelled!"));
7500
+ * .doOnDispose (() -> System.out.println("Cancelled!"));
7501
7501
* .test()
7502
7502
* .assertResult(1);
7503
7503
* </code></pre>
0 commit comments