diff --git a/jOOQ-website/src/main/java/Transform.java b/jOOQ-website/src/main/java/Transform.java
index d3095018ee..97cc180cd7 100644
--- a/jOOQ-website/src/main/java/Transform.java
+++ b/jOOQ-website/src/main/java/Transform.java
@@ -78,6 +78,9 @@ public class Transform {
     private static final String version = Constants.FULL_VERSION;
 
     public static void main(String[] args) throws Exception {
+        System.out.println("Transforming manual: " + file("manual.xml"));
+        System.out.println();
+
         System.out.println("Transforming multi-page manual");
         System.out.println("------------------------------");
         multiplePages();
diff --git a/jOOQ-website/src/main/resources/manual-3.0.xml b/jOOQ-website/src/main/resources/manual-3.0.xml
index e797395655..d5ea427a38 100644
--- a/jOOQ-website/src/main/resources/manual-3.0.xml
+++ b/jOOQ-website/src/main/resources/manual-3.0.xml
@@ -7238,29 +7238,33 @@ finally {
 <java><![CDATA[// 1. several queries
 // ------------------
 Statement stmt = connection.createStatement();
-stmt.addBatch("INSERT INTO author VALUES (1, 'Erich Gamma')");
-stmt.addBatch("INSERT INTO author VALUES (2, 'Richard Helm')");
-stmt.addBatch("INSERT INTO author VALUES (3, 'Ralph Johnson')");
-stmt.addBatch("INSERT INTO author VALUES (4, 'John Vlissides')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (1, 'Erich', 'Gamma')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (2, 'Richard', 'Helm')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (3, 'Ralph', 'Johnson')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (4, 'John', 'Vlissides')");
 int[] result = stmt.executeBatch();
 
 // 2. a single query
 // -----------------
-PreparedStatement stmt = connection.prepareStatement("INSERT INTO autho VALUES (?, ?)");
+PreparedStatement stmt = connection.prepareStatement("INSERT INTO author(id, first_name, last_name) VALUES (?, ?, ?)");
 stmt.setInt(1, 1);
-stmt.setString(2, "Erich Gamma");
+stmt.setString(2, "Erich");
+stmt.setString(3, "Gamma");
 stmt.addBatch();
 
 stmt.setInt(1, 2);
-stmt.setString(2, "Richard Helm");
+stmt.setString(2, "Richard");
+stmt.setString(3, "Helm");
 stmt.addBatch();
 
 stmt.setInt(1, 3);
-stmt.setString(2, "Ralph Johnson");
+stmt.setString(2, "Ralph");
+stmt.setString(3, "Johnson");
 stmt.addBatch();
 
 stmt.setInt(1, 4);
-stmt.setString(2, "John Vlissides");
+stmt.setString(2, "John");
+stmt.setString(3, "Vlissides");
 stmt.addBatch();
 
 int[] result = stmt.executeBatch();]]></java>
@@ -7274,20 +7278,24 @@ int[] result = stmt.executeBatch();]]></java>
 <java><![CDATA[// 1. several queries
 // ------------------
 create.batch(
-	create.insertInto(AUTHOR, ID, NAME).values(1, "Erich Gamma"),
-	create.insertInto(AUTHOR, ID, NAME).values(2, "Richard Helm"),
-	create.insertInto(AUTHOR, ID, NAME).values(3, "Ralph Johnson"),
-	create.insertInto(AUTHOR, ID, NAME).values(4, "John Vlissides"))
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(1, "Erich", "Gamma"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(2, "Richard", "Helm"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(3, "Ralph", "Johnson"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(4, "John", "Vlissides"))
 .execute();
 
 // 2. a single query
 // -----------------
-create.batch(create.insertInto(AUTHOR, ID, NAME).values("?", "?"))
-	  .bind(1, "Erich Gamma")
-	  .bind(2, "Richard Helm")
-	  .bind(3, "Ralph Johnson")
-	  .bind(4, "John Vlissides")
-	  .execute();]]></java>
+create.batch(create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values((Integer) null, null, null))
+      .bind(1, "Erich", "Gamma")
+      .bind(2, "Richard", "Helm")
+      .bind(3, "Ralph", "Johnson")
+      .bind(4, "John", "Vlissides")
+      .execute();]]></java>
+      
+                            <p>
+                                When creating a batch execution with a single query and multiple bind values, you will still have to provide jOOQ with dummy bind values for the original query. In the above example, these are set to <code>null</code>. For subsequent calls to <code>bind()</code>, there will be no type safety provided by jOOQ.
+                            </p>
 						</content>
 					</section>
 
diff --git a/jOOQ-website/src/main/resources/manual-3.1.xml b/jOOQ-website/src/main/resources/manual-3.1.xml
index 42032c2eff..7e657f1c32 100644
--- a/jOOQ-website/src/main/resources/manual-3.1.xml
+++ b/jOOQ-website/src/main/resources/manual-3.1.xml
@@ -7596,29 +7596,33 @@ DSL.using(new DefaultConfiguration()
 <java><![CDATA[// 1. several queries
 // ------------------
 Statement stmt = connection.createStatement();
-stmt.addBatch("INSERT INTO author VALUES (1, 'Erich Gamma')");
-stmt.addBatch("INSERT INTO author VALUES (2, 'Richard Helm')");
-stmt.addBatch("INSERT INTO author VALUES (3, 'Ralph Johnson')");
-stmt.addBatch("INSERT INTO author VALUES (4, 'John Vlissides')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (1, 'Erich', 'Gamma')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (2, 'Richard', 'Helm')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (3, 'Ralph', 'Johnson')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (4, 'John', 'Vlissides')");
 int[] result = stmt.executeBatch();
 
 // 2. a single query
 // -----------------
-PreparedStatement stmt = connection.prepareStatement("INSERT INTO autho VALUES (?, ?)");
+PreparedStatement stmt = connection.prepareStatement("INSERT INTO author(id, first_name, last_name) VALUES (?, ?, ?)");
 stmt.setInt(1, 1);
-stmt.setString(2, "Erich Gamma");
+stmt.setString(2, "Erich");
+stmt.setString(3, "Gamma");
 stmt.addBatch();
 
 stmt.setInt(1, 2);
-stmt.setString(2, "Richard Helm");
+stmt.setString(2, "Richard");
+stmt.setString(3, "Helm");
 stmt.addBatch();
 
 stmt.setInt(1, 3);
-stmt.setString(2, "Ralph Johnson");
+stmt.setString(2, "Ralph");
+stmt.setString(3, "Johnson");
 stmt.addBatch();
 
 stmt.setInt(1, 4);
-stmt.setString(2, "John Vlissides");
+stmt.setString(2, "John");
+stmt.setString(3, "Vlissides");
 stmt.addBatch();
 
 int[] result = stmt.executeBatch();]]></java>
@@ -7632,20 +7636,24 @@ int[] result = stmt.executeBatch();]]></java>
 <java><![CDATA[// 1. several queries
 // ------------------
 create.batch(
-	create.insertInto(AUTHOR, ID, NAME).values(1, "Erich Gamma"),
-	create.insertInto(AUTHOR, ID, NAME).values(2, "Richard Helm"),
-	create.insertInto(AUTHOR, ID, NAME).values(3, "Ralph Johnson"),
-	create.insertInto(AUTHOR, ID, NAME).values(4, "John Vlissides"))
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(1, "Erich", "Gamma"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(2, "Richard", "Helm"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(3, "Ralph", "Johnson"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(4, "John", "Vlissides"))
 .execute();
 
 // 2. a single query
 // -----------------
-create.batch(create.insertInto(AUTHOR, ID, NAME).values("?", "?"))
-	  .bind(1, "Erich Gamma")
-	  .bind(2, "Richard Helm")
-	  .bind(3, "Ralph Johnson")
-	  .bind(4, "John Vlissides")
-	  .execute();]]></java>
+create.batch(create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values((Integer) null, null, null))
+      .bind(1, "Erich", "Gamma")
+      .bind(2, "Richard", "Helm")
+      .bind(3, "Ralph", "Johnson")
+      .bind(4, "John", "Vlissides")
+      .execute();]]></java>
+      
+                            <p>
+                                When creating a batch execution with a single query and multiple bind values, you will still have to provide jOOQ with dummy bind values for the original query. In the above example, these are set to <code>null</code>. For subsequent calls to <code>bind()</code>, there will be no type safety provided by jOOQ.
+                            </p>
 						</content>
 					</section>
 
