Docs sites: edits to the async driver documentation

Author: jyemin

docs/reference/content/driver-async/reference/connecting/authenticating.md

@@ -15,12 +15,12 @@ only available in the MongoDB [Enterprise Edition](http://docs.mongodb.org/manua
 
 An authentication credential is represented as an instance of the
 [`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}}) class, which includes static factory methods for
-each of the supported authentication mechanisms.  A list of these instances must be passed to the driver via one of several
-[`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}}) constructors that take either a 
-parameter of type `List<MongoCredential>`.  Alternatively, a single [`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}})
-can be created implicity via a 
-[`MongoClientURI`]({{< apiref "com/mongodb/MongoClientURI" >}}) and passed to a [`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}})
-constructor that takes a `[`MongoClientURI`]({{< apiref "com/mongodb/MongoClientURI" >}}) parameter. 
+each of the supported authentication mechanisms.  A list of these instances must be passed to the driver via a
+[`MongoClients`]({{< apiref "com/mongodb/async/client/MongoClients" >}}) static factory method that takes a 
+[`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) parameter.  Alternatively, a single 
+`MongoCredential` can be created implicity via a 
+[`ConnectionString`]({{< apiref "com/mongodb/ConnectionString" >}}) and passed to a 
+`MongoClients` static factory method that takes a `ConnectionString` parameter. 
 
 {{% note %}}
 Given the flexibility of role-based access control in MongoDB, it is usually sufficient to authenticate with a single user, but, for completeness, the driver accepts a list of credentials.
@@ -50,7 +50,7 @@ MongoCredential credential = MongoCredential.createCredential(user,
 or with a connection string:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1");
+ConnectionString uri = new ConnectionString("mongodb://user1:pwd1@host1/?authSource=db1");
 ```
 
 This is the recommended approach as it will make upgrading from MongoDB 2.6 to MongoDB 3.0 seamless, even after [upgrading the
@@ -71,7 +71,7 @@ MongoCredential credential = MongoCredential.createScramSha1Credential(user,
 or with a connection string:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-1");
+ConnectionString uri = new ConnectionString("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=SCRAM-SHA-1");
 ```
 
 ## MONGODB-CR
@@ -88,7 +88,7 @@ MongoCredential credential = MongoCredential.createMongoCRCredential(user,
 or with a connection string:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=MONGODB-CR");
+ConnectionString uri = new ConnectionString("mongodb://user1:pwd1@host1/?authSource=db1&authMechanism=MONGODB-CR");
 ```
 
 Note that this is not recommended as a credential created in this way will fail to authenticate after an authentication schema upgrade
@@ -109,7 +109,7 @@ MongoCredential credential = MongoCredential.createMongoX509Credential(user);
 or with a connection string:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://subjectName@host1/?authMechanism=MONGODB-X509");
+ConnectionString uri = new ConnectionString("mongodb://subjectName@host1/?authMechanism=MONGODB-X509");
 ```
 
 See the MongoDB server
@@ -131,7 +131,7 @@ MongoCredential credential = MongoCredential.createGSSAPICredential(user);
 or with a connection string:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://username%40REALM.com@host1/?authMechanism=GSSAPI");
+ConnectionString uri = new ConnectionString("mongodb://username%40REALM.com@host1/?authMechanism=GSSAPI");
 ```
 
 {{% note %}}
@@ -161,7 +161,7 @@ MongoCredential credential = MongoCredential.createPlainCredential(user, "$exter
 or with a connection string:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://user1@host1/?authSource=$external&authMechanism=PLAIN");
+ConnectionString uri = new ConnectionString("mongodb://user1@host1/?authSource=$external&authMechanism=PLAIN");
 ```
 
 {{% note %}}

docs/reference/content/driver-async/reference/connecting/connection-settings.md

@@ -52,7 +52,7 @@ database component, does not use the database component for anything other than
 #### Options
 
 Many options can be provided via the connection string. The ones that cannot may be provided in a 
-[`MongoClientOptions`]({{< apiref "com/mongodb/MongoClientOptions" >}}) instance. To
+[`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) instance. To
 provide an option, append a `?` to the connection string and separate options by an `&`.
 
 ```ini
@@ -84,7 +84,7 @@ MongoClient client = MongoClients.create(new ConnectionString("mongodb://host:27
 ```
 
 Finally, the [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) class provides an in-code way to set the 
-same  options from a connection string.  This is sometimes necessary, as the connection string does not allow an application to configure as 
+same options from a connection string.  This is sometimes necessary, as the connection string does not allow an application to configure as 
 many properties of the connection as  `MongoClientSettings`.  
 [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings" >}}) instances are immutable, so to create one an 
 application uses a builder: 

docs/reference/content/driver-async/reference/connecting/ssl.md

@@ -11,29 +11,38 @@ title = "SSL"
 ## SSL
 
 The Java driver supports SSL connections to MongoDB servers using the underlying support for SSL provided by the JDK. You can configure 
-the driver to use SSL either with `MongoClientURI` or with `MongoClientOptions`.  
+the driver to use SSL either with `ConnectionString` or with `MongoClientSettings`.  
 
-With `MongoClientURI`, specify `ssl=true as a query parameter, as in:
+With `ConnectionString`, specify `ssl=true as a query parameter, as in:
 
 ```java
-    new MongoClientURI("mongodb://localhost/?ssl=true")
+new ConnectionString("mongodb://localhost/?ssl=true")
 ```
 
-With `MongoClientOptions`, set the sslEnabled property to true, as in:
+With `MongoClientSettings`, set the sslEnabled property to true, as in:
 
 ```java
-    MongoClientOptions.builder().sslEnabled(true).build()
+MongoClientSettings.builder()                                                  
+                   .sslSettings(SslSettings.builder()
+                                           .enabled(true)
+                                           .build())   
+                   .build()                                                    
 ```
 
 ### Host name verification
 
 By default, the driver ensures that the host name included in the server's SSL certificate(s) matches the host name(s) provided when 
 constructing a `MongoClient`.  However, this host name verification requires a Java 7 JVM, as it relies on additions to the 
 `javax.net.SSLParameters` class that were introduced in Java 7.  If your application must run on Java 6, or for some other reason you need
- to disable host name verification, you must expicitly indicate this in `MongoClientOptions` using the `sslInvalidHostNameAllowed` property:
+ to disable host name verification, you must expicitly indicate this in `SslSettings` using the `invalidHostNameAllowed` property:
 
 ```java
-    MongoClientOptions.builder().sslEnabled(true).sslInvalidHostNameAllowed(true).build()
+MongoClientSettings.builder()                                             
+                   .sslSettings(SslSettings.builder()                     
+                                           .enabled(true)                 
+                                           .invalidHostNameAllowed(true)  
+                                           .build())                      
+                   .build()                                              
 ``` 
 
 ### JVM system properties

docs/reference/content/driver/reference/connecting/authenticating.md

@@ -16,7 +16,7 @@ only available in the MongoDB [Enterprise Edition](http://docs.mongodb.org/manua
 An authentication credential is represented as an instance of the
 [`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}}) class, which includes static factory methods for
 each of the supported authentication mechanisms.  A list of these instances must be passed to the driver via one of several
-[`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}}) constructors that take either a 
+[`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}}) constructors that take a 
 parameter of type `List<MongoCredential>`.  Alternatively, a single [`MongoCredential`]({{< apiref "com/mongodb/MongoCredential" >}})
 can be created implicity via a 
 [`MongoClientURI`]({{< apiref "com/mongodb/MongoClientURI" >}}) and passed to a [`MongoClient`]({{< apiref "com/mongodb/MongoClient" >}})