diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBean.java
index bdf761843..e5c07c6c4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBean.java
@@ -254,7 +254,8 @@ public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClie
 
 	/**
 	 * Set the {@literal server selection timeout} in msec for a 3.x MongoDB Java driver. If not set the default value of
-	 * 30 sec will be used.
+	 * 30 sec will be used. A value of 0 means that it will timeout immediately if no server is available. A negative
+	 * value means to wait indefinitely.
 	 *
 	 * @param serverSelectionTimeout in msec.
 	 */
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java
index 2460d6377..fda325356 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java
@@ -38,7 +38,7 @@ import com.mongodb.WriteConcern;
 
 /**
  * Integration tests for {@link MongoClientParser}.
- * 
+ *
  * @author Christoph Strobl
  * @author Mark Paluch
  */
@@ -118,7 +118,7 @@ public class MongoClientParserIntegrationTests {
 	}
 
 	@Test // DATAMONGO-1620
-	public void createsMongoClinetWithServerSelectionTimeoutCorrectly() {
+	public void createsMongoClientWithServerSelectionTimeoutCorrectly() {
 
 		assumeThat(MongoClientVersion.isMongo3Driver(), is(true));