Merge branch 'master' into development

* master:
  Fixed headings
This commit is contained in:
Erik Little 2017-05-04 07:56:57 -04:00
commit e1160114f6
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320

View File

@ -138,9 +138,9 @@ github "socketio/socket.io-client-swift", "v8.3.3", :files => "Source/*.swift" #
Run `seed install`.
## API
### Constructors
# API
Constructors
-----------
`init(var socketURL: NSURL, config: SocketIOClientConfiguration = [])` - Creates a new SocketIOClient. If your socket.io server is secure, you need to specify `https` in your socketURL.
`convenience init(socketURL: NSURL, options: NSDictionary?)` - Same as above, but meant for Objective-C. See Options on how convert between SocketIOClientOptions and dictionary keys.