Merge branch 'master' into rxswift4.0-swift4.0

kzaher · kzaher · commit 12cccb171ad9 · 2017-10-17T23:16:00.000+02:00
diff --git a/Documentation/GettingStarted.md b/Documentation/GettingStarted.md
@@ -911,6 +911,8 @@ _ = variable.asObservable()
         print("Completed 2")
     })
 
+print("Before send 2")
+
 variable.value = 2
 
 print("End ---")
@@ -925,6 +927,7 @@ Before send 1
 First 1
 Before second subscription ---
 Second 1
+Before send 2
 First 2
 Second 2
 End ---
diff --git a/RxCocoa/Traits/SharedSequence/SharedSequence+Operators.swift b/RxCocoa/Traits/SharedSequence/SharedSequence+Operators.swift
@@ -443,7 +443,7 @@ extension SharedSequenceConvertibleType {
     }
 
     /**
-    Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emitts an element.
+    Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emits an element.
 
     - parameter second: Second observable source.
     - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
diff --git a/RxSwift/Observables/WithLatestFrom.swift b/RxSwift/Observables/WithLatestFrom.swift
@@ -22,7 +22,7 @@ extension ObservableType {
     }
 
     /**
-     Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emitts an element.
+     Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emits an element.
 
      - seealso: [combineLatest operator on reactivex.io](http://reactivex.io/documentation/operators/combinelatest.html)
 

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ extension SharedSequenceConvertibleType {`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`/**`
`446`		- Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emitts an element.
	`446`	+ Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emits an element.
`447`	`447`
`448`	`448`	`- parameter second: Second observable source.`
`449`	`449`	`- returns: An observable sequence containing the result of combining each element of the self with the latest element from the second source, if any, using the specified result selector function.`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ extension ObservableType {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/**`
`25`		- Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emitts an element.
	`25`	+ Merges two observable sequences into one observable sequence by using latest element from the second sequence every time when `self` emits an element.
`26`	`26`
`27`	`27`	`- seealso: [combineLatest operator on reactivex.io](http://reactivex.io/documentation/operators/combinelatest.html)`
`28`	`28`