diff --git a/jOOQ-website/src/main/resources/manual-3.2.xml b/jOOQ-website/src/main/resources/manual-3.2.xml
index 2b3529ad43..a9552a51d1 100644
--- a/jOOQ-website/src/main/resources/manual-3.2.xml
+++ b/jOOQ-website/src/main/resources/manual-3.2.xml
@@ -7592,29 +7592,33 @@ DSL.using(new DefaultConfiguration()
 <java><![CDATA[// 1. several queries
 // ------------------
 Statement stmt = connection.createStatement();
-stmt.addBatch("INSERT INTO author VALUES (1, 'Erich Gamma')");
-stmt.addBatch("INSERT INTO author VALUES (2, 'Richard Helm')");
-stmt.addBatch("INSERT INTO author VALUES (3, 'Ralph Johnson')");
-stmt.addBatch("INSERT INTO author VALUES (4, 'John Vlissides')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (1, 'Erich', 'Gamma')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (2, 'Richard', 'Helm')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (3, 'Ralph', 'Johnson')");
+stmt.addBatch("INSERT INTO author(id, first_name, last_name) VALUES (4, 'John', 'Vlissides')");
 int[] result = stmt.executeBatch();
 
 // 2. a single query
 // -----------------
-PreparedStatement stmt = connection.prepareStatement("INSERT INTO autho VALUES (?, ?)");
+PreparedStatement stmt = connection.prepareStatement("INSERT INTO author(id, first_name, last_name) VALUES (?, ?, ?)");
 stmt.setInt(1, 1);
-stmt.setString(2, "Erich Gamma");
+stmt.setString(2, "Erich");
+stmt.setString(3, "Gamma");
 stmt.addBatch();
 
 stmt.setInt(1, 2);
-stmt.setString(2, "Richard Helm");
+stmt.setString(2, "Richard");
+stmt.setString(3, "Helm");
 stmt.addBatch();
 
 stmt.setInt(1, 3);
-stmt.setString(2, "Ralph Johnson");
+stmt.setString(2, "Ralph");
+stmt.setString(3, "Johnson");
 stmt.addBatch();
 
 stmt.setInt(1, 4);
-stmt.setString(2, "John Vlissides");
+stmt.setString(2, "John");
+stmt.setString(3, "Vlissides");
 stmt.addBatch();
 
 int[] result = stmt.executeBatch();]]></java>
@@ -7628,20 +7632,24 @@ int[] result = stmt.executeBatch();]]></java>
 <java><![CDATA[// 1. several queries
 // ------------------
 create.batch(
-	create.insertInto(AUTHOR, ID, NAME).values(1, "Erich Gamma"),
-	create.insertInto(AUTHOR, ID, NAME).values(2, "Richard Helm"),
-	create.insertInto(AUTHOR, ID, NAME).values(3, "Ralph Johnson"),
-	create.insertInto(AUTHOR, ID, NAME).values(4, "John Vlissides"))
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(1, "Erich", "Gamma"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(2, "Richard", "Helm"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(3, "Ralph", "Johnson"),
+	create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values(4, "John", "Vlissides"))
 .execute();
 
 // 2. a single query
 // -----------------
-create.batch(create.insertInto(AUTHOR, ID, NAME).values("?", "?"))
-      .bind(1, "Erich Gamma")
-      .bind(2, "Richard Helm")
-      .bind(3, "Ralph Johnson")
-      .bind(4, "John Vlissides")
+create.batch(create.insertInto(AUTHOR, ID, FIRST_NAME, LAST_NAME).values((Integer) null, null, null))
+      .bind(1, "Erich", "Gamma")
+      .bind(2, "Richard", "Helm")
+      .bind(3, "Ralph", "Johnson")
+      .bind(4, "John", "Vlissides")
       .execute();]]></java>
+      
+                            <p>
+                                When creating a batch execution with a single query and multiple bind values, you will still have to provide jOOQ with dummy bind values for the original query. In the above example, these are set to <code>null</code>. For subsequent calls to <code>bind()</code>, there will be no type safety provided by jOOQ.
+                            </p>
 						</content>
 					</section>
 
@@ -8806,7 +8814,7 @@ public class PrettyPrinter extends DefaultExecuteListener {
 								With the above configuration, let's fetch some data with jOOQ
 							</p>
 							
-create.select(BOOK.ID, BOOK.TITLE).from(BOOK).orderBy(BOOK.ID).limit(1, 2).fetch();]]></java>
+<java><![CDATA[create.select(BOOK.ID, BOOK.TITLE).from(BOOK).orderBy(BOOK.ID).limit(1, 2).fetch();]]></java>
 
 							<p>
 								The above query may result in the following log output: