diff --git a/documentation/About-MariaDB-Connector-J.md b/documentation/About-MariaDB-Connector-J.md
index be3d9645a..38aeee8b1 100644
--- a/documentation/About-MariaDB-Connector-J.md
+++ b/documentation/About-MariaDB-Connector-J.md
@@ -36,7 +36,7 @@ Using maven :
 
 ## Requirements
 
-* Java 7 (until April 2015) or 8
+* Java 7 or 8 (Last compatible version with java 6 is [1.1.9](https://downloads.mariadb.org/connector-java/1.1.9/))
 * com.sun.JNA is used by some library functions and a jar is available at
   https://github.com/twall/jna
 ** only needed when connecting to the server with unix sockets or windows
diff --git a/documentation/Developers-Guide.md b/documentation/Developers-Guide.md
index f9e9d0ef1..48289790f 100644
--- a/documentation/Developers-Guide.md
+++ b/documentation/Developers-Guide.md
@@ -25,14 +25,14 @@ Before downloading source, fork the project to your own repository, and use your
 # Run local test
 
 Before any submission :
-Run the test locally : by default, you need to have a MySQL/MariaDB server on localhost:3306 with a database named "test" and a user root without password.
+Run the test locally : by default, you need to have a MySQL/MariaDB server on localhost:3306 with a database named "testj" and a user root without password.
 so you can run 
     
     mvn test
     
 You can change those parameter by adding -DdbUrl parameter. like : 
  
-    mvn test -DdbUrl=jdbc:mariadb://127.0.0.1:3306/test?user=root&password=*****
+    mvn test -DdbUrl=jdbc:mariadb://127.0.0.1:3306/testj?user=root&password=*****
     
 You can launch a specific test by adding -Dfile
 
@@ -60,6 +60,7 @@ server :
 * MariaDB 10.0
 * MariaDB 10.1
 * MySQL 5.6
+* MySQL 5.7
 
 max_allowed_packet : 
 * 1M
diff --git a/documentation/Failover-and-high-availability.md b/documentation/Failover-and-high-availability.md
index 7b7b3845c..734e1685e 100644
--- a/documentation/Failover-and-high-availability.md
+++ b/documentation/Failover-and-high-availability.md
@@ -150,7 +150,7 @@ Each parameter corresponds to a specific use case:
 |failoverLoopRetries|When searching silently for a valid host, maximum number of connection attempts.<br/>This differ from "retriesAllDown" parameter, because this silent search is for example used after a disconnection of a slave connection when using the master connection.<br/>*Default: 120. Since 1.2.0*|
 |validConnectionTimeout|With multiple hosts, after this time in seconds has elapsed it’s verified that the connections haven’t been lost.<br/>When 0, no verification will be done.<br/>*Default:120 seconds. Since 1.2.0*|
 |loadBalanceBlacklistTimeout|When a connection fails, this host will be blacklisted during the "loadBalanceBlacklistTimeout" amount of time.<br/>When connecting to a host, the driver will try to connect to a host in the list of not blacklisted hosts and after that only on blacklisted ones if none has been found before that.<br/>This blacklist is shared inside the classloader.<br/>*Default: 50 seconds. Since 1.2.0*|
-|assureReadOnly|If true, in high availability, and switching to a read-only host, assure that this host is in read-only mode by setting session read-only.<br/>Default to false.<br/>*Default: 50 seconds. Since 1.3.0*|
+|assureReadOnly|If true, in high availability, and switching to a read-only host, assure that this host is in read-only mode by setting session read-only.<br/>*Default to false.<br/> Since 1.3.0*|
 
 
 
diff --git a/documentation/Use-MariaDB-Connector-j-driver.md b/documentation/Use-MariaDB-Connector-j-driver.md
index 9823016b4..b8afbfefd 100644
--- a/documentation/Use-MariaDB-Connector-j-driver.md
+++ b/documentation/Use-MariaDB-Connector-j-driver.md
@@ -134,7 +134,7 @@ eliminates concerns about SELECT privileges on the
 
 ### Optional JDBC classes
 Following optional interfaces are implemented by the
-org.mariadb.jdbc.MySQLDataSource class : javax.sql.DataSource,
+org.mariadb.jdbc.MariaDbDataSource class : javax.sql.DataSource,
 javax.sql.ConnectionPoolDataSource, javax.sql.XADataSource
 
 ## Usage examples