@@ -9924,7 +9924,7 @@ public final <U> Observable<Observable<T>> window(Observable<U> boundary) {
9924
9924
* sequence and emits the results of {@code zipFunction} applied to these pairs
9925
9925
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#zip">RxJava wiki: zip</a>
9926
9926
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.zip.aspx">MSDN: Observable.Zip</a>
9927
- * @deprecated use zipWith
9927
+ * @deprecated use {@link # zipWith}
9928
9928
*/
9929
9929
@Deprecated
9930
9930
public final <T2, R> Observable<R> zip(Iterable<? extends T2> other, Func2<? super T, ? super T2, ? extends R> zipFunction) {
@@ -9941,7 +9941,7 @@ public final <T2, R> Observable<R> zip(Iterable<? extends T2> other, Func2<? sup
9941
9941
* not pre-consumed. This allows you to zip infinite streams on either side.
9942
9942
* <dl>
9943
9943
* <dt><b>Scheduler:</b></dt>
9944
- * <dd>{@code zip } does not operate by default on a particular {@link Scheduler}.</dd>
9944
+ * <dd>{@code zipWith } does not operate by default on a particular {@link Scheduler}.</dd>
9945
9945
* </dl>
9946
9946
*
9947
9947
* @param <T2>
@@ -9957,6 +9957,7 @@ public final <T2, R> Observable<R> zip(Iterable<? extends T2> other, Func2<? sup
9957
9957
* sequence and emits the results of {@code zipFunction} applied to these pairs
9958
9958
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#zip">RxJava wiki: zip</a>
9959
9959
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.zip.aspx">MSDN: Observable.Zip</a>
9960
+ * @since 0.20
9960
9961
*/
9961
9962
public final <T2, R> Observable<R> zipWith(Iterable<? extends T2> other, Func2<? super T, ? super T2, ? extends R> zipFunction) {
9962
9963
return lift(new OperatorZipIterable<T, T2, R>(other, zipFunction));
0 commit comments