diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java
index c74ab3f7d4..a3f204206b 100644
--- a/src/main/java/io/reactivex/Observable.java
+++ b/src/main/java/io/reactivex/Observable.java
@@ -9414,7 +9414,7 @@ public final Single<T> lastOrError() {
      *     &#64;Override
      *     public void onSubscribe(Disposable s) {
      *         if (upstream != null) {
-     *             s.cancel();
+     *             s.dispose();
      *         } else {
      *             upstream = s;
      *             downstream.onSubscribe(this);
@@ -9473,10 +9473,10 @@ public final Single<T> lastOrError() {
      * //         Such class may define additional parameters to be submitted to
      * //         the custom consumer type.
      *
-     * final class CustomOperator&lt;T&gt; implements ObservableOperator&lt;String&gt; {
+     * final class CustomOperator&lt;T&gt; implements ObservableOperator&lt;String, T&gt; {
      *     &#64;Override
-     *     public Observer&lt;? super String&gt; apply(Observer&lt;? super T&gt; upstream) {
-     *         return new CustomObserver&lt;T&gt;(upstream);
+     *     public Observer&lt;T&gt; apply(Observer&lt;? super String&gt; downstream) {
+     *         return new CustomObserver&lt;T&gt;(downstream);
      *     }
      * }
      *