Merge branch 'WhiskeyBravo-master'

* WhiskeyBravo-master: Fix a documentation typo in OkHttpClient.
t-gao · Aug 10, 2016 · 7f53615 · 7f53615
2 parents 59c096d + 393650b
commit 7f53615
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/okhttp/src/main/java/okhttp3/OkHttpClient.java b/okhttp/src/main/java/okhttp3/OkHttpClient.java
@@ -712,7 +712,7 @@ public Builder followSslRedirects(boolean followProtocolRedirects) {
       return this;
     }
 
-    /** Configure this client to follow redirects. If unset, redirects be followed. */
+    /** Configure this client to follow redirects. If unset, redirects will be followed. */
     public Builder followRedirects(boolean followRedirects) {
       this.followRedirects = followRedirects;
       return this;