Update version in docs
diff --git a/README.md b/README.md
index 69653dd..00df93d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 version through the [Java driver
 docs](http://docs.datastax.com/en/developer/java-driver/latest/index.html) or via the release tags,
 [e.g.
-3.4.0](https://github.com/datastax/java-driver/tree/3.4.0).*
+3.5.0](https://github.com/datastax/java-driver/tree/3.5.0).*
 
 _**Feeback requested!** Help us focus our efforts, provide your input on 
 the [Platform and Runtime Survey](http://goo.gl/forms/qwUE6qnL7U) (we kept it short)._
@@ -55,12 +55,12 @@
   driver releases and important announcements (low frequency).
   [@DataStaxEng](https://twitter.com/datastaxeng) has more news including
   other drivers, Cassandra, and DSE.
-- DOCS: the [manual](http://docs.datastax.com/en/developer/java-driver/3.3/manual/) has quick
+- DOCS: the [manual](http://docs.datastax.com/en/developer/java-driver/3.5/manual/) has quick
   start material and technical details about the driver and its features.
-- API: http://www.datastax.com/drivers/java/3.3
+- API: http://www.datastax.com/drivers/java/3.5
 - GITHUB REPOSITORY: https://github.com/datastax/java-driver
 - [changelog](changelog/)
-- [binary tarball](http://downloads.datastax.com/java-driver/cassandra-java-driver-3.4.0.tar.gz)  
+- [binary tarball](http://downloads.datastax.com/java-driver/cassandra-java-driver-3.5.0.tar.gz)  
 
 ## Getting the driver
 
@@ -72,7 +72,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-core</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
 </dependency>
 ```
 
@@ -82,7 +82,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-mapping</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
 </dependency>
 ```
 
@@ -92,7 +92,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-extras</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
 </dependency>
 ```
 
@@ -101,12 +101,12 @@
 to avoid the explicit dependency to Netty.
 
 If you can't use a dependency management tool, a
-[binary tarball](http://downloads.datastax.com/java-driver/cassandra-java-driver-3.4.0.tar.gz)
+[binary tarball](http://downloads.datastax.com/java-driver/cassandra-java-driver-3.5.0.tar.gz)
 is available for download.
 
 ## Compatibility
 
-The Java client driver 3.4.0 ([branch 3.x](https://github.com/datastax/java-driver/tree/3.x)) is compatible with Apache
+The Java client driver 3.5.0 ([branch 3.x](https://github.com/datastax/java-driver/tree/3.x)) is compatible with Apache
 Cassandra 2.1, 2.2 and 3.0+ (see [this page](http://docs.datastax.com/en/developer/java-driver/latest/manual/native_protocol/) for
 the most up-to-date compatibility information).
 
diff --git a/changelog/README.md b/changelog/README.md
index 22aa46b..3af018c 100644
--- a/changelog/README.md
+++ b/changelog/README.md
@@ -1,6 +1,6 @@
 ## Changelog
 
-### 3.5.0 (In progress)
+### 3.5.0
 
 - [improvement] JAVA-1448: TokenAwarePolicy should respect child policy ordering.
 - [bug] JAVA-1751: Include defaultTimestamp length in encodedSize for protocol version >= 3.
diff --git a/faq/README.md b/faq/README.md
index e47eb67..1ae6ecc 100644
--- a/faq/README.md
+++ b/faq/README.md
@@ -35,7 +35,7 @@
 
 Note that, unlike manual inspection, `wasApplied` does not consume the first row.
 
-[wasApplied]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ResultSet.html#wasApplied--
+[wasApplied]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ResultSet.html#wasApplied--
 
 
 ### What is a parameterized statement and how can I use it?
@@ -289,7 +289,7 @@
 an update with compatibility to this driver version.
 
 
-[Blobs.java]: https://github.com/datastax/java-driver/tree/3.4.0/driver-examples/src/main/java/com/datastax/driver/examples/datatypes/Blobs.java
+[Blobs.java]: https://github.com/datastax/java-driver/tree/3.5.0/driver-examples/src/main/java/com/datastax/driver/examples/datatypes/Blobs.java
 [CASSANDRA-7304]: https://issues.apache.org/jira/browse/CASSANDRA-7304
 [Parameters and Binding]: ../manual/statements/prepared/#parameters-and-binding
 [Mapper options]: ../manual/object_mapper/using/#mapper-options
diff --git a/faq/osgi/README.md b/faq/osgi/README.md
index cb3ff42..cc3f0ed 100644
--- a/faq/osgi/README.md
+++ b/faq/osgi/README.md
@@ -157,7 +157,7 @@
 [BND]:http://bnd.bndtools.org/
 [Maven bundle plugin]:https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Maven+Bundle+Plugin+%28BND%29
 [OSGi examples repository]:https://github.com/datastax/java-driver-examples-osgi
-[without metrics]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.Builder.html#withoutMetrics--
+[without metrics]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.Builder.html#withoutMetrics--
 [SLF4J]:http://www.slf4j.org/
 [Logback]:http://logback.qos.ch/
 [Tycho]:https://eclipse.org/tycho/
diff --git a/manual/README.md b/manual/README.md
index 18937ad..53ac6e5 100644
--- a/manual/README.md
+++ b/manual/README.md
@@ -209,7 +209,7 @@
     <tr> <td>blob</td> <td>getBytes</td> <td>java.nio.ByteBuffer</td> </tr>
     <tr> <td>boolean</td> <td>getBool</td> <td>boolean</td> </tr>
     <tr> <td>counter</td> <td>getLong</td> <td>long</td> </tr>
-    <tr> <td>date</td> <td>getDate</td> <td><a href="http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/LocalDate.html">LocalDate</a></td> </tr>
+    <tr> <td>date</td> <td>getDate</td> <td><a href="http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/LocalDate.html">LocalDate</a></td> </tr>
     <tr> <td>decimal</td> <td>getDecimal</td> <td>java.math.BigDecimal</td> </tr>
     <tr> <td>double</td> <td>getDouble</td> <td>double</td> </tr>
     <tr> <td>float</td> <td>getFloat</td> <td>float</td> </tr>
@@ -286,17 +286,17 @@
 github.com](https://github.com/datastax/java-driver/tree/3.x/manual),
 simply navigate to each sub-directory.
 
-[Cluster]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.html
-[Cluster.Builder]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.Builder.html
-[Initializer]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.Initializer.html
-[Session]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html
-[ResultSet]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ResultSet.html
-[Row]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Row.html
-[NettyOptions]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/NettyOptions.html
-[QueryOptions]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/QueryOptions.html
-[SocketOptions]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html
-[Host.StateListener]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Host.StateListener.html
-[LatencyTracker]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/LatencyTracker.html
-[SchemaChangeListener]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SchemaChangeListener.html
-[NoHostAvailableException]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/NoHostAvailableException.html
-[LocalDate]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/LocalDate.html
\ No newline at end of file
+[Cluster]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.html
+[Cluster.Builder]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.Builder.html
+[Initializer]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.Initializer.html
+[Session]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html
+[ResultSet]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ResultSet.html
+[Row]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Row.html
+[NettyOptions]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/NettyOptions.html
+[QueryOptions]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/QueryOptions.html
+[SocketOptions]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html
+[Host.StateListener]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Host.StateListener.html
+[LatencyTracker]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/LatencyTracker.html
+[SchemaChangeListener]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SchemaChangeListener.html
+[NoHostAvailableException]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/NoHostAvailableException.html
+[LocalDate]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/LocalDate.html
\ No newline at end of file
diff --git a/manual/address_resolution/README.md b/manual/address_resolution/README.md
index c0d11dc..feafa9f 100644
--- a/manual/address_resolution/README.md
+++ b/manual/address_resolution/README.md
@@ -102,8 +102,8 @@
 
 
 
-[AddressTranslator]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/AddressTranslator.html
-[EC2MultiRegionAddressTranslator]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/EC2MultiRegionAddressTranslator.html
+[AddressTranslator]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/AddressTranslator.html
+[EC2MultiRegionAddressTranslator]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/EC2MultiRegionAddressTranslator.html
 
 [cassandra.yaml]:        https://docs.datastax.com/en/cassandra/3.x/cassandra/configuration/configCassandra_yaml.html
 [rpc_address]:           https://docs.datastax.com/en/cassandra/3.x/cassandra/configuration/configCassandra_yaml.html?scroll=configCassandra_yaml__rpc_address
diff --git a/manual/async/README.md b/manual/async/README.md
index 0b0b326..656d05e 100644
--- a/manual/async/README.md
+++ b/manual/async/README.md
@@ -51,8 +51,8 @@
 page (see also the section on [paging](../paging/)).
 Here is a full example:
 
-[getAvailableWithoutFetching]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ResultSet.html#getAvailableWithoutFetching--
-[fetchMoreResults]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ResultSet.html#fetchMoreResults--
+[getAvailableWithoutFetching]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ResultSet.html#getAvailableWithoutFetching--
+[fetchMoreResults]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ResultSet.html#fetchMoreResults--
 
 ```java
 Statement statement = new SimpleStatement("select * from foo").setFetchSize(20);
@@ -134,5 +134,5 @@
   hasn't been fetched already.
 
 [ListenableFuture]: https://github.com/google/guava/wiki/ListenableFutureExplained
-[init]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.html#init--
-[query trace]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/QueryTrace.html
+[init]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.html#init--
+[query trace]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/QueryTrace.html
diff --git a/manual/auth/README.md b/manual/auth/README.md
index db33eab..0eea6c4 100644
--- a/manual/auth/README.md
+++ b/manual/auth/README.md
@@ -2,4 +2,4 @@
 
 *Coming soon... In the meantime, see the javadoc for [AuthProvider].*
 
-[AuthProvider]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/AuthProvider.html
\ No newline at end of file
+[AuthProvider]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/AuthProvider.html
\ No newline at end of file
diff --git a/manual/compression/README.md b/manual/compression/README.md
index c6cd8c8..3632610 100644
--- a/manual/compression/README.md
+++ b/manual/compression/README.md
@@ -85,4 +85,4 @@
     .build();
 ```
 
-[pom]: https://repo1.maven.org/maven2/com/datastax/cassandra/cassandra-driver-parent/3.4.0/cassandra-driver-parent-3.4.0.pom
+[pom]: https://repo1.maven.org/maven2/com/datastax/cassandra/cassandra-driver-parent/3.5.0/cassandra-driver-parent-3.5.0.pom
diff --git a/manual/custom_codecs/README.md b/manual/custom_codecs/README.md
index 23b4c34..fb031fc 100644
--- a/manual/custom_codecs/README.md
+++ b/manual/custom_codecs/README.md
@@ -447,26 +447,26 @@
 consider using prepared statements all the time.
 
 [JAVA-721]: https://datastax-oss.atlassian.net/browse/JAVA-721
-[TypeCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TypeCodec.html
-[LocalDate]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/LocalDate.html
+[TypeCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TypeCodec.html
+[LocalDate]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/LocalDate.html
 [ByteBuffer]: http://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html
-[serialize]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TypeCodec.html#serialize-T-com.datastax.driver.core.ProtocolVersion-
-[deserialize]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TypeCodec.html#deserialize-java.nio.ByteBuffer-com.datastax.driver.core.ProtocolVersion-
-[TypeCodec.format]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TypeCodec.html#format-T-
-[TypeCodec.parse]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TypeCodec.html#parse-java.lang.String-
-[accepts]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TypeCodec.html#accepts-com.datastax.driver.core.DataType-
-[CodecRegistry]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/CodecRegistry.html
-[CodecNotFoundException]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/CodecNotFoundException.html
+[serialize]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TypeCodec.html#serialize-T-com.datastax.driver.core.ProtocolVersion-
+[deserialize]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TypeCodec.html#deserialize-java.nio.ByteBuffer-com.datastax.driver.core.ProtocolVersion-
+[TypeCodec.format]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TypeCodec.html#format-T-
+[TypeCodec.parse]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TypeCodec.html#parse-java.lang.String-
+[accepts]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TypeCodec.html#accepts-com.datastax.driver.core.DataType-
+[CodecRegistry]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/CodecRegistry.html
+[CodecNotFoundException]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/CodecNotFoundException.html
 [Jackson]: https://github.com/FasterXML/jackson
 [AbstractType]: https://github.com/apache/cassandra/blob/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java
-[UserType]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/UserType.html
-[UDTValue]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/UDTValue.html
-[TupleType]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TupleType.html
-[TupleValue]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TupleValue.html
-[CustomType]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/DataType.CustomType.html
+[UserType]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/UserType.html
+[UDTValue]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/UDTValue.html
+[TupleType]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TupleType.html
+[TupleValue]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TupleValue.html
+[CustomType]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/DataType.CustomType.html
 [TypeToken]: https://google.github.io/guava/releases/19.0/api/docs/com/google/common/reflect/TypeToken.html
-[SimpleStatement]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SimpleStatement.html
-[BuiltStatement]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/querybuilder/BuiltStatement.html
-[setList]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SettableByIndexData.html#setList-int-java.util.List-
-[setSet]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SettableByIndexData.html#setSet-int-java.util.Set-
-[setMap]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SettableByIndexData.html#setMap-int-java.util.Map-
+[SimpleStatement]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SimpleStatement.html
+[BuiltStatement]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/querybuilder/BuiltStatement.html
+[setList]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SettableByIndexData.html#setList-int-java.util.List-
+[setSet]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SettableByIndexData.html#setSet-int-java.util.Set-
+[setMap]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SettableByIndexData.html#setMap-int-java.util.Map-
diff --git a/manual/custom_codecs/extras/README.md b/manual/custom_codecs/extras/README.md
index b4fd236..d4e403b 100644
--- a/manual/custom_codecs/extras/README.md
+++ b/manual/custom_codecs/extras/README.md
@@ -10,7 +10,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-extras</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
 </dependency>
 ```
 
@@ -58,10 +58,10 @@
         ZonedDateTime.parse("2010-06-30T01:20:47.999+01:00"));
 ```
 
-[InstantCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/jdk8/InstantCodec.html
-[LocalDateCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/jdk8/LocalDateCodec.html
-[LocalTimeCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/jdk8/LocalTimeCodec.html
-[ZonedDateTimeCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/jdk8/ZonedDateTimeCodec.html
+[InstantCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/jdk8/InstantCodec.html
+[LocalDateCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/jdk8/LocalDateCodec.html
+[LocalTimeCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/jdk8/LocalTimeCodec.html
+[ZonedDateTimeCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/jdk8/ZonedDateTimeCodec.html
 [Instant]: https://docs.oracle.com/javase/8/docs/api/java/time/Instant.html
 [LocalDate]: https://docs.oracle.com/javase/8/docs/api/java/time/LocalDate.html
 [LocalTime]: https://docs.oracle.com/javase/8/docs/api/java/time/LocalTime.html
@@ -111,10 +111,10 @@
         DateTime.parse("2010-06-30T01:20:47.999+01:00"));
 ```
 
-[InstantCodec_joda]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/joda/InstantCodec.html
-[LocalDateCodec_joda]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/joda/LocalDateCodec.html
-[LocalTimeCodec_joda]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/joda/LocalTimeCodec.html
-[DateTimeCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/joda/DateTimeCodec.html
+[InstantCodec_joda]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/joda/InstantCodec.html
+[LocalDateCodec_joda]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/joda/LocalDateCodec.html
+[LocalTimeCodec_joda]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/joda/LocalTimeCodec.html
+[DateTimeCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/joda/DateTimeCodec.html
 [DateTime]: http://www.joda.org/joda-time/apidocs/org/joda/time/DateTime.html
 [Instant_joda]: http://www.joda.org/joda-time/apidocs/org/joda/time/Instant.html
 [LocalDate_joda]: http://www.joda.org/joda-time/apidocs/org/joda/time/LocalDate.html
@@ -132,8 +132,8 @@
 There is no extra codec for `time`, because by default the driver already maps that type to a `long` representing the
 number of nanoseconds since midnight.
 
-[SimpleTimestampCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/date/SimpleTimestampCodec.html
-[SimpleDateCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/date/SimpleDateCodec.html
+[SimpleTimestampCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/date/SimpleTimestampCodec.html
+[SimpleDateCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/date/SimpleDateCodec.html
 
 
 ### Enums
@@ -171,8 +171,8 @@
 In practice, this is unlikely to happen, because you'll probably stick to a single CQL type for a given enum type;
 however, if you ever run into that issue, the workaround is to use [prepared statements](../../statements/prepared/), for which the driver knows the CQL type and can pick the exact codec.
 
-[EnumNameCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/enums/EnumNameCodec.html
-[EnumOrdinalCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/enums/EnumOrdinalCodec.html
+[EnumNameCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/enums/EnumNameCodec.html
+[EnumOrdinalCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/enums/EnumOrdinalCodec.html
 [name]: https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#name--
 [ordinal]: https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html#ordinal--
 
@@ -217,7 +217,7 @@
 // owner saved as '{"id":1,"name":"root"}'
 ```
 
-[JacksonJsonCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/json/JacksonJsonCodec.html
+[JacksonJsonCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/json/JacksonJsonCodec.html
 [Jackson]: https://github.com/FasterXML/jackson
 
 
@@ -256,7 +256,7 @@
 ```
 
 
-[Jsr353JsonCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/json/Jsr353JsonCodec.html
+[Jsr353JsonCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/json/Jsr353JsonCodec.html
 [JsonStructure]: https://docs.oracle.com/javaee/7/tutorial/jsonp002.htm
 
 
@@ -309,7 +309,7 @@
 anonymous inner class; we recommend storing these tokens as constants in a utility class, to avoid creating them too
 often.
 
-[OptionalCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/jdk8/OptionalCodec.html
+[OptionalCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/jdk8/OptionalCodec.html
 [Optional]: https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html
 [TypeToken]: http://google.github.io/guava/releases/19.0/api/docs/com/google/common/reflect/TypeToken.html
 
@@ -353,7 +353,7 @@
 
 See the JDK8 Optional section above for explanations about [TypeToken].
 
-[OptionalCodec_guava]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/guava/OptionalCodec.html
+[OptionalCodec_guava]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/guava/OptionalCodec.html
 [Optional_guava]: http://google.github.io/guava/releases/19.0/api/docs/com/google/common/base/Optional.html
 
 
@@ -378,9 +378,9 @@
 Package [com.datastax.driver.extras.codecs.arrays][arrays] contains similar codecs for all primitive types, and
 [ObjectArrayCodec] to map arrays of objects.
 
-[IntArrayCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/arrays/IntArrayCodec.html
-[ObjectArrayCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/arrays/ObjectArrayCodec.html
-[arrays]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/arrays/package-summary.html
+[IntArrayCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/arrays/IntArrayCodec.html
+[ObjectArrayCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/arrays/ObjectArrayCodec.html
+[arrays]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/arrays/package-summary.html
 
 ### Abstract utilities
 
@@ -410,5 +410,5 @@
 optimal approach. If performance is paramount, it's better to start from scratch and convert your objects to
 `ByteBuffer` directly.
 
-[MappingCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/MappingCodec.html
-[ParsingCodec]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/extras/codecs/ParsingCodec.html
+[MappingCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/MappingCodec.html
+[ParsingCodec]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/extras/codecs/ParsingCodec.html
diff --git a/manual/custom_payloads/README.md b/manual/custom_payloads/README.md
index 3ec71b8..061cc86 100644
--- a/manual/custom_payloads/README.md
+++ b/manual/custom_payloads/README.md
@@ -241,8 +241,8 @@
 [CASSANDRA-8553]: https://issues.apache.org/jira/browse/CASSANDRA-8553
 [v4spec]: https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v4.spec
 [qh]: https://issues.apache.org/jira/browse/CASSANDRA-6659
-[nhae]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/NoHostAvailableException.html
+[nhae]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/NoHostAvailableException.html
 [chm]: https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ConcurrentHashMap.html
 [immutablemap]: http://docs.guava-libraries.googlecode.com/git/javadoc/com/google/common/collect/ImmutableMap.html
-[ufe]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/UnsupportedFeatureException.html
+[ufe]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/UnsupportedFeatureException.html
 
diff --git a/manual/idempotence/README.md b/manual/idempotence/README.md
index 5f31046..e0c1789 100644
--- a/manual/idempotence/README.md
+++ b/manual/idempotence/README.md
@@ -125,8 +125,8 @@
 If linearizability is important for you, you should ensure that lightweight transactions are appropriately flagged as
 not idempotent.
 
-[isIdempotent]:          http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Statement.html#isIdempotent--
-[setDefaultIdempotence]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/QueryOptions.html#setDefaultIdempotence-boolean-
-[QueryBuilder]:          http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/querybuilder/QueryBuilder.html
+[isIdempotent]:          http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Statement.html#isIdempotent--
+[setDefaultIdempotence]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/QueryOptions.html#setDefaultIdempotence-boolean-
+[QueryBuilder]:          http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/querybuilder/QueryBuilder.html
 
 [linearizability]: https://en.wikipedia.org/wiki/Linearizability#Definition_of_linearizability
\ No newline at end of file
diff --git a/manual/load_balancing/README.md b/manual/load_balancing/README.md
index 5afa769..5a0f1ed 100644
--- a/manual/load_balancing/README.md
+++ b/manual/load_balancing/README.md
@@ -295,11 +295,11 @@
 Query plans are based on the child policy's, except that hosts that are currently excluded for being too slow are moved
 to the end of the plan.
 
-[withExclusionThreshold]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withExclusionThreshold-double-
-[withMininumMeasurements]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withMininumMeasurements-int-
-[withRetryPeriod]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withRetryPeriod-long-java.util.concurrent.TimeUnit-
-[withScale]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withScale-long-java.util.concurrent.TimeUnit-
-[withUpdateRate]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withUpdateRate-long-java.util.concurrent.TimeUnit-
+[withExclusionThreshold]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withExclusionThreshold-double-
+[withMininumMeasurements]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withMininumMeasurements-int-
+[withRetryPeriod]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withRetryPeriod-long-java.util.concurrent.TimeUnit-
+[withScale]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withScale-long-java.util.concurrent.TimeUnit-
+[withUpdateRate]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LatencyAwarePolicy.Builder.html#withUpdateRate-long-java.util.concurrent.TimeUnit-
 
 ### Filtering policies
 
@@ -317,15 +317,15 @@
 complex ones like `DCAwareRoundRobinPolicy`.
 
 
-[LoadBalancingPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LoadBalancingPolicy.html
-[RoundRobinPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RoundRobinPolicy.html
-[DCAwareRoundRobinPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/DCAwareRoundRobinPolicy.html
-[TokenAwarePolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/TokenAwarePolicy.html
-[LatencyAwarePolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LatencyAwarePolicy.html
-[HostFilterPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/HostFilterPolicy.html
-[WhiteListPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/WhiteListPolicy.html
-[HostDistance]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/HostDistance.html
-[refreshConnectedHosts]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PoolingOptions.html#refreshConnectedHosts--
-[setMetadataEnabled]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/QueryOptions.html#setMetadataEnabled-boolean-
-[Statement#getKeyspace]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Statement.html#getKeyspace--
-[Statement#getRoutingKey]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Statement.html#getRoutingKey--
+[LoadBalancingPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LoadBalancingPolicy.html
+[RoundRobinPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RoundRobinPolicy.html
+[DCAwareRoundRobinPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/DCAwareRoundRobinPolicy.html
+[TokenAwarePolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/TokenAwarePolicy.html
+[LatencyAwarePolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LatencyAwarePolicy.html
+[HostFilterPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/HostFilterPolicy.html
+[WhiteListPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/WhiteListPolicy.html
+[HostDistance]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/HostDistance.html
+[refreshConnectedHosts]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PoolingOptions.html#refreshConnectedHosts--
+[setMetadataEnabled]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/QueryOptions.html#setMetadataEnabled-boolean-
+[Statement#getKeyspace]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Statement.html#getKeyspace--
+[Statement#getRoutingKey]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Statement.html#getRoutingKey--
diff --git a/manual/logging/README.md b/manual/logging/README.md
index 1b9be68..3331784 100644
--- a/manual/logging/README.md
+++ b/manual/logging/README.md
@@ -299,4 +299,4 @@
 </log4j:configuration>
 ```
 
-[query_logger]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/QueryLogger.html
+[query_logger]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/QueryLogger.html
diff --git a/manual/metadata/README.md b/manual/metadata/README.md
index 742ae9c..993c021 100644
--- a/manual/metadata/README.md
+++ b/manual/metadata/README.md
@@ -4,7 +4,7 @@
 is connected to. It is available via
 [Cluster#getMetadata()][getMetadata].
 
-[getMetadata]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.html#getMetadata--
+[getMetadata]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.html#getMetadata--
 
 ### Schema metadata
 
@@ -12,8 +12,8 @@
 to get keyspace-level metadata. From there you can access the keyspace's
 objects (tables, and UDTs and UDFs if relevant).
 
-[getKeyspace]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#getKeyspace-java.lang.String-
-[getKeyspaces]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#getKeyspaces--
+[getKeyspace]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#getKeyspace-java.lang.String-
+[getKeyspaces]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#getKeyspaces--
 
 #### Refreshes
 
@@ -47,8 +47,8 @@
 otherwise the listener could be notified with a great deal of "Added" events as
 the driver builds the schema metadata from scratch for the first time.
 
-[SchemaChangeListener]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SchemaChangeListener.html
-[registerListener]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.html#register-com.datastax.driver.core.SchemaChangeListener-
+[SchemaChangeListener]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SchemaChangeListener.html
+[registerListener]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.html#register-com.datastax.driver.core.SchemaChangeListener-
 
 #### Schema agreement
 
@@ -135,9 +135,9 @@
 
 Check out the API docs for the features in this section:
 
-* [withMaxSchemaAgreementWaitSeconds(int)](http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.Builder.html#withMaxSchemaAgreementWaitSeconds-int-)
-* [isSchemaInAgreement()](http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ExecutionInfo.html#isSchemaInAgreement--)
-* [checkSchemaAgreement()](http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#checkSchemaAgreement--)
+* [withMaxSchemaAgreementWaitSeconds(int)](http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.Builder.html#withMaxSchemaAgreementWaitSeconds-int-)
+* [isSchemaInAgreement()](http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ExecutionInfo.html#isSchemaInAgreement--)
+* [checkSchemaAgreement()](http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#checkSchemaAgreement--)
 
 
 ### Token metadata
@@ -181,14 +181,14 @@
 table (see
 [CASSANDRA-7688](https://issues.apache.org/jira/browse/CASSANDRA-7688)).
 
-[metadata]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html
-[getTokenRanges]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#getTokenRanges--
-[getTokenRanges2]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#getTokenRanges-java.lang.String-com.datastax.driver.core.Host-
-[getReplicas]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#getReplicas-java.lang.String-com.datastax.driver.core.TokenRange-
-[newToken]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#newToken-java.lang.String-
-[newTokenRange]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metadata.html#newTokenRange-com.datastax.driver.core.Token-com.datastax.driver.core.Token-
-[TokenRange]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TokenRange.html
-[getTokens]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Host.html#getTokens--
-[setToken]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/BoundStatement.html#setToken-int-com.datastax.driver.core.Token-
-[getToken]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Row.html#getToken-int-
-[getPKToken]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Row.html#getPartitionKeyToken--
+[metadata]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html
+[getTokenRanges]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#getTokenRanges--
+[getTokenRanges2]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#getTokenRanges-java.lang.String-com.datastax.driver.core.Host-
+[getReplicas]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#getReplicas-java.lang.String-com.datastax.driver.core.TokenRange-
+[newToken]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#newToken-java.lang.String-
+[newTokenRange]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metadata.html#newTokenRange-com.datastax.driver.core.Token-com.datastax.driver.core.Token-
+[TokenRange]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TokenRange.html
+[getTokens]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Host.html#getTokens--
+[setToken]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/BoundStatement.html#setToken-int-com.datastax.driver.core.Token-
+[getToken]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Row.html#getToken-int-
+[getPKToken]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Row.html#getPartitionKeyToken--
diff --git a/manual/metrics/README.md b/manual/metrics/README.md
index 78c42af..81b83b7 100644
--- a/manual/metrics/README.md
+++ b/manual/metrics/README.md
@@ -38,7 +38,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-core</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
   <exclusions>
     <exclusion>
       <groupId>io.dropwizard.metrics</groupId>
@@ -146,8 +146,8 @@
 [Reporters]: http://metrics.dropwizard.io/3.2.2/manual/core.html#reporters
 [MetricRegistry]: http://metrics.dropwizard.io/3.2.2/apidocs/com/codahale/metrics/MetricRegistry.html
 [MXBeans]: https://docs.oracle.com/javase/tutorial/jmx/mbeans/mxbeans.html
-[withClusterName]: https://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.Builder.html#withClusterName-java.lang.String-
-[withoutMetrics]: https://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.Builder.html#withoutMetrics--
-[withoutJMXReporting]: https://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.Builder.html#withoutJMXReporting--
-[getMetrics]: https://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Cluster.html#getMetrics--
-[Metrics]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metrics.html
+[withClusterName]: https://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.Builder.html#withClusterName-java.lang.String-
+[withoutMetrics]: https://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.Builder.html#withoutMetrics--
+[withoutJMXReporting]: https://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.Builder.html#withoutJMXReporting--
+[getMetrics]: https://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Cluster.html#getMetrics--
+[Metrics]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metrics.html
diff --git a/manual/native_protocol/README.md b/manual/native_protocol/README.md
index fbab414..7fc238e 100644
--- a/manual/native_protocol/README.md
+++ b/manual/native_protocol/README.md
@@ -63,7 +63,7 @@
   [/127.0.0.1:9042] Host /127.0.0.1:9042 does not support protocol version V3 but V2))
 ```
 
-[gpv]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ProtocolOptions.html#getProtocolVersion--
+[gpv]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ProtocolOptions.html#getProtocolVersion--
 
 #### Protocol version with mixed clusters
 
@@ -94,19 +94,19 @@
 #### v1 to v2
 
 * bound variables in simple statements
-  ([Session#execute(String, Object...)](http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html#execute-java.lang.String-java.lang.Object...-))
-* [batch statements](http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/BatchStatement.html)
+  ([Session#execute(String, Object...)](http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html#execute-java.lang.String-java.lang.Object...-))
+* [batch statements](http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/BatchStatement.html)
 * [query paging](../paging/)
 
 #### v2 to v3
 
 * the number of stream ids per connection goes from 128 to 32768 (see
   [Connection pooling](../pooling/))
-* [serial consistency on batch statements](http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/BatchStatement.html#setSerialConsistencyLevel-com.datastax.driver.core.ConsistencyLevel-)
+* [serial consistency on batch statements](http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/BatchStatement.html#setSerialConsistencyLevel-com.datastax.driver.core.ConsistencyLevel-)
 * [client-side timestamps](../query_timestamps/)
 
 #### v3 to v4
 
-* [query warnings](http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ExecutionInfo.html#getWarnings--)
+* [query warnings](http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ExecutionInfo.html#getWarnings--)
 * allowed unset values in bound statements
 * [Custom payloads](../custom_payloads/)
diff --git a/manual/object_mapper/README.md b/manual/object_mapper/README.md
index 4c51d6b..da7df1b 100644
--- a/manual/object_mapper/README.md
+++ b/manual/object_mapper/README.md
@@ -11,7 +11,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-mapping</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
 </dependency>
 ```
 
diff --git a/manual/object_mapper/creating/README.md b/manual/object_mapper/creating/README.md
index ed74cee..b645065 100644
--- a/manual/object_mapper/creating/README.md
+++ b/manual/object_mapper/creating/README.md
@@ -149,9 +149,9 @@
     .setName("John Doe");
 ```
 
-[table]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Table.html
+[table]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Table.html
 [case-sensitive]:http://docs.datastax.com/en/cql/3.3/cql/cql_reference/ucase-lcase_r.html
-[consistency level]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ConsistencyLevel.html
+[consistency level]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ConsistencyLevel.html
 [java-beans]:https://docs.oracle.com/javase/tutorial/javabeans/writing/properties.html
 [set-accessible]:https://docs.oracle.com/javase/8/docs/api/java/lang/reflect/AccessibleObject.html#setAccessible-boolean-
 
@@ -189,7 +189,7 @@
 private String userName;
 ```
 
-[column]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Column.html
+[column]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Column.html
 
 #### Primary key fields
 
@@ -213,8 +213,8 @@
 The order of the indices must match that of the columns in the table
 declaration.
 
-[pk]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/PartitionKey.html
-[cc]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/ClusteringColumn.html
+[pk]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/PartitionKey.html
+[cc]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/ClusteringColumn.html
 [pks]:http://thelastpickle.com/blog/2013/01/11/primary-keys-in-cql.html
 
 #### Computed fields
@@ -250,7 +250,7 @@
 [JAVA-832](https://datastax-oss.atlassian.net/browse/JAVA-832)).
 
 [User Defined Functions]:http://www.planetcassandra.org/blog/user-defined-functions-in-cassandra-3-0/
-[computed]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Computed.html
+[computed]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Computed.html
 
 #### Transient properties
 
@@ -259,7 +259,7 @@
 a Java bean property from being mapped. Like other column-level annotations, 
 it should be placed on either the field declaration or the property getter method.
 
-[transient]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Transient.html
+[transient]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Transient.html
 
 ### Mapping User Types
 
@@ -322,8 +322,8 @@
 nesting level.
 
 [User Defined Types]: ../../udts/
-[udt]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/UDT.html
-[field]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Field.html
+[udt]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/UDT.html
+[field]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Field.html
 
 ### Mapping collections
 
@@ -359,9 +359,9 @@
 private Map<String, List<Address>> frozenValueMap;
 ```
 
-[frozen]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Frozen.html
-[frozenkey]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/FrozenKey.html
-[frozenvalue]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/FrozenValue.html
+[frozen]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Frozen.html
+[frozenkey]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/FrozenKey.html
+[frozenvalue]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/FrozenValue.html
 
 
 ### Polymorphism support
diff --git a/manual/object_mapper/custom_codecs/README.md b/manual/object_mapper/custom_codecs/README.md
index d8ab888..90c3a22 100644
--- a/manual/object_mapper/custom_codecs/README.md
+++ b/manual/object_mapper/custom_codecs/README.md
@@ -98,9 +98,9 @@
 
 This also works with [@Field][field] and [@Param][param] annotations.
 
-[column]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Column.html
-[field]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Field.html
-[param]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Param.html
+[column]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Column.html
+[field]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Field.html
+[param]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Param.html
 
 
 ## Implicit UDT codecs
diff --git a/manual/object_mapper/using/README.md b/manual/object_mapper/using/README.md
index 175e3dd..8b2b374 100644
--- a/manual/object_mapper/using/README.md
+++ b/manual/object_mapper/using/README.md
@@ -28,9 +28,9 @@
 calling `manager#mapper` more than once for the same class will return
 the previously generated mapper.
 
-[Mapper]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/Mapper.html
-[MappingManager]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/MappingManager.html
-[Session]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html
+[Mapper]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/Mapper.html
+[MappingManager]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/MappingManager.html
+[Session]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html
 
 #### Basic CRUD operations
 
@@ -179,7 +179,7 @@
 and `isExhausted()`. Note that iterating the `Result` will consume the
 `ResultSet`, and vice-versa.
 
-[Result]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/Result.html
+[Result]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/Result.html
 
 ### Accessors
 
@@ -229,7 +229,7 @@
 ResultSet insert(@Param("u") UUID userId, @Param("n") String name);
 ```
 
-[param]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/Param.html
+[param]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/Param.html
 
 If a method argument is a Java enumeration, it must be annotated with
 `@Enumerated` to indicate how to convert it to a CQL type (the rules are
@@ -297,7 +297,7 @@
 public ListenableFuture<Result<User>> getAllAsync();
 ```
 
-[@QueryParameters]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/annotations/QueryParameters.html
+[@QueryParameters]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/annotations/QueryParameters.html
 
 
 ### Mapping configuration
@@ -341,6 +341,6 @@
 There is more to `DefaultPropertyMapper`; see the Javadocs and implementation for details.
 
 
-[MappingConfiguration]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/MappingConfiguration.html
-[PropertyMapper]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/PropertyMapper.html
-[DefaultPropertyMapper]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/mapping/DefaultPropertyMapper.html
+[MappingConfiguration]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/MappingConfiguration.html
+[PropertyMapper]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/PropertyMapper.html
+[DefaultPropertyMapper]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/mapping/DefaultPropertyMapper.html
diff --git a/manual/paging/README.md b/manual/paging/README.md
index ad99e28..e87c864 100644
--- a/manual/paging/README.md
+++ b/manual/paging/README.md
@@ -176,8 +176,8 @@
 }
 ```
 
-[result_set]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ResultSet.html
-[paging_state]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PagingState.html
+[result_set]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ResultSet.html
+[paging_state]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PagingState.html
 
 
 Due to internal implementation details, `PagingState` instances are not
@@ -239,8 +239,8 @@
   implementing your own validation logic (for example, signing the raw
   state with a private key).
 
-[gpsu]: http://www.datastax.com/drivers/java/3.2/com/datastax/driver/core/ExecutionInfo.html#getPagingStateUnsafe--
-[spsu]: http://www.datastax.com/drivers/java/3.2/com/datastax/driver/core/Statement.html#setPagingStateUnsafe-byte:A-
+[gpsu]: https://www.datastax.com/drivers/java/3.5/com/datastax/driver/core/ExecutionInfo.html#getPagingStateUnsafe--
+[spsu]: https://www.datastax.com/drivers/java/3.5/com/datastax/driver/core/Statement.html#setPagingStateUnsafe-byte:A-
 
 ### Offset queries
 
diff --git a/manual/pooling/README.md b/manual/pooling/README.md
index 16dc754..ed39b85 100644
--- a/manual/pooling/README.md
+++ b/manual/pooling/README.md
@@ -283,16 +283,16 @@
   [newConnectionThreshold][nct] so that enough connections are added by
   the time you reach the bottleneck.
 
-[result_set_future]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ResultSetFuture.html
-[pooling_options]:   http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PoolingOptions.html
-[lbp]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LoadBalancingPolicy.html
-[nct]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PoolingOptions.html#setNewConnectionThreshold-com.datastax.driver.core.HostDistance-int-
-[mrpc]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PoolingOptions.html#setMaxRequestsPerConnection-com.datastax.driver.core.HostDistance-int-
-[sits]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PoolingOptions.html#setIdleTimeoutSeconds-int-
-[rtm]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#getReadTimeoutMillis--
-[smqs]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PoolingOptions.html#setMaxQueueSize-int-
-[sptm]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PoolingOptions.html#setPoolTimeoutMillis-int-
-[nhae]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/NoHostAvailableException.html
-[getErrors]:         http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/NoHostAvailableException.html#getErrors--
-[get_state]:         http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html#getState--
-[BusyPoolException]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/BusyPoolException.html
+[result_set_future]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ResultSetFuture.html
+[pooling_options]:   http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PoolingOptions.html
+[lbp]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LoadBalancingPolicy.html
+[nct]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PoolingOptions.html#setNewConnectionThreshold-com.datastax.driver.core.HostDistance-int-
+[mrpc]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PoolingOptions.html#setMaxRequestsPerConnection-com.datastax.driver.core.HostDistance-int-
+[sits]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PoolingOptions.html#setIdleTimeoutSeconds-int-
+[rtm]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#getReadTimeoutMillis--
+[smqs]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PoolingOptions.html#setMaxQueueSize-int-
+[sptm]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PoolingOptions.html#setPoolTimeoutMillis-int-
+[nhae]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/NoHostAvailableException.html
+[getErrors]:         http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/NoHostAvailableException.html#getErrors--
+[get_state]:         http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html#getState--
+[BusyPoolException]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/BusyPoolException.html
diff --git a/manual/query_timestamps/README.md b/manual/query_timestamps/README.md
index 8f7652b..535a7bf 100644
--- a/manual/query_timestamps/README.md
+++ b/manual/query_timestamps/README.md
@@ -140,10 +140,10 @@
 Steps 2 and 3 only apply if native protocol v3 or above is in use.
 
 
-[TimestampGenerator]:                     http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TimestampGenerator.html
-[AtomicMonotonicTimestampGenerator]:      http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/AtomicMonotonicTimestampGenerator.html
-[ThreadLocalMonotonicTimestampGenerator]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ThreadLocalMonotonicTimestampGenerator.html
-[ServerSideTimestampGenerator]:           http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ServerSideTimestampGenerator.html
+[TimestampGenerator]:                     http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TimestampGenerator.html
+[AtomicMonotonicTimestampGenerator]:      http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/AtomicMonotonicTimestampGenerator.html
+[ThreadLocalMonotonicTimestampGenerator]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ThreadLocalMonotonicTimestampGenerator.html
+[ServerSideTimestampGenerator]:           http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ServerSideTimestampGenerator.html
 
 [gettimeofday]: http://man7.org/linux/man-pages/man2/settimeofday.2.html
 [JNR]: https://github.com/jnr/jnr-ffi
diff --git a/manual/reconnection/README.md b/manual/reconnection/README.md
index 4cbe8e1..befc5f8 100644
--- a/manual/reconnection/README.md
+++ b/manual/reconnection/README.md
@@ -8,4 +8,4 @@
 - scheduled reconnections vs. gossip events
 -->
 
-[ReconnectionPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/ReconnectionPolicy.html
\ No newline at end of file
+[ReconnectionPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/ReconnectionPolicy.html
\ No newline at end of file
diff --git a/manual/retries/README.md b/manual/retries/README.md
index f86d20f..2a66be6 100644
--- a/manual/retries/README.md
+++ b/manual/retries/README.md
@@ -146,33 +146,33 @@
 `IdempotenceAwareRetryPolicy` before).
 
 
-[RetryDecision]:                        http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html
-[retry()]:                              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#retry-com.datastax.driver.core.ConsistencyLevel-
-[tryNextHost()]:                        http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#tryNextHost-com.datastax.driver.core.ConsistencyLevel-
-[rethrow()]:                            http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#rethrow--
-[ignore()]:                             http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#ignore--
-[NoHostAvailableException]:             http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/NoHostAvailableException.html
-[getErrors()]:                          http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/NoHostAvailableException.html#getErrors--
-[RetryPolicy]:                          http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.html
-[DefaultRetryPolicy]:                   http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/DefaultRetryPolicy.html
-[onReadTimeout]:                        http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onReadTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-boolean-int-
-[onWriteTimeout]:                       http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onWriteTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-com.datastax.driver.core.WriteType-int-int-int-
-[onUnavailable]:                        http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onUnavailable-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-int-
-[onRequestError]:                       http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onRequestError-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-com.datastax.driver.core.exceptions.DriverException-int-
-[UnavailableException]:                 http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/UnavailableException.html
-[ReadTimeoutException]:                 http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/ReadTimeoutException.html
-[WriteTimeoutException]:                http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/WriteTimeoutException.html
-[OverloadedException]:                  http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/OverloadedException.html
-[ServerError]:                          http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/ServerError.html
-[OperationTimedOutException]:           http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/OperationTimedOutException.html
-[ConnectionException]:                  http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/ConnectionException.html
-[QueryValidationException]:             http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/QueryValidationException.html
-[InvalidQueryException]:                http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/InvalidQueryException.html
-[InvalidConfigurationInQueryException]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/InvalidConfigurationInQueryException.html
-[UnauthorizedException]:                http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/UnauthorizedException.html
-[SyntaxError]:                          http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/SyntaxError.html
-[AlreadyExistsException]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/AlreadyExistsException.html
-[TruncateException]:                    http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/TruncateException.html
+[RetryDecision]:                        http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html
+[retry()]:                              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#retry-com.datastax.driver.core.ConsistencyLevel-
+[tryNextHost()]:                        http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#tryNextHost-com.datastax.driver.core.ConsistencyLevel-
+[rethrow()]:                            http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#rethrow--
+[ignore()]:                             http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.RetryDecision.html#ignore--
+[NoHostAvailableException]:             http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/NoHostAvailableException.html
+[getErrors()]:                          http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/NoHostAvailableException.html#getErrors--
+[RetryPolicy]:                          http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.html
+[DefaultRetryPolicy]:                   http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/DefaultRetryPolicy.html
+[onReadTimeout]:                        http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onReadTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-boolean-int-
+[onWriteTimeout]:                       http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onWriteTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-com.datastax.driver.core.WriteType-int-int-int-
+[onUnavailable]:                        http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onUnavailable-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-int-
+[onRequestError]:                       http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/DefaultRetryPolicy.html#onRequestError-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-com.datastax.driver.core.exceptions.DriverException-int-
+[UnavailableException]:                 http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/UnavailableException.html
+[ReadTimeoutException]:                 http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/ReadTimeoutException.html
+[WriteTimeoutException]:                http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/WriteTimeoutException.html
+[OverloadedException]:                  http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/OverloadedException.html
+[ServerError]:                          http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/ServerError.html
+[OperationTimedOutException]:           http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/OperationTimedOutException.html
+[ConnectionException]:                  http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/ConnectionException.html
+[QueryValidationException]:             http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/QueryValidationException.html
+[InvalidQueryException]:                http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/InvalidQueryException.html
+[InvalidConfigurationInQueryException]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/InvalidConfigurationInQueryException.html
+[UnauthorizedException]:                http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/UnauthorizedException.html
+[SyntaxError]:                          http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/SyntaxError.html
+[AlreadyExistsException]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/AlreadyExistsException.html
+[TruncateException]:                    http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/TruncateException.html
 
 [query plan]: ../load_balancing/#query-plan
 [connection pool]: ../pooling/
diff --git a/manual/shaded_jar/README.md b/manual/shaded_jar/README.md
index 834d2fd..908604b 100644
--- a/manual/shaded_jar/README.md
+++ b/manual/shaded_jar/README.md
@@ -12,7 +12,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-core</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
   <classifier>shaded</classifier>
   <!-- Because the shaded JAR uses the original POM, you still need
        to exclude this dependency explicitly: -->
@@ -32,7 +32,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-core</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
   <classifier>shaded</classifier>
   <exclusions>
     <exclusion>
@@ -44,7 +44,7 @@
 <dependency>
   <groupId>com.datastax.cassandra</groupId>
   <artifactId>cassandra-driver-mapping</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
   <exclusions>
     <exclusion>
       <groupId>com.datastax.cassandra</groupId>
@@ -74,5 +74,5 @@
     Detected shaded Netty classes in the classpath; native epoll transport will not work properly, defaulting to NIO.
 
 
-[NettyOptions]:http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/NettyOptions.html
+[NettyOptions]:http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/NettyOptions.html
 [Netty native transports]:http://netty.io/wiki/native-transports.html
diff --git a/manual/socket_options/README.md b/manual/socket_options/README.md
index e822d20..ec86c14 100644
--- a/manual/socket_options/README.md
+++ b/manual/socket_options/README.md
@@ -117,15 +117,15 @@
 
 We might rename `SocketOptions.setReadTimeoutMillis` in a future version to clear up any confusion.
 
-[SocketOptions]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html
-[setReadTimeoutMillis]:       http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setReadTimeoutMillis-int-
-[setConnectTimeoutMillis]:    http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setConnectTimeoutMillis-int-
-[setKeepAlive]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setKeepAlive-boolean-
-[setReceiveBufferSize]:       http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setReceiveBufferSize-int-
-[setReuseAddress]:            http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setReuseAddress-boolean-
-[setSendBufferSize]:          http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setSendBufferSize-int-
-[setSoLinger]:                http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setSoLinger-int-
-[setTcpNoDelay]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SocketOptions.html#setTcpNoDelay-boolean-
-[onReadTimeout]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.html#onReadTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-boolean-int-
-[onRequestError]:             http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.html#onRequestError-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-com.datastax.driver.core.exceptions.DriverException-int-
-[OperationTimedOutException]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/exceptions/OperationTimedOutException.html
\ No newline at end of file
+[SocketOptions]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html
+[setReadTimeoutMillis]:       http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setReadTimeoutMillis-int-
+[setConnectTimeoutMillis]:    http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setConnectTimeoutMillis-int-
+[setKeepAlive]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setKeepAlive-boolean-
+[setReceiveBufferSize]:       http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setReceiveBufferSize-int-
+[setReuseAddress]:            http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setReuseAddress-boolean-
+[setSendBufferSize]:          http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setSendBufferSize-int-
+[setSoLinger]:                http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setSoLinger-int-
+[setTcpNoDelay]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SocketOptions.html#setTcpNoDelay-boolean-
+[onReadTimeout]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.html#onReadTimeout-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-int-int-boolean-int-
+[onRequestError]:             http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.html#onRequestError-com.datastax.driver.core.Statement-com.datastax.driver.core.ConsistencyLevel-com.datastax.driver.core.exceptions.DriverException-int-
+[OperationTimedOutException]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/exceptions/OperationTimedOutException.html
\ No newline at end of file
diff --git a/manual/speculative_execution/README.md b/manual/speculative_execution/README.md
index 1160f8b..cd24199 100644
--- a/manual/speculative_execution/README.md
+++ b/manual/speculative_execution/README.md
@@ -73,7 +73,7 @@
 `Cluster`.  This policy defines the threshold after which a new
 speculative execution will be triggered.
 
-[SpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/SpeculativeExecutionPolicy.html
+[SpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/SpeculativeExecutionPolicy.html
 
 Two implementations are provided with the driver:
 
@@ -101,7 +101,7 @@
 * if no response has been received at t0 + 1000 milliseconds, start
   another speculative execution on a third node.
 
-[ConstantSpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/ConstantSpeculativeExecutionPolicy.html
+[ConstantSpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/ConstantSpeculativeExecutionPolicy.html
 
 #### [PercentileSpeculativeExecutionPolicy]
 
@@ -160,10 +160,10 @@
 logger (see the [Logging](../logging/) section). In that case, you would
 create a single tracker object and share it with both components.
 
-[PercentileSpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/PercentileSpeculativeExecutionPolicy.html
-[PercentileTracker]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PercentileTracker.html
-[ClusterWidePercentileTracker]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ClusterWidePercentileTracker.html
-[PerHostPercentileTracker]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PerHostPercentileTracker.html
+[PercentileSpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/PercentileSpeculativeExecutionPolicy.html
+[PercentileTracker]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PercentileTracker.html
+[ClusterWidePercentileTracker]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ClusterWidePercentileTracker.html
+[PerHostPercentileTracker]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PerHostPercentileTracker.html
 [hdr]: http://hdrhistogram.github.io/HdrHistogram/
 
 #### Using your own
@@ -210,7 +210,7 @@
 The only impact is that all executions of the same query always share
 the same query plan, so each host will be used by at most one execution.
 
-[retry_policy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.html
+[retry_policy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.html
 
 ### Tuning and practical details
 
@@ -225,8 +225,8 @@
 It should only be a few percents of the total number of requests
 ([cluster.getMetrics().getRequestsTimer().getCount()][request_metric]).
 
-[se_metric]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metrics.Errors.html#getSpeculativeExecutions--
-[request_metric]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Metrics.html#getRequestsTimer--
+[se_metric]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metrics.Errors.html#getSpeculativeExecutions--
+[request_metric]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Metrics.html#getRequestsTimer--
 
 #### Stream id exhaustion
 
@@ -255,8 +255,8 @@
 using, you can check with
 [cluster.getConfiguration().getProtocolOptions().getProtocolVersion()][protocol_version].
 
-[session_state]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.State.html
-[protocol_version]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/ProtocolOptions.html#getProtocolVersion--
+[session_state]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.State.html
+[protocol_version]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/ProtocolOptions.html#getProtocolVersion--
 
 #### Request ordering and client timestamps
 
diff --git a/manual/ssl/README.md b/manual/ssl/README.md
index 16c935d..b3c9229 100644
--- a/manual/ssl/README.md
+++ b/manual/ssl/README.md
@@ -207,8 +207,8 @@
   .build();
 ```
 
-[RemoteEndpointAwareSSLOptions]:      http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/RemoteEndpointAwareSSLOptions.html
-[RemoteEndpointAwareJdkSSLOptions]:   http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/RemoteEndpointAwareJdkSSLOptions.html
-[newSSLEngine]:                       http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/RemoteEndpointAwareJdkSSLOptions.html#newSSLEngine-io.netty.channel.socket.SocketChannel-java.net.InetSocketAddress-
-[RemoteEndpointAwareNettySSLOptions]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/RemoteEndpointAwareNettySSLOptions.html
-[NettyOptions]:                       http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/NettyOptions.html
+[RemoteEndpointAwareSSLOptions]:      http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/RemoteEndpointAwareSSLOptions.html
+[RemoteEndpointAwareJdkSSLOptions]:   http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/RemoteEndpointAwareJdkSSLOptions.html
+[newSSLEngine]:                       http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/RemoteEndpointAwareJdkSSLOptions.html#newSSLEngine-io.netty.channel.socket.SocketChannel-java.net.InetSocketAddress-
+[RemoteEndpointAwareNettySSLOptions]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/RemoteEndpointAwareNettySSLOptions.html
+[NettyOptions]:                       http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/NettyOptions.html
diff --git a/manual/statements/README.md b/manual/statements/README.md
index 4e687ab..df8c839 100644
--- a/manual/statements/README.md
+++ b/manual/statements/README.md
@@ -32,11 +32,11 @@
 properties that influence statement execution. To achieve this, you can
 wrap your statements in a custom [StatementWrapper] implementation.
 
-[Statement]:                  http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Statement.html
-[QueryBuilder]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/querybuilder/QueryBuilder.html
-[StatementWrapper]:           http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/StatementWrapper.html
-[RetryPolicy]:                http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/RetryPolicy.html
-[LoadBalancingPolicy]:        http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/LoadBalancingPolicy.html
-[SpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/policies/SpeculativeExecutionPolicy.html
-[execute]:                    http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html#execute-com.datastax.driver.core.Statement-
-[executeAsync]:               http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html#executeAsync-com.datastax.driver.core.Statement-
+[Statement]:                  http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Statement.html
+[QueryBuilder]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/querybuilder/QueryBuilder.html
+[StatementWrapper]:           http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/StatementWrapper.html
+[RetryPolicy]:                http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/RetryPolicy.html
+[LoadBalancingPolicy]:        http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/LoadBalancingPolicy.html
+[SpeculativeExecutionPolicy]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/policies/SpeculativeExecutionPolicy.html
+[execute]:                    http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html#execute-com.datastax.driver.core.Statement-
+[executeAsync]:               http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html#executeAsync-com.datastax.driver.core.Statement-
diff --git a/manual/statements/batch/README.md b/manual/statements/batch/README.md
index 42ad8cc..6dc2f54 100644
--- a/manual/statements/batch/README.md
+++ b/manual/statements/batch/README.md
@@ -2,4 +2,4 @@
 
 *Coming soon... In the meantime, see the javadoc for [BatchStatement].*
 
-[BatchStatement]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/BatchStatement.html
+[BatchStatement]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/BatchStatement.html
diff --git a/manual/statements/built/README.md b/manual/statements/built/README.md
index a54ea21..ccd484c 100644
--- a/manual/statements/built/README.md
+++ b/manual/statements/built/README.md
@@ -2,4 +2,4 @@
 
 *Coming soon... In the meantime, see the javadoc for [QueryBuilder].*
 
-[QueryBuilder]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/querybuilder/QueryBuilder.html
\ No newline at end of file
+[QueryBuilder]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/querybuilder/QueryBuilder.html
\ No newline at end of file
diff --git a/manual/statements/prepared/README.md b/manual/statements/prepared/README.md
index 8f25579..f02b0a6 100644
--- a/manual/statements/prepared/README.md
+++ b/manual/statements/prepared/README.md
@@ -256,11 +256,11 @@
 This will be addressed in a future release of both Cassandra and the driver.  Follow
 [CASSANDRA-10786] and [JAVA-1196] for more information.
 
-[PreparedStatement]:    http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/PreparedStatement.html
-[BoundStatement]:       http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/BoundStatement.html
-[setPrepareOnAllHosts]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/QueryOptions.html#setPrepareOnAllHosts-boolean-
-[setReprepareOnUp]:     http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/QueryOptions.html#setReprepareOnUp-boolean-
-[execute]:              http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html#execute-com.datastax.driver.core.Statement-
-[executeAsync]:         http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/Session.html#executeAsync-com.datastax.driver.core.Statement-
+[PreparedStatement]:    http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/PreparedStatement.html
+[BoundStatement]:       http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/BoundStatement.html
+[setPrepareOnAllHosts]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/QueryOptions.html#setPrepareOnAllHosts-boolean-
+[setReprepareOnUp]:     http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/QueryOptions.html#setReprepareOnUp-boolean-
+[execute]:              http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html#execute-com.datastax.driver.core.Statement-
+[executeAsync]:         http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/Session.html#executeAsync-com.datastax.driver.core.Statement-
 [CASSANDRA-10786]:      https://issues.apache.org/jira/browse/CASSANDRA-10786
 [JAVA-1196]:            https://datastax-oss.atlassian.net/browse/JAVA-1196
diff --git a/manual/statements/simple/README.md b/manual/statements/simple/README.md
index 7740d40..82af671 100644
--- a/manual/statements/simple/README.md
+++ b/manual/statements/simple/README.md
@@ -128,4 +128,4 @@
         1, bytes);
 ```
 
-[SimpleStatement]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/SimpleStatement.html
+[SimpleStatement]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/SimpleStatement.html
diff --git a/manual/tuples/README.md b/manual/tuples/README.md
index 276d3ff..b58973c 100644
--- a/manual/tuples/README.md
+++ b/manual/tuples/README.md
@@ -96,7 +96,7 @@
 session.execute(bs);
 ```
 
-[TupleType]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TupleType.html
-[TupleValue]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TupleValue.html
-[newValueVararg]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TupleType.html#newValue-java.lang.Object...-
-[newValue]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/TupleType.html#newValue--
+[TupleType]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TupleType.html
+[TupleValue]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TupleValue.html
+[newValueVararg]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TupleType.html#newValue-java.lang.Object...-
+[newValue]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/TupleType.html#newValue--
diff --git a/manual/udts/README.md b/manual/udts/README.md
index 478c919..0b04961 100644
--- a/manual/udts/README.md
+++ b/manual/udts/README.md
@@ -2,4 +2,4 @@
 
 *Coming soon... In the meantime, see the javadoc for [UserType].*
 
-[UserType]: http://docs.datastax.com/en/drivers/java/3.4/com/datastax/driver/core/UserType.html
\ No newline at end of file
+[UserType]: http://docs.datastax.com/en/drivers/java/3.5/com/datastax/driver/core/UserType.html
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 62bd014..6335273 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,7 +634,7 @@
                         </execution>
                     </executions>
                     <configuration>
-                        <comparisonVersion>3.3.2</comparisonVersion>
+                        <comparisonVersion>3.4.0</comparisonVersion>
                         <ignoredDifferencesFile>../clirr-ignores.xml</ignoredDifferencesFile>
                         <excludes>
                             <exclude>com/datastax/shaded/**</exclude>