Merge branch 'master' into swift-2.0

# Conflicts: # Alamofire.podspec # CHANGELOG.md # Source/Info.plist
jackliu · Sep 6, 2015 · 7fc6634 · 7fc6634
2 parents d430180 + 020e9d5
commit 7fc6634
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -581,7 +581,7 @@ let manager = Alamofire.Manager(configuration: configuration)
 #### Creating a Manager with Background Configuration
 
 ```swift
-let configuration = NSURLSessionConfiguration.backgroundSessionConfiguration("com.example.app.background")
+let configuration = NSURLSessionConfiguration.backgroundSessionConfigurationWithIdentifier("com.example.app.background")
 let manager = Alamofire.Manager(configuration: configuration)
 ```