diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml
index d4bba83318..5122e5c44c 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-2.6.xml
@@ -8777,11 +8777,11 @@ create.selectFrom(AUTHOR)
 								Any of the following databases might be available in the future
 							</p>
 						    <ul>
+							    <li>Azure SQL Database</li>
 							    <li>Informix</li>
 							    <li>Interbase</li>
 							    <li>MS Access</li>
 							    <li>MS Excel</li>
-							    <li>SQL Azure</li>
 							    <li>Sybase SQL Anywhere OnDemand</li>
 							    <li>Teradata</li>
 						    </ul>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml
index f2ec5d6fdc..776de7203e 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.0.xml
@@ -10251,6 +10251,7 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -10263,7 +10264,6 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml
index 981ec0f550..2fa238be00 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.1.xml
@@ -10875,6 +10875,7 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -10887,7 +10888,6 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
index 862c85dfda..b683d6a0be 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
@@ -19012,6 +19012,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
 						   		Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
 					   		</p>
 							<ul>
+                                <li>Azure SQL Database</li>
 							    <li>CUBRID</li>
 							    <li>DB2</li>
 							    <li>Derby</li>
@@ -19027,7 +19028,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
 							    <li>Oracle</li>
 							    <li>PostgreSQL</li>
 							    <li>SQLite</li>
-                                <li>SQL Azure</li>
 							    <li>SQL Server</li>
 							    <li>Sybase Adaptive Server Enterprise</li>
 							    <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml
index 189eea1b2c..3fb97e9f5a 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.11.xml
@@ -19695,6 +19695,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
 						   		Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
 					   		</p>
 							<ul>
+                                <li>Azure SQL Database</li>
 							    <li>CUBRID</li>
 							    <li>DB2</li>
 							    <li>Derby</li>
@@ -19710,7 +19711,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
 							    <li>Oracle</li>
 							    <li>PostgreSQL</li>
 							    <li>SQLite</li>
-                                <li>SQL Azure</li>
 							    <li>SQL Server</li>
 							    <li>Sybase Adaptive Server Enterprise</li>
 							    <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
index f6b8a13388..0923a73752 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.2.xml
@@ -11685,6 +11685,7 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -11697,7 +11698,6 @@ Result<BookRecord> result = create.selectFrom(BOOK).where(BOOK.ID.eq(5)).fetch()
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
index 00241958b8..4d0d141095 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.3.xml
@@ -12617,6 +12617,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -12630,7 +12631,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
index 0c9e1ef90c..b1186962c0 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.4.xml
@@ -13996,6 +13996,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -14009,7 +14010,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
index dde5b3436b..5a1e3ae9fa 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.5.xml
@@ -14703,6 +14703,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -14717,7 +14718,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
index 5da214e140..805c5cbce3 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.6.xml
@@ -15738,6 +15738,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -15753,7 +15754,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
index 160647a02d..ae4337cbb2 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
@@ -16180,6 +16180,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -16195,7 +16196,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
index d2395c12ba..ef7c38802c 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
@@ -16480,6 +16480,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -16495,7 +16496,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>
diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
index 3cd5126e10..59dd051b05 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
@@ -18595,6 +18595,7 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, some 70 unit tests are run for syntax and variable binding verification, as well as some 400 integration tests with an overall of around 4000 queries for any of these databases:
                             </p>
                             <ul>
+                                <li>Azure SQL Database</li>
                                 <li>CUBRID</li>
                                 <li>DB2</li>
                                 <li>Derby</li>
@@ -18610,7 +18611,6 @@ Result<Record2<String, String>> result = create.select( Actor.ACTOR.FIRST_NAME,
                                 <li>Oracle</li>
                                 <li>PostgreSQL</li>
                                 <li>SQLite</li>
-                                <li>SQL Azure</li>
                                 <li>SQL Server</li>
                                 <li>Sybase Adaptive Server Enterprise</li>
                                 <li>Sybase SQL Anywhere</li>