diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
index ee2938e17e..c986ded30b 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexWhereStep.java
@@ -100,11 +100,11 @@ public interface CreateIndexWhereStep extends CreateIndexFinalStep {
 
     /**
      * Add the <code>WHERE</code> clause to the <code>CREATE INDEX</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -115,11 +115,11 @@ public interface CreateIndexWhereStep extends CreateIndexFinalStep {
 
     /**
      * Add the <code>WHERE</code> clause to the <code>CREATE INDEX</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -130,11 +130,11 @@ public interface CreateIndexWhereStep extends CreateIndexFinalStep {
 
     /**
      * Add the <code>WHERE</code> clause to the <code>CREATE INDEX</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -145,11 +145,11 @@ public interface CreateIndexWhereStep extends CreateIndexFinalStep {
 
     /**
      * Add the <code>WHERE</code> clause to the <code>CREATE INDEX</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java b/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java
index 930c18d8f0..7366587b15 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableStorageStep.java
@@ -72,11 +72,6 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
 
     /**
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
      * <p>
      * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
      * statement.
@@ -107,6 +102,11 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
      * escape literals when concatenated into SQL clauses! One way to escape
      * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -117,11 +117,6 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
 
     /**
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
      * <p>
      * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
      * statement.
@@ -152,6 +147,11 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
      * escape literals when concatenated into SQL clauses! One way to escape
      * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -162,11 +162,6 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
 
     /**
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
      * <p>
      * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
      * statement.
@@ -197,6 +192,11 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
      * escape literals when concatenated into SQL clauses! One way to escape
      * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -207,11 +207,6 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
 
     /**
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
      * <p>
      * Add vendor-specific storage clauses to the <code>CREATE TABLE</code>
      * statement.
@@ -242,6 +237,11 @@ public interface CreateTableStorageStep extends CreateTableFinalStep {
      * escape literals when concatenated into SQL clauses! One way to escape
      * literals is to use {@link DSL#name(String...)} and similar methods
      * Add the <code>STORAGE</code> clause to the <code>CREATE TABLE</code> statement.
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
diff --git a/jOOQ/src/main/java/org/jooq/CreateViewAsStep.java b/jOOQ/src/main/java/org/jooq/CreateViewAsStep.java
index 3e9278d1e5..d6dd3c6ba7 100644
--- a/jOOQ/src/main/java/org/jooq/CreateViewAsStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateViewAsStep.java
@@ -79,11 +79,11 @@ public interface CreateViewAsStep<R extends Record> {
 
     /**
      * Add the <code>AS</code> clause to the <code>CREATE VIEW</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -94,11 +94,11 @@ public interface CreateViewAsStep<R extends Record> {
 
     /**
      * Add the <code>AS</code> clause to the <code>CREATE VIEW</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -109,11 +109,11 @@ public interface CreateViewAsStep<R extends Record> {
 
     /**
      * Add the <code>AS</code> clause to the <code>CREATE VIEW</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */
@@ -124,11 +124,11 @@ public interface CreateViewAsStep<R extends Record> {
 
     /**
      * Add the <code>AS</code> clause to the <code>CREATE VIEW</code> statement.
-     <p>
-     <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
-     guarantee syntax integrity. You may also create the possibility of
-     malicious SQL injection. Be sure to properly use bind variables and/or
-     escape literals when concatenated into SQL clauses!
+     * <p>
+     * <b>NOTE</b>: When inserting plain SQL into jOOQ objects, you must
+     * guarantee syntax integrity. You may also create the possibility of
+     * malicious SQL injection. Be sure to properly use bind variables and/or
+     * escape literals when concatenated into SQL clauses!
      *
      * @see SQL
      */