Merge branch 'master' into development

ferranabello · Nov 15, 2018 · 9d1ed87 · 9d1ed87
2 parents 919284a + 00c5a18
commit 9d1ed87
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 92 deletions.
diff --git a/Contributing.md b/Contributing.md
@@ -23,7 +23,7 @@ finish. 😴
 If you do not have Carthage installed, check the [installation instructions](https://github.com/Carthage/Carthage#installing-carthage).
 And, of course, do not forget to run `carthage update --platform iOS` after.
 
-Afer that, you can open `Moya.xcodeproj` and hit ⌘+U to start testing.
+After that, you can open `Moya.xcodeproj` and hit ⌘+U to start testing.
 
 #### Ownership
 

diff --git a/Readme.md b/Readme.md
@@ -169,7 +169,7 @@ $ git submodule add https://github.com/Moya/Moya.git
 
 > It does not matter which `Products` folder you choose from, but it does matter whether you choose the top or bottom `Alamofire.framework`.
 
-- Select the top `Alamofire.framework` for iOS and the bottom one for OS X.
+- Select the top `Alamofire.framework` for iOS and the bottom one for macOS.
 
 > You can verify which one you selected by inspecting the build log for your project. The build target for `Alamofire` will be listed as either `Alamofire iOS`, `Alamofire macOS`, `Alamofire tvOS` or `Alamofire watchOS`.