You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by as...@apache.org on 2026/01/09 20:16:23 UTC

(grails-website) branch asf-site-production updated: Deploying to documentation branch - 20:16:13

This is an automated email from the ASF dual-hosted git repository.

asf-ci-deploy pushed a commit to branch asf-site-production
in repository https://gitbox.apache.org/repos/asf/grails-website.git


The following commit(s) were added to refs/heads/asf-site-production by this push:
     new 87d3e56de5a Deploying to documentation branch - 20:16:13
87d3e56de5a is described below

commit 87d3e56de5a86097c4996a8db25fd0a99c7cab8c
Author: jamesfredley <ja...@users.noreply.github.com>
AuthorDate: Fri Jan 9 20:16:16 2026 +0000

    Deploying to documentation branch - 20:16:13
---
 docs/snapshot/api/deprecated-list.html             |   2 +-
 docs/snapshot/api/index-all.html                   |  10 +-
 .../datastore/bson/json/JsonReader.Context.html    |   4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |   4 +-
 .../datastore/bson/json/JsonWriter.Context.html    |  10 +-
 .../org/grails/datastore/bson/json/JsonWriter.html |   4 +-
 .../orm/hibernate/AbstractHibernateDatastore.html  |   6 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |   4 +-
 .../GrailsHibernateTransactionManager.html         |  22 +-
 .../grails/orm/hibernate/HibernateDatastore.html   |   8 +-
 ...ceSettings.HibernateSettings.FlushSettings.html |   4 +-
 .../hibernate/support/HibernateVersionSupport.html |  10 +-
 .../GrailsOpenSessionInViewInterceptor.html        |   4 +-
 docs/snapshot/grails-data/api/index-all.html       |  10 +-
 .../document/config/DocumentMappingContext.html    |   2 +-
 .../mapping/config/KeyValueMappingContext.html     |   2 +-
 .../mapping/model/AbstractMappingContext.html      |   6 +-
 .../datastore/mapping/model/MappingContext.html    |   6 +-
 .../datastore/mapping/query/AssociationQuery.html  |   8 +-
 .../datastore/mapping/query/Query.Conjunction.html |  25 +--
 .../datastore/mapping/query/Query.Disjunction.html |  25 +--
 .../datastore/mapping/query/Query.Junction.html    |   4 +-
 .../datastore/mapping/query/Query.Negation.html    |  25 +--
 .../org/grails/datastore/mapping/query/Query.html  |  32 +--
 .../developer-manual/gettingStarted.html           |   2 +-
 .../grails-data/developer-manual/introduction.html |   2 +-
 .../grails-data/developer-manual/stepByStep.html   |   2 +-
 .../grails-data/developer-manual/testing.html      |   2 +-
 .../developer-manual/understandingApi.html         |   2 +-
 .../understandingApi/datastoreBasics.html          |   2 +-
 .../understandingApi/gormApis.html                 |   2 +-
 .../understandingApi/gormEnhancer.html             |   2 +-
 .../understandingApi/implementingCrud.html         |   2 +-
 .../understandingApi/implementingQueries.html      |   2 +-
 .../understandingApi/secondaryIndexes.html         |   2 +-
 .../hibernate5/api/deprecated-list.html            |   2 +-
 .../grails-data/hibernate5/api/index-all.html      |  14 +-
 .../datastore/bson/json/JsonReader.Context.html    |   4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |   4 +-
 .../datastore/bson/json/JsonWriter.Context.html    |  10 +-
 .../org/grails/datastore/bson/json/JsonWriter.html |   4 +-
 .../document/config/DocumentMappingContext.html    |   2 +-
 .../mapping/config/KeyValueMappingContext.html     |   2 +-
 .../mapping/model/AbstractMappingContext.html      |   6 +-
 .../datastore/mapping/model/MappingContext.html    |   6 +-
 .../mapping/mongo/config/MongoMappingContext.html  |   2 +-
 .../orm/hibernate/AbstractHibernateDatastore.html  |   6 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |   4 +-
 .../GrailsHibernateTransactionManager.html         |  22 +-
 .../grails/orm/hibernate/HibernateDatastore.html   |   8 +-
 .../orm/hibernate/cfg/HibernateMappingContext.html |   2 +-
 ...ceSettings.HibernateSettings.FlushSettings.html |   4 +-
 .../hibernate/support/HibernateVersionSupport.html |  10 +-
 .../GrailsOpenSessionInViewInterceptor.html        |   4 +-
 .../grails-data/mongodb/api/deprecated-list.html   |   2 +-
 .../grails-data/mongodb/api/index-all.html         |  16 +-
 .../datastore/bson/json/JsonReader.Context.html    |   4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |   4 +-
 .../datastore/bson/json/JsonWriter.Context.html    |  10 +-
 .../org/grails/datastore/bson/json/JsonWriter.html |   4 +-
 .../orm/hibernate/AbstractHibernateDatastore.html  |   6 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |   4 +-
 .../GrailsHibernateTransactionManager.html         |  22 +-
 .../grails/orm/hibernate/HibernateDatastore.html   |   8 +-
 .../orm/hibernate/cfg/CompositeIdentity.html       |  26 ++-
 .../orm/hibernate/cfg/GrailsDomainBinder.html      |  26 +--
 .../api/org/grails/orm/hibernate/cfg/Identity.html |  26 ++-
 .../api/org/grails/orm/hibernate/cfg/Mapping.html  |   4 +-
 .../grails/orm/hibernate/cfg/PropertyConfig.html   |  26 ++-
 ...ceSettings.HibernateSettings.FlushSettings.html |   4 +-
 .../hibernate/support/HibernateVersionSupport.html |  10 +-
 .../GrailsOpenSessionInViewInterceptor.html        |   4 +-
 .../grails-data/whats-new-manual/index.html        |   2 +-
 docs/snapshot/guide/REST.html                      |  44 ++++
 docs/snapshot/guide/conf.html                      |  28 +++
 docs/snapshot/guide/pages/codecs.html              |  11 +
 docs/snapshot/guide/pages/contentNegotiation.html  |  44 ++++
 docs/snapshot/guide/pages/controllers.html         |  44 +++-
 .../snapshot/guide/pages/customizingUrlFormat.html |  12 ++
 docs/snapshot/guide/pages/dataBinding.html         |  44 +++-
 docs/snapshot/guide/pages/domainResources.html     |  16 ++
 docs/snapshot/guide/pages/environments.html        |  28 +++
 docs/snapshot/guide/pages/hal.html                 |  14 ++
 docs/snapshot/guide/pages/hypermedia.html          |  14 ++
 docs/snapshot/guide/pages/interceptorOrdering.html |  10 +
 docs/snapshot/guide/pages/interceptors.html        |  10 +
 .../pages/propertyPlaceholderConfiguration.html    |  10 +
 docs/snapshot/guide/pages/urlmappings.html         |  12 ++
 docs/snapshot/guide/pages/versioningResources.html |  14 ++
 docs/snapshot/guide/pages/xssPrevention.html       |  37 ++++
 docs/snapshot/guide/security.html                  |  48 +++++
 docs/snapshot/guide/single.html                    | 240 ++++++++++++++++++++-
 docs/snapshot/guide/spring.html                    |  10 +
 docs/snapshot/guide/theWebLayer.html               | 110 +++++++++-
 docs/snapshot/ref/Constraints/nullable.html        |  14 ++
 docs/snapshot/ref/Controllers/withFormat.html      |  17 ++
 docs/snapshot/ref/Domain Classes/save.html         |  19 ++
 docs/snapshot/ref/Plug-ins/dataSource.html         |  14 ++
 98 files changed, 1143 insertions(+), 304 deletions(-)

diff --git a/docs/snapshot/api/deprecated-list.html b/docs/snapshot/api/deprecated-list.html
index 002d56fe1fa..8d79c438fb3 100644
--- a/docs/snapshot/api/deprecated-list.html
+++ b/docs/snapshot/api/deprecated-list.html
@@ -527,7 +527,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/api/index-all.html b/docs/snapshot/api/index-all.html
index 4ad5e2fa2d8..4895807e58d 100644
--- a/docs/snapshot/api/index-all.html
+++ b/docs/snapshot/api/index-all.html
@@ -6377,7 +6377,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="grails/doc/DocEngine.html#CONTEXT_PATH" title="Property in DocEngine">CONTEXT_PATH</a></span> - Property in <a href="grails/doc/DocEngine.html">DocEngine</a>
 </dt><dd> <div class="block"></div></dd>
@@ -22043,7 +22043,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Constructor in <a href="o [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -38181,7 +38181,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -44679,9 +44679,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/artefact/Controller.html#withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)" title="Method in Controller">withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)</a></span> - Method in <a href="grails/artefact/Controller.html">Controller</a>
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 881bc1b182d..1bf41556b2c 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
index 9e2e29be46c..b56e22594ec 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -659,7 +659,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index 54c4550d1df..be56507c6cc 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
index bc22c337995..78e7f34860a 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -687,7 +687,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index e6e3eece9e5..227b2244310 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -531,7 +531,7 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 15debe3d161..7b591fa46e0 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 2dafa5fd0a0..750541d2b10 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -137,7 +137,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -170,17 +170,17 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore [...]
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -250,7 +250,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -277,26 +277,26 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
index 9be32e0d643..fb7bc883940 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -477,7 +477,7 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -496,7 +496,7 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a></code></td>
@@ -946,10 +946,10 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index fc272e3d795..f4c2ffe6419 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index ece744da9b5..cc4415133dc 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/ [...]
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index af4ffa85100..8afe411b1c5 100644
--- a/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -220,7 +220,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/index-all.html b/docs/snapshot/grails-data/api/index-all.html
index bbcc4b5bd30..f9032c032bb 100644
--- a/docs/snapshot/grails-data/api/index-all.html
+++ b/docs/snapshot/grails-data/api/index-all.html
@@ -319,7 +319,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/collection/PersistentList.html#add(int, java.lang.Object)" title="Method in PersistentList">add(int, java.lang.Object)</a></span> - Method in <a href="org/grails/datastore/mapping/collection/PersistentList.html">PersistentList</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query">add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query">add(Junction, org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
 </dt><dd> <div class="block">Adds the specified criterion instance to the given junction</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query.Junction">add(org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.Junction.html">Query.Junction</a>
 </dt><dd> <div class="block"></div></dd>
@@ -394,9 +394,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html#addListener(ConnectionSourcesListener<T,S>)" title="Method in ConnectionSources">addListener(ConnectionSourcesListener&lt;T,S&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html">ConnectionSources</a>
 </dt><dd> <div class="block">Adds a listener</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in AbstractMappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(Listener)" title="Method in MappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in MappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
 </dt><dd> <div class="block">Adds a new mapping context listener instance</div></dd>
 <dt><span class="strong"><a href="grails/gorm/validation/DefaultConstrainedProperty.html#addMetaConstraint(java.lang.String, java.lang.Object)" title="Method in DefaultConstrainedProperty">addMetaConstraint(java.lang.String, java.lang.Object)</a></span> - Method in <a href="grails/gorm/validation/DefaultConstrainedProperty.html">DefaultConstrainedProperty</a>
 </dt><dd> <div class="block">Adds a meta constraints which is a non-validating informational constraint.</div></dd>
@@ -2832,7 +2832,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/AbstractSession.html#executePendings(Collection<? extends Runnable>)" title="Method in AbstractSession">executePendings(Collection&lt;? extends Runnable&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/AbstractSession.html">AbstractSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/AssociationQuery.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)" title="Method in AssociationQuery">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/AssociationQuery.html">AssociationQuery</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/AssociationQuery.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)" title="Method in AssociationQuery">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/AssociationQuery.html">AssociationQuery</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/GormEntity.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in GormEntity">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/GormEntity.html">GormEntity</a>
 </dt><dd> <div class="block">Executes a query for the given String</div></dd>
@@ -2840,7 +2840,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/gorm/api/GormStaticOperations.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in GormStaticOperations">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="grails/gorm/api/GormStaticOperations.html">GormStaticOperations</a>
 </dt><dd> <div class="block">Executes a query for the given String</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)" title="Method in Query">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)" title="Method in Query">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
 </dt><dd> <div class="block">Subclasses should implement this to provide the concrete implementation
  of querying</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in TenantDelegatingGormOperations">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.html">TenantDelegatingGormOperations</a>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 0b80a32dd6d..28eee802bf7 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
@@ -288,7 +288,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
index 44e21dce537..b660c74cab2 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
@@ -294,7 +294,7 @@ extends <a href='../../../../../../../org/grails/datastore/mapping/model/Abstrac
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
+                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
index 5739922cb3c..3ac1ae73371 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
@@ -283,7 +283,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
index 13f8137c835..72b0b256592 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
@@ -193,7 +193,7 @@ public interface MappingContext</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
                                 <p> Adds a new mapping context listener instance
       <DL><DT><B>Parameters:</B></DT><DD><code>listener</code> -  The listener</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
index 9c284b26c10..b15d9d54478 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
@@ -196,7 +196,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;java.util.List</code></td>
-                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> j)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../Junction.html'>Junction</a> j)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -221,7 +221,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.html'>Query</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#allEq(Map)'>allEq</a>, <a href='../../../../. [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/datastore/mapping/query/Quer [...]
                         </tr>
                     </table>
                    </ul>
@@ -273,10 +273,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)"><!-- --></a>
+                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> j)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../Junction.html'>Junction</a> j)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
index 572f4b7f90e..6928c2fa0c4 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Conjunction
-extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
+extends <a href='../../../../../Junction.html'>Junction</a></pre>
 
     <p> A Criterion used to combine to criterion in a logical AND
      </p>
@@ -157,29 +157,6 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junctio
         
 
         
-        <!-- ========== METHOD SUMMARY =========== -->
-        <ul class="blockList">
-            
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
-        </ul>
-        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
index 87af13de476..fce3a1aab8b 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Disjunction
-extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
+extends <a href='../../../../../Junction.html'>Junction</a></pre>
 
     <p> A Criterion used to combine to criterion in a logical OR
      </p>
@@ -157,29 +157,6 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junctio
         
 
         
-        <!-- ========== METHOD SUMMARY =========== -->
-        <ul class="blockList">
-            
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
-        </ul>
-        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
index e0fa2aaee0f..39ed5006acd 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
@@ -176,7 +176,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#add(org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</code><br></td>
                         </tr>
                         
@@ -271,7 +271,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         <a name="add(org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
index a85b6137e24..96383d13447 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Negation
-extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
+extends <a href='../../../../../Junction.html'>Junction</a></pre>
 
     <p> A criterion used to negate several other criterion
      </p>
@@ -131,29 +131,6 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junctio
         
 
         
-        <!-- ========== METHOD SUMMARY =========== -->
-        <ul class="blockList">
-            
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
-        </ul>
-        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
index b057fe6f241..42329146957 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
@@ -542,7 +542,7 @@ implements java.lang.Cloneable</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../Junction.html'>Junction</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#criteria">criteria</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -673,7 +673,7 @@ implements java.lang.Cloneable</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</code><br>Adds the specified criterion instance to the given junction</td>
+                            <td class="colLast"><code><strong><a href="#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../Junction.html'>Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</code><br>Adds the specified criterion instance to the given junction</td>
                         </tr>
                         
                         <tr class="altColor">
@@ -708,7 +708,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#conjunction()">conjunction</a></strong>()</code><br>Creates a conjunction (AND) query</td>
                         </tr>
                         
@@ -720,7 +720,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#disjunction()">disjunction</a></strong>()</code><br>Creates a disjunction (OR) query</td>
                         </tr>
                         
@@ -733,7 +733,7 @@ implements java.lang.Cloneable</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;abstract&nbsp;java.util.List</code></td>
-                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> criteria)</code><br>Subclasses should implement this to provide th [...]
+                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../Junction.html'>Junction</a> criteria)</code><br>Subclasses should implement this to provide the concrete implementation
  of querying</td>
                         </tr>
                         
@@ -764,7 +764,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#getCriteria()">getCriteria</a></strong>()</code><br> <DL><DT><B>Returns:</B></DT><DD>The criteria defined by this query</DD></DL></td>
                         </tr>
                         
@@ -908,7 +908,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#negation()">negation</a></strong>()</code><br>Creates a negation of several criterion</td>
                         </tr>
                         
@@ -1016,7 +1016,7 @@ implements java.lang.Cloneable</pre>
                         <a name="criteria"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>criteria</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>criteria</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1155,10 +1155,10 @@ implements java.lang.Cloneable</pre>
                             </li>
                         </ul>
                     
-                        <a name="add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
+                        <a name="add(Junction, org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</h4>
+                                <h4>public&nbsp;void <strong>add</strong>(<a href='../../../../../Junction.html'>Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</h4>
                                 <p> Adds the specified criterion instance to the given junction
       <DL><DT><B>Parameters:</B></DT><DD><code>currentJunction</code> -  The junction to add the criterion to</DD><DD><code>criterion</code> -  The criterion instance</DD></DL></p>
                             </li>
@@ -1211,7 +1211,7 @@ implements java.lang.Cloneable</pre>
                         <a name="conjunction()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>conjunction</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>conjunction</strong>()</h4>
                                 <p> Creates a conjunction (AND) query
       <DL><DT><B>Returns:</B></DT><DD>The Junction instance</DD></DL></p>
                             </li>
@@ -1229,7 +1229,7 @@ implements java.lang.Cloneable</pre>
                         <a name="disjunction()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>disjunction</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>disjunction</strong>()</h4>
                                 <p> Creates a disjunction (OR) query
       <DL><DT><B>Returns:</B></DT><DD>The Junction instance</DD></DL></p>
                             </li>
@@ -1244,10 +1244,10 @@ implements java.lang.Cloneable</pre>
                             </li>
                         </ul>
                     
-                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)"><!-- --></a>
+                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;abstract&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> criteria)</h4>
+                                <h4>protected&nbsp;abstract&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../Junction.html'>Junction</a> criteria)</h4>
                                 <p> Subclasses should implement this to provide the concrete implementation
  of querying
       <DL><DT><B>Parameters:</B></DT><DD><code>entity</code> -  The entity</DD><DD><code>criteria</code> -  The criteria</DD></DL><DL><DT><B>Returns:</B></DT><DD>The results</DD></DL></p>
@@ -1294,7 +1294,7 @@ implements java.lang.Cloneable</pre>
                         <a name="getCriteria()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>getCriteria</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>getCriteria</strong>()</h4>
                                 <p>
       <DL><DT><B>Returns:</B></DT><DD>The criteria defined by this query</DD></DL></p>
                             </li>
@@ -1510,7 +1510,7 @@ implements java.lang.Cloneable</pre>
                         <a name="negation()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>negation</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>negation</strong>()</h4>
                                 <p> Creates a negation of several criterion
       <DL><DT><B>Returns:</B></DT><DD>The negation</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/developer-manual/gettingStarted.html b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
index 5b0fa8d467b..e1144c39317 100644
--- a/docs/snapshot/grails-data/developer-manual/gettingStarted.html
+++ b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
@@ -523,7 +523,7 @@ cd grails-core</pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/introduction.html b/docs/snapshot/grails-data/developer-manual/introduction.html
index 5582db674a2..cf36f29a20d 100644
--- a/docs/snapshot/grails-data/developer-manual/introduction.html
+++ b/docs/snapshot/grails-data/developer-manual/introduction.html
@@ -476,7 +476,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/stepByStep.html b/docs/snapshot/grails-data/developer-manual/stepByStep.html
index d42a1e49b8b..e3f655902e5 100644
--- a/docs/snapshot/grails-data/developer-manual/stepByStep.html
+++ b/docs/snapshot/grails-data/developer-manual/stepByStep.html
@@ -621,7 +621,7 @@ class XyzTestSuite {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/testing.html b/docs/snapshot/grails-data/developer-manual/testing.html
index bc0d39602f3..49e84c7829d 100644
--- a/docs/snapshot/grails-data/developer-manual/testing.html
+++ b/docs/snapshot/grails-data/developer-manual/testing.html
@@ -511,7 +511,7 @@ class PagedResultSpec extends GormDatastoreSpec{
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi.html b/docs/snapshot/grails-data/developer-manual/understandingApi.html
index 0922515beea..220c2491a0c 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi.html
@@ -454,7 +454,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html b/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
index 1ffa705d244..5abeaef7aef 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
@@ -561,7 +561,7 @@ protected Session createSession(PropertyResolver connDetails) {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html b/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
index dfd21f5ea05..d6ab0b6ec17 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
@@ -496,7 +496,7 @@ class Neo4jEntityTraitProvider implements GormEntityTraitProvider {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html b/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
index 7ca4bd36dc2..5c487e37d91 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
@@ -488,7 +488,7 @@ enhancer.enhance()</code></pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
index cc20a4c7bc5..ad5eb80a3af 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
@@ -673,7 +673,7 @@ protected void deleteEntry(String family, final Object key, final Object entry)
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
index b3d43530437..dc75711ccca 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
@@ -588,7 +588,7 @@ If, for instance, the underlying datastore does not support the calculation of a
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html b/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
index 4ec9ba59d06..50d5beff6b5 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
@@ -526,7 +526,7 @@ If the underlying datastore supports secondary indexes then it is ok to just ret
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html b/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
index fd836ec4168..716d4895c1a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
@@ -305,7 +305,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/grails-data/hibernate5/api/index-all.html b/docs/snapshot/grails-data/hibernate5/api/index-all.html
index 8038d36708f..b9a5fd72f9d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/index-all.html
+++ b/docs/snapshot/grails-data/hibernate5/api/index-all.html
@@ -486,9 +486,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html#addListener(ConnectionSourcesListener<T,S>)" title="Method in ConnectionSources">addListener(ConnectionSourcesListener&lt;T,S&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html">ConnectionSources</a>
 </dt><dd> <div class="block">Adds a listener</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in AbstractMappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(Listener)" title="Method in MappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in MappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
 </dt><dd> <div class="block">Adds a new mapping context listener instance</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollec [...]
 </dt><dd> <div class="block">Add a Hibernate filter for multitenancy if the persistent class is multitenant</div></dd>
@@ -2419,7 +2419,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
@@ -7751,7 +7751,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Constructor in <a href="o [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -13691,7 +13691,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -15550,9 +15550,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.html#withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)" title="Method in ApplicationContextDatabaseMigrationCommand">withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/co [...]
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 10f7d1c3de4..c91242d7db9 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
index afd66295590..4650375e6e3 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -659,7 +659,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index fc87ddedbed..7ccfc8c2bd5 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
index eee5de6478e..54f1cc09b07 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -687,7 +687,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 32d3a8d0873..17a12749963 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
@@ -288,7 +288,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
index e6d27b8ba83..202df0af364 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
@@ -294,7 +294,7 @@ extends <a href='../../../../../../../org/grails/datastore/mapping/model/Abstrac
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
+                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
index 8c59ee448e4..bfb7ccc6380 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
@@ -283,7 +283,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
index 93ac7edb905..83b5110155d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
@@ -193,7 +193,7 @@ public interface MappingContext</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
                                 <p> Adds a new mapping context listener instance
       <DL><DT><B>Parameters:</B></DT><DD><code>listener</code> -  The listener</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
index 6fa6b05b8f2..a1bd6e40fd4 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
@@ -321,7 +321,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/document/config/
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 6675c01b662..95ee02ad625 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -531,7 +531,7 @@ implements org.springframework.context.ApplicationContextAware, <a href='../../.
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements org.springframework.context.ApplicationContextAware, <a href='../../.
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 3e5aad2e874..bd62942bee5 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index d963fdb9b1d..7ed5cc143e7 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -157,7 +157,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;org.hibernate.FlushMode <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
index e9a6ab8b535..7403c92064c 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -477,7 +477,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -496,7 +496,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a></code></td>
@@ -946,10 +946,10 @@ implements org.springframework.context.MessageSourceAware</pre>
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
index a75726cd233..65ec581c21d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
@@ -272,7 +272,7 @@ extends <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappi
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../org/grails/datastore/m [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../org/grails/datastore/m [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index b8d062ad210..21d30618ea1 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4>org.hibernate.FlushMode <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index c92ae0be2e2..c83e2afe6d4 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index eedd1003cea..144c4332391 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/deprecated-list.html b/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
index 650f5a9c633..84c7e991995 100644
--- a/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
@@ -167,7 +167,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/grails-data/mongodb/api/index-all.html b/docs/snapshot/grails-data/mongodb/api/index-all.html
index 102a74e7e63..4106472e781 100644
--- a/docs/snapshot/grails-data/mongodb/api/index-all.html
+++ b/docs/snapshot/grails-data/mongodb/api/index-all.html
@@ -626,7 +626,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Grails [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/gra [...]
 </dt><dd> <div class="block">Binds a property to Hibernate runtime meta model. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block">Binds a root class (one with no super classes) to the runtime meta model
@@ -1258,7 +1258,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
@@ -3532,7 +3532,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Constructor in <a href="o [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -4197,7 +4197,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#isBidirectionalManyToOne(org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">isBidirectionalManyToOne(org.grails.datastore.mapping.model.PersistentProperty)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)" title="Method in GrailsDomainBinder">isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)" title="Method in GrailsDomainBinder">isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html" [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#isBidirectionalOneToManyMap(org.grails.datastore.mapping.model.types.Association)" title="Method in GrailsDomainBinder">isBidirectionalOneToManyMap(org.grails.datastore.mapping.model.types.Association)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
@@ -5938,7 +5938,7 @@ if (location.href.indexOf('is-external=true') == -1) {
  resource "/WEB-INF/mapping/example.hbm.xml". </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html#setCacheQueries(boolean)" title="Method in GrailsHibernateTemplate">setCacheQueries(boolean)</a></span> - Method in <a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html">GrailsHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)" title="Method in GrailsDomainBinder">setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)" title="Method in GrailsDomainBinder">setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.html#setChangeLogProperties(java.util.Map, liquibase.changelog.ChangeLogParameters)" title="Method in GroovyChangeLogParser">setChangeLogProperties(java.util.Map, liquibase.changelog.ChangeLogParameters)</a></span> - Method in <a href="org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.html">GroovyChangeLogParser</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6034,7 +6034,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6894,9 +6894,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Use the given database for this entity for the scope of the closure call</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.html#withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)" title="Method in ApplicationContextDatabaseMigrationCommand">withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/co [...]
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
index d5bc64d215a..4f6226708ce 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
index 44c60c5fb02..f115187209d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends org.bson.AbstractBsonReader</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -677,7 +677,7 @@ extends org.bson.AbstractBsonReader</pre>
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index 54b21a547e2..cf2b68f60bd 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
index c1cac64f78c..73b842b1f41 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends org.bson.AbstractBsonWriter</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -705,7 +705,7 @@ extends org.bson.AbstractBsonWriter</pre>
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index b6f622ca598..4b2012600ab 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -514,7 +514,7 @@ implements org.springframework.context.ApplicationContextAware, org.grails.datas
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1025,10 +1025,10 @@ implements org.springframework.context.ApplicationContextAware, org.grails.datas
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index f5d6540cd38..5fdb7aa269e 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 9a611e3b706..399d9e51c5e 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -157,7 +157,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;org.hibernate.FlushMode <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
index 541c2c53c61..35de83965a5 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -473,7 +473,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -492,7 +492,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                     </table>
                    </ul>
@@ -938,10 +938,10 @@ implements org.springframework.context.MessageSourceAware</pre>
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/CompositeIdentity.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/CompositeIdentity.html
index 6364d488d26..df1b5612704 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/CompositeIdentity.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/CompositeIdentity.html
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 @groovy.transform.builder.Builder(builderStrategy: SimpleStrategy, prefix: )
 @groovy.transform.CompileStatic
 class CompositeIdentity
-extends org.hibernate.mapping.Property</pre>
+extends org.grails.datastore.mapping.config.Property</pre>
 
     <p> Represents a composite identity, equivalent to Hibernate <composite-id> mapping. <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0</DD></DL></p>
 
@@ -123,6 +123,26 @@ extends org.hibernate.mapping.Property</pre>
         
         <!-- =========== FIELD SUMMARY =========== -->
         
+            <ul class="blockList">
+                <li class="blockList"><a name="field_summary"><!--   --></a>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited fields summary table">
+                        <caption><span>Inherited fields</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Fields inherited from class</th>
+                            <th class="colLast" scope="col">Fields</th>
+                        </tr>
+                                                <tr class="altColor">
+                            <td class="colFirst"><strong><code>class org.grails.datastore.mapping.config.Property</code></strong></td>
+                            <td class="colLast"><code>__$stMC</code></td>
+                        </tr>
+
+                    </table>
+                    </ul>
+                </li>
+                
+            </ul>
+        
 
         <!-- =========== PROPERTY SUMMARY =========== -->
         
@@ -195,8 +215,8 @@ extends org.hibernate.mapping.Property</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code>class org.hibernate.mapping.Property</code></td>
-                            <td class="colLast"><code>org.hibernate.mapping.Property#addCallbackDefinitions(java.util.List), org.hibernate.mapping.Property#equals(java.lang.Object), org.hibernate.mapping.Property#getAccessorPropertyName(org.hibernate.EntityMode), org.hibernate.mapping.Property#getCallbackDefinitions(), org.hibernate.mapping.Property#getCascade(), org.hibernate.mapping.Property#getCascadeStyle(), org.hibernate.mapping.Property#getClass(), org.hibernate.mapping.Property#ge [...]
+                            <td class="colFirst"><code>class org.grails.datastore.mapping.config.Property</code></td>
+                            <td class="colLast"><code>org.grails.datastore.mapping.config.Property#$getLookup(), org.grails.datastore.mapping.config.Property#accessType(jakarta.persistence.AccessType), org.grails.datastore.mapping.config.Property#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastore.mapping.config.Property#cascades(java.util.List), org.grails.datastore.mapping.config.Property#clone(), org.grails.da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
index 0d80d33976f..27ce7aa4845 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
@@ -534,7 +534,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)">bindProperty</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</code><br>Binds a property to Hibernate runtime meta model. </td>
+                            <td class="colLast"><code><strong><a href="#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)">bindProperty</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</code><br>Binds a property to Hibernate runtime m [...]
                         </tr>
                         
                         <tr class="altColor">
@@ -723,7 +723,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.hibernate.mapping.Property</code></td>
+                            <td class="colLast"><code>protected&nbsp;org.grails.datastore.mapping.config.Property</code></td>
                             <td class="colLast"><code><strong><a href="#createProperty(org.hibernate.mapping.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)">createProperty</a></strong>(org.hibernate.mapping.Value value, org.hibernate.mapping.PersistentClass persistentClass, org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.boot.spi.InFlightMetadataColl [...]
                         </tr>
                         
@@ -855,7 +855,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.hibernate.mapping.Property</code></td>
+                            <td class="colLast"><code>protected&nbsp;org.grails.datastore.mapping.config.Property</code></td>
                             <td class="colLast"><code><strong><a href="#getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)">getProperty</a></strong>(org.hibernate.mapping.PersistentClass associatedClass, java.lang.String propertyName)</code><br></td>
                         </tr>
                         
@@ -940,7 +940,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)">isBidirectionalManyToOneWithListMapping</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)">isBidirectionalManyToOneWithListMapping</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1036,7 +1036,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)">setCascadeBehaviour</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)">setCascadeBehaviour</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1649,10 +1649,10 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindProperty</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindProperty</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
                                 <p> Binds a property to Hibernate runtime meta model. Deals with cascade strategy based on the Grails domain model
       <DL><DT><B>Parameters:</B></DT><DD><code>grailsProperty</code> -  The grails property instance</DD><DD><code>prop</code> -            The Hibernate property</DD><DD><code>mappings</code> -        The Hibernate mappings</DD></DL></p>
                             </li>
@@ -1924,7 +1924,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="createProperty(org.hibernate.mapping.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.mapping.Property <strong>createProperty</strong>(org.hibernate.mapping.Value value, org.hibernate.mapping.PersistentClass persistentClass, org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
+                                <h4>protected&nbsp;org.grails.datastore.mapping.config.Property <strong>createProperty</strong>(org.hibernate.mapping.Value value, org.hibernate.mapping.PersistentClass persistentClass, org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2104,7 +2104,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.mapping.Property <strong>getProperty</strong>(org.hibernate.mapping.PersistentClass associatedClass, java.lang.String propertyName)</h4>
+                                <h4>protected&nbsp;org.grails.datastore.mapping.config.Property <strong>getProperty</strong>(org.hibernate.mapping.PersistentClass associatedClass, java.lang.String propertyName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2214,10 +2214,10 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)"><!-- --></a>
+                        <a name="isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;boolean <strong>isBidirectionalManyToOneWithListMapping</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</h4>
+                                <h4>protected&nbsp;boolean <strong>isBidirectionalManyToOneWithListMapping</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2346,10 +2346,10 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)"><!-- --></a>
+                        <a name="setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>setCascadeBehaviour</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</h4>
+                                <h4>protected&nbsp;void <strong>setCascadeBehaviour</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html
index 1e9a54a6a37..521f1434b8d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 @groovy.transform.builder.Builder(builderStrategy: SimpleStrategy, prefix: )
 class Identity
-extends org.hibernate.mapping.Property</pre>
+extends org.grails.datastore.mapping.config.Property</pre>
 
     <p> Defines the identity generation strategy. In the case of a 'composite' identity the properties
  array defines the property names that formulate the composite id. <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0</DD></DL></p>
@@ -123,6 +123,26 @@ extends org.hibernate.mapping.Property</pre>
         
         <!-- =========== FIELD SUMMARY =========== -->
         
+            <ul class="blockList">
+                <li class="blockList"><a name="field_summary"><!--   --></a>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited fields summary table">
+                        <caption><span>Inherited fields</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Fields inherited from class</th>
+                            <th class="colLast" scope="col">Fields</th>
+                        </tr>
+                                                <tr class="altColor">
+                            <td class="colFirst"><strong><code>class org.grails.datastore.mapping.config.Property</code></strong></td>
+                            <td class="colLast"><code>__$stMC</code></td>
+                        </tr>
+
+                    </table>
+                    </ul>
+                </li>
+                
+            </ul>
+        
 
         <!-- =========== PROPERTY SUMMARY =========== -->
         
@@ -260,8 +280,8 @@ extends org.hibernate.mapping.Property</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code>class org.hibernate.mapping.Property</code></td>
-                            <td class="colLast"><code>org.hibernate.mapping.Property#addCallbackDefinitions(java.util.List), org.hibernate.mapping.Property#equals(java.lang.Object), org.hibernate.mapping.Property#getAccessorPropertyName(org.hibernate.EntityMode), org.hibernate.mapping.Property#getCallbackDefinitions(), org.hibernate.mapping.Property#getCascade(), org.hibernate.mapping.Property#getCascadeStyle(), org.hibernate.mapping.Property#getClass(), org.hibernate.mapping.Property#ge [...]
+                            <td class="colFirst"><code>class org.grails.datastore.mapping.config.Property</code></td>
+                            <td class="colLast"><code>org.grails.datastore.mapping.config.Property#$getLookup(), org.grails.datastore.mapping.config.Property#accessType(jakarta.persistence.AccessType), org.grails.datastore.mapping.config.Property#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastore.mapping.config.Property#cascades(java.util.List), org.grails.datastore.mapping.config.Property#clone(), org.grails.da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html
index fff58c6f35b..999a292b170 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html
@@ -177,7 +177,7 @@ extends org.grails.datastore.mapping.config.Entity&lt;<a href='../../../../../or
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>org.hibernate.mapping.Property</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.grails.datastore.mapping.config.Property</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#identity">identity</a></code><br>The identity definition</td>
                         </tr>
                         
@@ -583,7 +583,7 @@ extends org.grails.datastore.mapping.config.Entity&lt;<a href='../../../../../or
                         <a name="identity"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>org.hibernate.mapping.Property <strong>identity</strong></h4>
+                                <h4>org.grails.datastore.mapping.config.Property <strong>identity</strong></h4>
                                 <p> The identity definition</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html
index 93cfded7e79..8cdf915d142 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 @groovy.transform.builder.Builder(builderStrategy: SimpleStrategy, prefix: )
 class PropertyConfig
-extends org.hibernate.mapping.Property</pre>
+extends org.grails.datastore.mapping.config.Property</pre>
 
     <p> Custom mapping for a single domain property. Note that a property
  can have multiple columns via a component or a user type. <DL><DT><B>Since:</B></DT><DD>1.0.4</DD></DL><DL><DT><B>Authors:</B></DT><DD>pledbrook</DD></DL></p>
@@ -123,6 +123,26 @@ extends org.hibernate.mapping.Property</pre>
         
         <!-- =========== FIELD SUMMARY =========== -->
         
+            <ul class="blockList">
+                <li class="blockList"><a name="field_summary"><!--   --></a>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited fields summary table">
+                        <caption><span>Inherited fields</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Fields inherited from class</th>
+                            <th class="colLast" scope="col">Fields</th>
+                        </tr>
+                                                <tr class="altColor">
+                            <td class="colFirst"><strong><code>class org.grails.datastore.mapping.config.Property</code></strong></td>
+                            <td class="colLast"><code>__$stMC</code></td>
+                        </tr>
+
+                    </table>
+                    </ul>
+                </li>
+                
+            </ul>
+        
 
         <!-- =========== PROPERTY SUMMARY =========== -->
         
@@ -457,8 +477,8 @@ extends org.hibernate.mapping.Property</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code>class org.hibernate.mapping.Property</code></td>
-                            <td class="colLast"><code>org.hibernate.mapping.Property#addCallbackDefinitions(java.util.List), org.hibernate.mapping.Property#equals(java.lang.Object), org.hibernate.mapping.Property#getAccessorPropertyName(org.hibernate.EntityMode), org.hibernate.mapping.Property#getCallbackDefinitions(), org.hibernate.mapping.Property#getCascade(), org.hibernate.mapping.Property#getCascadeStyle(), org.hibernate.mapping.Property#getClass(), org.hibernate.mapping.Property#ge [...]
+                            <td class="colFirst"><code>class org.grails.datastore.mapping.config.Property</code></td>
+                            <td class="colLast"><code>org.grails.datastore.mapping.config.Property#$getLookup(), org.grails.datastore.mapping.config.Property#accessType(jakarta.persistence.AccessType), org.grails.datastore.mapping.config.Property#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastore.mapping.config.Property#cascades(java.util.List), org.grails.datastore.mapping.config.Property#clone(), org.grails.da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index 4a8769481fd..9398529b5ac 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4>org.hibernate.FlushMode <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 9c06eb06315..37573274ff2 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index fb5ef01f485..2e222b1f8d7 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/whats-new-manual/index.html b/docs/snapshot/grails-data/whats-new-manual/index.html
index ca2c853929c..4078f174838 100644
--- a/docs/snapshot/grails-data/whats-new-manual/index.html
+++ b/docs/snapshot/grails-data/whats-new-manual/index.html
@@ -527,7 +527,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.5-SNAPSHOT<br>
-Last updated 2026-01-08 23:16:55 UTC
+Last updated 2026-01-09 20:04:19 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/guide/REST.html b/docs/snapshot/guide/REST.html
index 97661620f66..f4ba1380008 100644
--- a/docs/snapshot/guide/REST.html
+++ b/docs/snapshot/guide/REST.html
@@ -366,6 +366,22 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">json</span>:
+              - <span class="string"><span class="content">'application/json'</span></span>
+              - <span class="string"><span class="content">'text/json'</span></span>
+            <span class="key">xml</span>:
+              - <span class="string"><span class="content">'text/xml'</span></span>
+              - <span class="string"><span class="content">'application/xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>See the section on <a href="theWebLayer.html#contentNegotiation">Configuring Mime Types</a> in the user guide for more information.</p>
 </div>
 <div class="paragraph">
@@ -582,6 +598,20 @@ To make a link fire this type of event, perhaps capture all click events for lin
 }</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="content">'*/*'</span></span>
+            <span class="key">book</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json;v=1.0</span><span class="delimiter">&quot;</span></span>
+            <span class="key">bookv2</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json;v=2.0</span><span class="delimiter">&quot;</span></span>
+            <span class="error">...</span></code></pre>
+</div>
+</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
@@ -2203,6 +2233,20 @@ Transfer-<span class="key">Encoding</span>: chunked
 ]</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">*/*</span><span class="delimiter">&quot;</span></span>
+            <span class="key">book</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">bookList</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.booklist+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">...</span>:</code></pre>
+</div>
+</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
diff --git a/docs/snapshot/guide/conf.html b/docs/snapshot/guide/conf.html
index a01e64416c8..9b92389020e 100644
--- a/docs/snapshot/guide/conf.html
+++ b/docs/snapshot/guide/conf.html
@@ -1256,6 +1256,34 @@ environments {
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">dataSource</span>:
+    <span class="key">pooled</span>: <span class="string"><span class="content">false</span></span>
+    <span class="key">driverClassName</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">org.h2.Driver</span><span class="delimiter">&quot;</span></span>
+    <span class="key">username</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">sa</span><span class="delimiter">&quot;</span></span>
+    <span class="key">password</span>: <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>
+<span class="key">environments</span>:
+    <span class="key">development</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">create-drop</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:mem:devDb</span><span class="delimiter">&quot;</span></span>
+    <span class="key">test</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">update</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:mem:testDb</span><span class="delimiter">&quot;</span></span>
+    <span class="key">production</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">update</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:prodDb</span><span class="delimiter">&quot;</span></span>
+            <span class="key">properties</span>:
+               <span class="key">jmxEnabled</span>: <span class="string"><span class="content">true</span></span>
+               <span class="key">initialSize</span>: <span class="string"><span class="content">5</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Notice how the common configuration is provided at the top level and then an <code>environments</code> block specifies per environment settings for the <code>dbCreate</code> and <code>url</code> properties of the <code>DataSource</code>.</p>
 </div>
 </div>
diff --git a/docs/snapshot/guide/pages/codecs.html b/docs/snapshot/guide/pages/codecs.html
index b4afd8e9c9d..33b26930178 100644
--- a/docs/snapshot/guide/pages/codecs.html
+++ b/docs/snapshot/guide/pages/codecs.html
@@ -283,6 +283,17 @@ Note that the HTML encoding does not re-encode apostrophe/single quote so you mu
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">views</span>:
+        <span class="key">gsp</span>:
+            <span class="key">htmlcodec</span>: <span class="string"><span class="content">'xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p><strong>XMLCodec</strong></p>
 </div>
 <div class="paragraph">
diff --git a/docs/snapshot/guide/pages/contentNegotiation.html b/docs/snapshot/guide/pages/contentNegotiation.html
index c3e1ad38f13..f474a7252b6 100644
--- a/docs/snapshot/guide/pages/contentNegotiation.html
+++ b/docs/snapshot/guide/pages/contentNegotiation.html
@@ -244,6 +244,37 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="content">'*/*'</span></span>  <span class="comment"># 'all' maps to '*' or the first available format in withFormat</span>
+            <span class="key">atom</span>: <span class="string"><span class="content">'application/atom+xml'</span></span>
+            <span class="key">css</span>: <span class="string"><span class="content">'text/css'</span></span>
+            <span class="key">csv</span>: <span class="string"><span class="content">'text/csv'</span></span>
+            <span class="key">form</span>: <span class="string"><span class="content">'application/x-www-form-urlencoded'</span></span>
+            <span class="key">html</span>:
+              - <span class="string"><span class="content">'text/html'</span></span>
+              - <span class="string"><span class="content">'application/xhtml+xml'</span></span>
+            <span class="key">js</span>: <span class="string"><span class="content">'text/javascript'</span></span>
+            <span class="key">json</span>:
+              - <span class="string"><span class="content">'application/json'</span></span>
+              - <span class="string"><span class="content">'text/json'</span></span>
+            <span class="key">multipartForm</span>: <span class="string"><span class="content">'multipart/form-data'</span></span>
+            <span class="key">rss</span>: <span class="string"><span class="content">'application/rss+xml'</span></span>
+            <span class="key">text</span>: <span class="string"><span class="content">'text/plain'</span></span>
+            <span class="key">hal</span>:
+              - <span class="string"><span class="content">'application/hal+json'</span></span>
+              - <span class="string"><span class="content">'application/hal+xml'</span></span>
+            <span class="key">xml</span>:
+              - <span class="string"><span class="content">'text/xml'</span></span>
+              - <span class="string"><span class="content">'application/xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The above bit of configuration allows Grails to detect to format of a request containing either the 'text/xml' or 'application/xml' media types as simply 'xml'. You can add your own types by simply adding new entries into the map.
 The first one is the default format.</p>
 </div>
@@ -391,6 +422,19 @@ When using <a href="../ref/Controllers/withFormat.html">withFormat</a> make sure
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">disable</span>:
+            <span class="key">accept</span>:
+                <span class="key">header</span>:
+                    <span class="key">userAgents</span>: <span class="string"><span class="content">['Gecko', 'WebKit', 'Presto', 'Trident']</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>For example, if it sees the accept header above ('application/json') it will set <code>format</code> to <code>json</code> as you&#8217;d expect. And of course this works with the <code>withFormat()</code> method in just the same way as when the <code>format</code> URL parameter is set (although the URL parameter takes precedence).</p>
 </div>
 <div class="paragraph">
diff --git a/docs/snapshot/guide/pages/controllers.html b/docs/snapshot/guide/pages/controllers.html
index 97fde565a66..a5a84c20155 100644
--- a/docs/snapshot/guide/pages/controllers.html
+++ b/docs/snapshot/guide/pages/controllers.html
@@ -1203,6 +1203,19 @@ grails.databinding.trimStrings = <span class="predefined-constant">false</span>
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">trimStrings</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The mass property binding mechanism will by default automatically convert all empty Strings to null at binding time.  To disable this behavior set the <code>grails.databinding.convertEmptyStringsToNull</code> property to false in <code>grails-app/conf/application.groovy</code>.</p>
 </div>
 <div class="listingblock">
@@ -1214,6 +1227,19 @@ grails.databinding.convertEmptyStringsToNull = <span class="predefined-constant"
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">convertEmptyStringsToNull</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The order of events is that the String trimming happens and then null conversion happens so if <code>trimStrings</code> is <code>true</code> and <code>convertEmptyStringsToNull</code> is <code>true</code>, not only will empty Strings be converted to null but also blank Strings.  A blank String is any String such that the <code>trim()</code> method returns an empty String.</p>
 </div>
 <div class="admonitionblock warning">
@@ -1373,6 +1399,20 @@ grails.databinding.autoGrowCollectionLimit = <span class="integer">128</span>
 <span class="comment">// ...</span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is 256</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">autoGrowCollectionLimit</span>: <span class="string"><span class="content">128</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_data_binding_with_multiple_domain_classes">Data binding with Multiple domain classes</h4>
@@ -1673,7 +1713,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="listingblock">
 <div class="title">grails-app/conf/application.groovy</div>
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'hh:mm:ss'Z'</span><span class="del [...]
+<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'HH:mm:ss'Z'</span><span class="del [...]
 </div>
 </div>
 <div class="listingblock">
@@ -1681,7 +1721,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
     <span class="key">databinding</span>:
-        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'hh:mm:ss'Z'&quot;]</span></span></code></pre>
+        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'HH:mm:ss'Z'&quot;]</span></span></code></pre>
 </div>
 </div>
 <div class="paragraph">
diff --git a/docs/snapshot/guide/pages/customizingUrlFormat.html b/docs/snapshot/guide/pages/customizingUrlFormat.html
index 25851f85935..85d3d553c6c 100644
--- a/docs/snapshot/guide/pages/customizingUrlFormat.html
+++ b/docs/snapshot/guide/pages/customizingUrlFormat.html
@@ -195,6 +195,18 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">web</span>:
+        <span class="key">url</span>:
+            <span class="key">converter</span>: <span class="string"><span class="content">'hyphenated'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Arbitrary strategies may be plugged in by providing a class which implements the <a href="../api/grails/web/UrlConverter.html">UrlConverter</a> interface and adding an instance of that class to the Spring application context with the bean name of <code>grails.web.UrlConverter.BEAN_NAME</code>.  If Grails finds a bean in the context with that name, it will be used as the default converter and there is no need to assign a value to the <code>grails.web.url.converter</code> config property.</p>
 </div>
 <div class="listingblock">
diff --git a/docs/snapshot/guide/pages/dataBinding.html b/docs/snapshot/guide/pages/dataBinding.html
index 0d4f76490f0..be745fe556d 100644
--- a/docs/snapshot/guide/pages/dataBinding.html
+++ b/docs/snapshot/guide/pages/dataBinding.html
@@ -451,6 +451,19 @@ grails.databinding.trimStrings = <span class="predefined-constant">false</span>
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">trimStrings</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The mass property binding mechanism will by default automatically convert all empty Strings to null at binding time.  To disable this behavior set the <code>grails.databinding.convertEmptyStringsToNull</code> property to false in <code>grails-app/conf/application.groovy</code>.</p>
 </div>
 <div class="listingblock">
@@ -462,6 +475,19 @@ grails.databinding.convertEmptyStringsToNull = <span class="predefined-constant"
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">convertEmptyStringsToNull</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The order of events is that the String trimming happens and then null conversion happens so if <code>trimStrings</code> is <code>true</code> and <code>convertEmptyStringsToNull</code> is <code>true</code>, not only will empty Strings be converted to null but also blank Strings.  A blank String is any String such that the <code>trim()</code> method returns an empty String.</p>
 </div>
 <div class="admonitionblock warning">
@@ -621,6 +647,20 @@ grails.databinding.autoGrowCollectionLimit = <span class="integer">128</span>
 <span class="comment">// ...</span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is 256</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">autoGrowCollectionLimit</span>: <span class="string"><span class="content">128</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_data_binding_with_multiple_domain_classes">Data binding with Multiple domain classes</h4>
@@ -921,7 +961,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="listingblock">
 <div class="title">grails-app/conf/application.groovy</div>
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'hh:mm:ss'Z'</span><span class="del [...]
+<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'HH:mm:ss'Z'</span><span class="del [...]
 </div>
 </div>
 <div class="listingblock">
@@ -929,7 +969,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
     <span class="key">databinding</span>:
-        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'hh:mm:ss'Z'&quot;]</span></span></code></pre>
+        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'HH:mm:ss'Z'&quot;]</span></span></code></pre>
 </div>
 </div>
 <div class="paragraph">
diff --git a/docs/snapshot/guide/pages/domainResources.html b/docs/snapshot/guide/pages/domainResources.html
index bc845f03883..9396178f1e4 100644
--- a/docs/snapshot/guide/pages/domainResources.html
+++ b/docs/snapshot/guide/pages/domainResources.html
@@ -263,6 +263,22 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">json</span>:
+              - <span class="string"><span class="content">'application/json'</span></span>
+              - <span class="string"><span class="content">'text/json'</span></span>
+            <span class="key">xml</span>:
+              - <span class="string"><span class="content">'text/xml'</span></span>
+              - <span class="string"><span class="content">'application/xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>See the section on <a href="theWebLayer.html#contentNegotiation">Configuring Mime Types</a> in the user guide for more information.</p>
 </div>
 <div class="paragraph">
diff --git a/docs/snapshot/guide/pages/environments.html b/docs/snapshot/guide/pages/environments.html
index 2e347772ac8..bc7f2a20a25 100644
--- a/docs/snapshot/guide/pages/environments.html
+++ b/docs/snapshot/guide/pages/environments.html
@@ -249,6 +249,34 @@ environments {
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">dataSource</span>:
+    <span class="key">pooled</span>: <span class="string"><span class="content">false</span></span>
+    <span class="key">driverClassName</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">org.h2.Driver</span><span class="delimiter">&quot;</span></span>
+    <span class="key">username</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">sa</span><span class="delimiter">&quot;</span></span>
+    <span class="key">password</span>: <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>
+<span class="key">environments</span>:
+    <span class="key">development</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">create-drop</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:mem:devDb</span><span class="delimiter">&quot;</span></span>
+    <span class="key">test</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">update</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:mem:testDb</span><span class="delimiter">&quot;</span></span>
+    <span class="key">production</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">update</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:prodDb</span><span class="delimiter">&quot;</span></span>
+            <span class="key">properties</span>:
+               <span class="key">jmxEnabled</span>: <span class="string"><span class="content">true</span></span>
+               <span class="key">initialSize</span>: <span class="string"><span class="content">5</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Notice how the common configuration is provided at the top level and then an <code>environments</code> block specifies per environment settings for the <code>dbCreate</code> and <code>url</code> properties of the <code>DataSource</code>.</p>
 </div>
 </div>
diff --git a/docs/snapshot/guide/pages/hal.html b/docs/snapshot/guide/pages/hal.html
index 3e22f783462..3723cec0e15 100644
--- a/docs/snapshot/guide/pages/hal.html
+++ b/docs/snapshot/guide/pages/hal.html
@@ -464,6 +464,20 @@ Transfer-<span class="key">Encoding</span>: chunked
 ]</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">*/*</span><span class="delimiter">&quot;</span></span>
+            <span class="key">book</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">bookList</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.booklist+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">...</span>:</code></pre>
+</div>
+</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
diff --git a/docs/snapshot/guide/pages/hypermedia.html b/docs/snapshot/guide/pages/hypermedia.html
index 078c11a275b..7d84c5b7c10 100644
--- a/docs/snapshot/guide/pages/hypermedia.html
+++ b/docs/snapshot/guide/pages/hypermedia.html
@@ -495,6 +495,20 @@ Transfer-<span class="key">Encoding</span>: chunked
 ]</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">*/*</span><span class="delimiter">&quot;</span></span>
+            <span class="key">book</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">bookList</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.booklist+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">...</span>:</code></pre>
+</div>
+</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
diff --git a/docs/snapshot/guide/pages/interceptorOrdering.html b/docs/snapshot/guide/pages/interceptorOrdering.html
index ed2ec2a7eb1..96d98c1d692 100644
--- a/docs/snapshot/guide/pages/interceptorOrdering.html
+++ b/docs/snapshot/guide/pages/interceptorOrdering.html
@@ -250,6 +250,16 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">beans</span>:
+  <span class="key">authInterceptor</span>:
+    <span class="key">order</span>: <span class="string"><span class="content">50</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Thus giving you complete control over interceptor execution order.</p>
 </div>
 
diff --git a/docs/snapshot/guide/pages/interceptors.html b/docs/snapshot/guide/pages/interceptors.html
index a44485b8e0d..9e0a99bc7c6 100644
--- a/docs/snapshot/guide/pages/interceptors.html
+++ b/docs/snapshot/guide/pages/interceptors.html
@@ -453,6 +453,16 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">beans</span>:
+  <span class="key">authInterceptor</span>:
+    <span class="key">order</span>: <span class="string"><span class="content">50</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Thus giving you complete control over interceptor execution order.</p>
 </div>
 
diff --git a/docs/snapshot/guide/pages/propertyPlaceholderConfiguration.html b/docs/snapshot/guide/pages/propertyPlaceholderConfiguration.html
index 43215373739..3fb7db2930b 100644
--- a/docs/snapshot/guide/pages/propertyPlaceholderConfiguration.html
+++ b/docs/snapshot/guide/pages/propertyPlaceholderConfiguration.html
@@ -198,6 +198,16 @@ database.dbname=<span class="string"><span class="delimiter">&quot;</span><span
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">database</span>:
+    <span class="key">driver</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">com.mysql.jdbc.Driver</span><span class="delimiter">&quot;</span></span>
+    <span class="key">dbname</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">mysql:mydb</span><span class="delimiter">&quot;</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>You can then specify placeholders in <code>resources.xml</code> as follows using the familiar ${..} syntax:</p>
 </div>
 <div class="listingblock">
diff --git a/docs/snapshot/guide/pages/urlmappings.html b/docs/snapshot/guide/pages/urlmappings.html
index 08c6da14dda..af1caf8c385 100644
--- a/docs/snapshot/guide/pages/urlmappings.html
+++ b/docs/snapshot/guide/pages/urlmappings.html
@@ -1376,6 +1376,18 @@ println name <span class="comment">// prints &quot;logo&quot; or &quot;other/log
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">web</span>:
+        <span class="key">url</span>:
+            <span class="key">converter</span>: <span class="string"><span class="content">'hyphenated'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Arbitrary strategies may be plugged in by providing a class which implements the <a href="../api/grails/web/UrlConverter.html">UrlConverter</a> interface and adding an instance of that class to the Spring application context with the bean name of <code>grails.web.UrlConverter.BEAN_NAME</code>.  If Grails finds a bean in the context with that name, it will be used as the default converter and there is no need to assign a value to the <code>grails.web.url.converter</code> config property.</p>
 </div>
 <div class="listingblock">
diff --git a/docs/snapshot/guide/pages/versioningResources.html b/docs/snapshot/guide/pages/versioningResources.html
index 158e88bfa0d..c7f0620b65a 100644
--- a/docs/snapshot/guide/pages/versioningResources.html
+++ b/docs/snapshot/guide/pages/versioningResources.html
@@ -256,6 +256,20 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 }</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="content">'*/*'</span></span>
+            <span class="key">book</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json;v=1.0</span><span class="delimiter">&quot;</span></span>
+            <span class="key">bookv2</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json;v=2.0</span><span class="delimiter">&quot;</span></span>
+            <span class="error">...</span></code></pre>
+</div>
+</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
diff --git a/docs/snapshot/guide/pages/xssPrevention.html b/docs/snapshot/guide/pages/xssPrevention.html
index df0ab8ed10d..1b777adaaba 100644
--- a/docs/snapshot/guide/pages/xssPrevention.html
+++ b/docs/snapshot/guide/pages/xssPrevention.html
@@ -334,6 +334,19 @@ Although Grails plays it safe by default, that is no guarantee that your applica
 <pre class="CodeRay highlight"><code data-lang="groovy">foo.grails.views.gsp.codecs.expression = <span class="string"><span class="delimiter">&quot;</span><span class="content">none</span><span class="delimiter">&quot;</span></span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">foo</span>:
+    <span class="key">grails</span>:
+        <span class="key">views</span>:
+            <span class="key">gsp</span>:
+                <span class="key">codecs</span>:
+                    <span class="key">expression</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">none</span><span class="delimiter">&quot;</span></span></code></pre>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_per_page_encoding">Per Page Encoding</h4>
@@ -403,6 +416,18 @@ Although Grails plays it safe by default, that is no guarantee that your applica
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">views</span>:
+        <span class="key">gsp</span>:
+            <span class="key">filteringCodecForContentType</span>:
+                <span class="key">text/html</span>: <span class="string"><span class="content">'html'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Note that, if activated, the <code>staticparts</code> codec typically needs to be set to <code>raw</code> so that static markup is not encoded:</p>
 </div>
 <div class="listingblock">
@@ -415,6 +440,18 @@ Although Grails plays it safe by default, that is no guarantee that your applica
     }</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">codecs</span>:
+    <span class="key">expression</span>: <span class="string"><span class="content">'html'</span></span>  <span class="comment"># escapes values inside ${}</span>
+    <span class="key">scriptlet</span>: <span class="string"><span class="content">'html'</span></span>   <span class="comment"># escapes output from scriptlets in GSPs</span>
+    <span class="key">taglib</span>: <span class="string"><span class="content">'none'</span></span>      <span class="comment"># escapes output from taglibs</span>
+    <span class="key">staticparts</span>: <span class="string"><span class="content">'raw'</span></span>  <span class="comment"># escapes output from static template parts</span></code></pre>
+</div>
+</div>
 </div>
 
 
diff --git a/docs/snapshot/guide/security.html b/docs/snapshot/guide/security.html
index c01c1c45fcc..0dbcb2824e2 100644
--- a/docs/snapshot/guide/security.html
+++ b/docs/snapshot/guide/security.html
@@ -516,6 +516,19 @@ Although Grails plays it safe by default, that is no guarantee that your applica
 <pre class="CodeRay highlight"><code data-lang="groovy">foo.grails.views.gsp.codecs.expression = <span class="string"><span class="delimiter">&quot;</span><span class="content">none</span><span class="delimiter">&quot;</span></span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">foo</span>:
+    <span class="key">grails</span>:
+        <span class="key">views</span>:
+            <span class="key">gsp</span>:
+                <span class="key">codecs</span>:
+                    <span class="key">expression</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">none</span><span class="delimiter">&quot;</span></span></code></pre>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_per_page_encoding">Per Page Encoding</h4>
@@ -585,6 +598,18 @@ Although Grails plays it safe by default, that is no guarantee that your applica
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">views</span>:
+        <span class="key">gsp</span>:
+            <span class="key">filteringCodecForContentType</span>:
+                <span class="key">text/html</span>: <span class="string"><span class="content">'html'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Note that, if activated, the <code>staticparts</code> codec typically needs to be set to <code>raw</code> so that static markup is not encoded:</p>
 </div>
 <div class="listingblock">
@@ -597,6 +622,18 @@ Although Grails plays it safe by default, that is no guarantee that your applica
     }</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">codecs</span>:
+    <span class="key">expression</span>: <span class="string"><span class="content">'html'</span></span>  <span class="comment"># escapes values inside ${}</span>
+    <span class="key">scriptlet</span>: <span class="string"><span class="content">'html'</span></span>   <span class="comment"># escapes output from scriptlets in GSPs</span>
+    <span class="key">taglib</span>: <span class="string"><span class="content">'none'</span></span>      <span class="comment"># escapes output from taglibs</span>
+    <span class="key">staticparts</span>: <span class="string"><span class="content">'raw'</span></span>  <span class="comment"># escapes output from static template parts</span></code></pre>
+</div>
+</div>
 </div>
 
 <a name="14.2 Encoding and Decoding Objects"><!-- Legacy link --></a>
@@ -707,6 +744,17 @@ Note that the HTML encoding does not re-encode apostrophe/single quote so you mu
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">views</span>:
+        <span class="key">gsp</span>:
+            <span class="key">htmlcodec</span>: <span class="string"><span class="content">'xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p><strong>XMLCodec</strong></p>
 </div>
 <div class="paragraph">
diff --git a/docs/snapshot/guide/single.html b/docs/snapshot/guide/single.html
index c2d84d0ad96..c9201be5c74 100644
--- a/docs/snapshot/guide/single.html
+++ b/docs/snapshot/guide/single.html
@@ -5790,6 +5790,34 @@ environments {
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">dataSource</span>:
+    <span class="key">pooled</span>: <span class="string"><span class="content">false</span></span>
+    <span class="key">driverClassName</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">org.h2.Driver</span><span class="delimiter">&quot;</span></span>
+    <span class="key">username</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">sa</span><span class="delimiter">&quot;</span></span>
+    <span class="key">password</span>: <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>
+<span class="key">environments</span>:
+    <span class="key">development</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">create-drop</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:mem:devDb</span><span class="delimiter">&quot;</span></span>
+    <span class="key">test</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">update</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:mem:testDb</span><span class="delimiter">&quot;</span></span>
+    <span class="key">production</span>:
+        <span class="key">dataSource</span>:
+            <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">update</span><span class="delimiter">&quot;</span></span>
+            <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:h2:prodDb</span><span class="delimiter">&quot;</span></span>
+            <span class="key">properties</span>:
+               <span class="key">jmxEnabled</span>: <span class="string"><span class="content">true</span></span>
+               <span class="key">initialSize</span>: <span class="string"><span class="content">5</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Notice how the common configuration is provided at the top level and then an <code>environments</code> block specifies per environment settings for the <code>dbCreate</code> and <code>url</code> properties of the <code>DataSource</code>.</p>
 </div>
 </div>
@@ -11044,6 +11072,19 @@ grails.databinding.trimStrings = <span class="predefined-constant">false</span>
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">trimStrings</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The mass property binding mechanism will by default automatically convert all empty Strings to null at binding time.  To disable this behavior set the <code>grails.databinding.convertEmptyStringsToNull</code> property to false in <code>grails-app/conf/application.groovy</code>.</p>
 </div>
 <div class="listingblock">
@@ -11055,6 +11096,19 @@ grails.databinding.convertEmptyStringsToNull = <span class="predefined-constant"
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">convertEmptyStringsToNull</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The order of events is that the String trimming happens and then null conversion happens so if <code>trimStrings</code> is <code>true</code> and <code>convertEmptyStringsToNull</code> is <code>true</code>, not only will empty Strings be converted to null but also blank Strings.  A blank String is any String such that the <code>trim()</code> method returns an empty String.</p>
 </div>
 <div class="admonitionblock warning">
@@ -11214,6 +11268,20 @@ grails.databinding.autoGrowCollectionLimit = <span class="integer">128</span>
 <span class="comment">// ...</span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is 256</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">autoGrowCollectionLimit</span>: <span class="string"><span class="content">128</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_data_binding_with_multiple_domain_classes">Data binding with Multiple domain classes</h4>
@@ -11514,7 +11582,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="listingblock">
 <div class="title">grails-app/conf/application.groovy</div>
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'hh:mm:ss'Z'</span><span class="del [...]
+<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'HH:mm:ss'Z'</span><span class="del [...]
 </div>
 </div>
 <div class="listingblock">
@@ -11522,7 +11590,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
     <span class="key">databinding</span>:
-        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'hh:mm:ss'Z'&quot;]</span></span></code></pre>
+        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'HH:mm:ss'Z'&quot;]</span></span></code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19738,6 +19806,18 @@ println name <span class="comment">// prints &quot;logo&quot; or &quot;other/log
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">web</span>:
+        <span class="key">url</span>:
+            <span class="key">converter</span>: <span class="string"><span class="content">'hyphenated'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Arbitrary strategies may be plugged in by providing a class which implements the <a href="../api/grails/web/UrlConverter.html">UrlConverter</a> interface and adding an instance of that class to the Spring application context with the bean name of <code>grails.web.UrlConverter.BEAN_NAME</code>.  If Grails finds a bean in the context with that name, it will be used as the default converter and there is no need to assign a value to the <code>grails.web.url.converter</code> config property.</p>
 </div>
 <div class="listingblock">
@@ -20334,6 +20414,16 @@ Specifying at least one mapping will disable the creation of the global mapping
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">beans</span>:
+  <span class="key">authInterceptor</span>:
+    <span class="key">order</span>: <span class="string"><span class="content">50</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Thus giving you complete control over interceptor execution order.</p>
 </div>
 
@@ -20406,6 +20496,37 @@ Specifying at least one mapping will disable the creation of the global mapping
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="content">'*/*'</span></span>  <span class="comment"># 'all' maps to '*' or the first available format in withFormat</span>
+            <span class="key">atom</span>: <span class="string"><span class="content">'application/atom+xml'</span></span>
+            <span class="key">css</span>: <span class="string"><span class="content">'text/css'</span></span>
+            <span class="key">csv</span>: <span class="string"><span class="content">'text/csv'</span></span>
+            <span class="key">form</span>: <span class="string"><span class="content">'application/x-www-form-urlencoded'</span></span>
+            <span class="key">html</span>:
+              - <span class="string"><span class="content">'text/html'</span></span>
+              - <span class="string"><span class="content">'application/xhtml+xml'</span></span>
+            <span class="key">js</span>: <span class="string"><span class="content">'text/javascript'</span></span>
+            <span class="key">json</span>:
+              - <span class="string"><span class="content">'application/json'</span></span>
+              - <span class="string"><span class="content">'text/json'</span></span>
+            <span class="key">multipartForm</span>: <span class="string"><span class="content">'multipart/form-data'</span></span>
+            <span class="key">rss</span>: <span class="string"><span class="content">'application/rss+xml'</span></span>
+            <span class="key">text</span>: <span class="string"><span class="content">'text/plain'</span></span>
+            <span class="key">hal</span>:
+              - <span class="string"><span class="content">'application/hal+json'</span></span>
+              - <span class="string"><span class="content">'application/hal+xml'</span></span>
+            <span class="key">xml</span>:
+              - <span class="string"><span class="content">'text/xml'</span></span>
+              - <span class="string"><span class="content">'application/xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The above bit of configuration allows Grails to detect to format of a request containing either the 'text/xml' or 'application/xml' media types as simply 'xml'. You can add your own types by simply adding new entries into the map.
 The first one is the default format.</p>
 </div>
@@ -20553,6 +20674,19 @@ When using <a href="../ref/Controllers/withFormat.html">withFormat</a> make sure
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">disable</span>:
+            <span class="key">accept</span>:
+                <span class="key">header</span>:
+                    <span class="key">userAgents</span>: <span class="string"><span class="content">['Gecko', 'WebKit', 'Presto', 'Trident']</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>For example, if it sees the accept header above ('application/json') it will set <code>format</code> to <code>json</code> as you&#8217;d expect. And of course this works with the <code>withFormat()</code> method in just the same way as when the <code>format</code> URL parameter is set (although the URL parameter takes precedence).</p>
 </div>
 <div class="paragraph">
@@ -20949,6 +21083,22 @@ If the accept header is used but contains no registered content types, Grails wi
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">json</span>:
+              - <span class="string"><span class="content">'application/json'</span></span>
+              - <span class="string"><span class="content">'text/json'</span></span>
+            <span class="key">xml</span>:
+              - <span class="string"><span class="content">'text/xml'</span></span>
+              - <span class="string"><span class="content">'application/xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>See the section on <a href="theWebLayer.html#contentNegotiation">Configuring Mime Types</a> in the user guide for more information.</p>
 </div>
 <div class="paragraph">
@@ -21165,6 +21315,20 @@ To make a link fire this type of event, perhaps capture all click events for lin
 }</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="content">'*/*'</span></span>
+            <span class="key">book</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json;v=1.0</span><span class="delimiter">&quot;</span></span>
+            <span class="key">bookv2</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json;v=2.0</span><span class="delimiter">&quot;</span></span>
+            <span class="error">...</span></code></pre>
+</div>
+</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
@@ -22786,6 +22950,20 @@ Transfer-<span class="key">Encoding</span>: chunked
 ]</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">*/*</span><span class="delimiter">&quot;</span></span>
+            <span class="key">book</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.book+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">bookList</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">application/vnd.books.org.booklist+json</span><span class="delimiter">&quot;</span></span>
+            <span class="key">...</span>:</code></pre>
+</div>
+</div>
 <div class="admonitionblock warning">
 <table>
 <tr>
@@ -28901,6 +29079,19 @@ Although Grails plays it safe by default, that is no guarantee that your applica
 <pre class="CodeRay highlight"><code data-lang="groovy">foo.grails.views.gsp.codecs.expression = <span class="string"><span class="delimiter">&quot;</span><span class="content">none</span><span class="delimiter">&quot;</span></span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">foo</span>:
+    <span class="key">grails</span>:
+        <span class="key">views</span>:
+            <span class="key">gsp</span>:
+                <span class="key">codecs</span>:
+                    <span class="key">expression</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">none</span><span class="delimiter">&quot;</span></span></code></pre>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_per_page_encoding">Per Page Encoding</h4>
@@ -28970,6 +29161,18 @@ Although Grails plays it safe by default, that is no guarantee that your applica
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">views</span>:
+        <span class="key">gsp</span>:
+            <span class="key">filteringCodecForContentType</span>:
+                <span class="key">text/html</span>: <span class="string"><span class="content">'html'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Note that, if activated, the <code>staticparts</code> codec typically needs to be set to <code>raw</code> so that static markup is not encoded:</p>
 </div>
 <div class="listingblock">
@@ -28982,6 +29185,18 @@ Although Grails plays it safe by default, that is no guarantee that your applica
     }</code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">codecs</span>:
+    <span class="key">expression</span>: <span class="string"><span class="content">'html'</span></span>  <span class="comment"># escapes values inside ${}</span>
+    <span class="key">scriptlet</span>: <span class="string"><span class="content">'html'</span></span>   <span class="comment"># escapes output from scriptlets in GSPs</span>
+    <span class="key">taglib</span>: <span class="string"><span class="content">'none'</span></span>      <span class="comment"># escapes output from taglibs</span>
+    <span class="key">staticparts</span>: <span class="string"><span class="content">'raw'</span></span>  <span class="comment"># escapes output from static template parts</span></code></pre>
+</div>
+</div>
 </div>
 
 <a name="14.2 Encoding and Decoding Objects"><!-- Legacy link --></a>
@@ -29092,6 +29307,17 @@ Note that the HTML encoding does not re-encode apostrophe/single quote so you mu
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">views</span>:
+        <span class="key">gsp</span>:
+            <span class="key">htmlcodec</span>: <span class="string"><span class="content">'xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p><strong>XMLCodec</strong></p>
 </div>
 <div class="paragraph">
@@ -32052,6 +32278,16 @@ database.dbname=<span class="string"><span class="delimiter">&quot;</span><span
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">database</span>:
+    <span class="key">driver</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">com.mysql.jdbc.Driver</span><span class="delimiter">&quot;</span></span>
+    <span class="key">dbname</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">mysql:mydb</span><span class="delimiter">&quot;</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>You can then specify placeholders in <code>resources.xml</code> as follows using the familiar ${..} syntax:</p>
 </div>
 <div class="listingblock">
diff --git a/docs/snapshot/guide/spring.html b/docs/snapshot/guide/spring.html
index adf4ca5cffd..b0a2ee0fa6a 100644
--- a/docs/snapshot/guide/spring.html
+++ b/docs/snapshot/guide/spring.html
@@ -1049,6 +1049,16 @@ database.dbname=<span class="string"><span class="delimiter">&quot;</span><span
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">database</span>:
+    <span class="key">driver</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">com.mysql.jdbc.Driver</span><span class="delimiter">&quot;</span></span>
+    <span class="key">dbname</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">mysql:mydb</span><span class="delimiter">&quot;</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>You can then specify placeholders in <code>resources.xml</code> as follows using the familiar ${..} syntax:</p>
 </div>
 <div class="listingblock">
diff --git a/docs/snapshot/guide/theWebLayer.html b/docs/snapshot/guide/theWebLayer.html
index 3ab9e8623bc..f89ddd8b685 100644
--- a/docs/snapshot/guide/theWebLayer.html
+++ b/docs/snapshot/guide/theWebLayer.html
@@ -1446,6 +1446,19 @@ grails.databinding.trimStrings = <span class="predefined-constant">false</span>
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">trimStrings</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The mass property binding mechanism will by default automatically convert all empty Strings to null at binding time.  To disable this behavior set the <code>grails.databinding.convertEmptyStringsToNull</code> property to false in <code>grails-app/conf/application.groovy</code>.</p>
 </div>
 <div class="listingblock">
@@ -1457,6 +1470,19 @@ grails.databinding.convertEmptyStringsToNull = <span class="predefined-constant"
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">convertEmptyStringsToNull</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The order of events is that the String trimming happens and then null conversion happens so if <code>trimStrings</code> is <code>true</code> and <code>convertEmptyStringsToNull</code> is <code>true</code>, not only will empty Strings be converted to null but also blank Strings.  A blank String is any String such that the <code>trim()</code> method returns an empty String.</p>
 </div>
 <div class="admonitionblock warning">
@@ -1616,6 +1642,20 @@ grails.databinding.autoGrowCollectionLimit = <span class="integer">128</span>
 <span class="comment">// ...</span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="comment"># the default value is 256</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">autoGrowCollectionLimit</span>: <span class="string"><span class="content">128</span></span>
+
+<span class="comment"># ...</span></code></pre>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="_data_binding_with_multiple_domain_classes">Data binding with Multiple domain classes</h4>
@@ -1916,7 +1956,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="listingblock">
 <div class="title">grails-app/conf/application.groovy</div>
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'hh:mm:ss'Z'</span><span class="del [...]
+<pre class="CodeRay highlight"><code data-lang="groovy">grails.databinding.dateFormats = [<span class="string"><span class="delimiter">'</span><span class="content">MMddyyyy</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">'</span><span class="content">yyyy-MM-dd HH:mm:ss.S</span><span class="delimiter">'</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">yyyy-MM-dd'T'HH:mm:ss'Z'</span><span class="del [...]
 </div>
 </div>
 <div class="listingblock">
@@ -1924,7 +1964,7 @@ person.properties = [<span class="key">firstName</span>: <span class="string"><s
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
     <span class="key">databinding</span>:
-        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'hh:mm:ss'Z'&quot;]</span></span></code></pre>
+        <span class="key">dateFormats</span>: <span class="string"><span class="content">['MMddyyyy', 'yyyy-MM-dd HH:mm:ss.S', &quot;yyyy-MM-dd'T'HH:mm:ss'Z'&quot;]</span></span></code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -10140,6 +10180,18 @@ println name <span class="comment">// prints &quot;logo&quot; or &quot;other/log
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">web</span>:
+        <span class="key">url</span>:
+            <span class="key">converter</span>: <span class="string"><span class="content">'hyphenated'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Arbitrary strategies may be plugged in by providing a class which implements the <a href="../api/grails/web/UrlConverter.html">UrlConverter</a> interface and adding an instance of that class to the Spring application context with the bean name of <code>grails.web.UrlConverter.BEAN_NAME</code>.  If Grails finds a bean in the context with that name, it will be used as the default converter and there is no need to assign a value to the <code>grails.web.url.converter</code> config property.</p>
 </div>
 <div class="listingblock">
@@ -10736,6 +10788,16 @@ Specifying at least one mapping will disable the creation of the global mapping
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">beans</span>:
+  <span class="key">authInterceptor</span>:
+    <span class="key">order</span>: <span class="string"><span class="content">50</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>Thus giving you complete control over interceptor execution order.</p>
 </div>
 
@@ -10808,6 +10870,37 @@ Specifying at least one mapping will disable the creation of the global mapping
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">types</span>:
+            <span class="key">all</span>: <span class="string"><span class="content">'*/*'</span></span>  <span class="comment"># 'all' maps to '*' or the first available format in withFormat</span>
+            <span class="key">atom</span>: <span class="string"><span class="content">'application/atom+xml'</span></span>
+            <span class="key">css</span>: <span class="string"><span class="content">'text/css'</span></span>
+            <span class="key">csv</span>: <span class="string"><span class="content">'text/csv'</span></span>
+            <span class="key">form</span>: <span class="string"><span class="content">'application/x-www-form-urlencoded'</span></span>
+            <span class="key">html</span>:
+              - <span class="string"><span class="content">'text/html'</span></span>
+              - <span class="string"><span class="content">'application/xhtml+xml'</span></span>
+            <span class="key">js</span>: <span class="string"><span class="content">'text/javascript'</span></span>
+            <span class="key">json</span>:
+              - <span class="string"><span class="content">'application/json'</span></span>
+              - <span class="string"><span class="content">'text/json'</span></span>
+            <span class="key">multipartForm</span>: <span class="string"><span class="content">'multipart/form-data'</span></span>
+            <span class="key">rss</span>: <span class="string"><span class="content">'application/rss+xml'</span></span>
+            <span class="key">text</span>: <span class="string"><span class="content">'text/plain'</span></span>
+            <span class="key">hal</span>:
+              - <span class="string"><span class="content">'application/hal+json'</span></span>
+              - <span class="string"><span class="content">'application/hal+xml'</span></span>
+            <span class="key">xml</span>:
+              - <span class="string"><span class="content">'text/xml'</span></span>
+              - <span class="string"><span class="content">'application/xml'</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>The above bit of configuration allows Grails to detect to format of a request containing either the 'text/xml' or 'application/xml' media types as simply 'xml'. You can add your own types by simply adding new entries into the map.
 The first one is the default format.</p>
 </div>
@@ -10955,6 +11048,19 @@ When using <a href="../ref/Controllers/withFormat.html">withFormat</a> make sure
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">disable</span>:
+            <span class="key">accept</span>:
+                <span class="key">header</span>:
+                    <span class="key">userAgents</span>: <span class="string"><span class="content">['Gecko', 'WebKit', 'Presto', 'Trident']</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>For example, if it sees the accept header above ('application/json') it will set <code>format</code> to <code>json</code> as you&#8217;d expect. And of course this works with the <code>withFormat()</code> method in just the same way as when the <code>format</code> URL parameter is set (although the URL parameter takes precedence).</p>
 </div>
 <div class="paragraph">
diff --git a/docs/snapshot/ref/Constraints/nullable.html b/docs/snapshot/ref/Constraints/nullable.html
index fadf6b0d536..24f5c7e0964 100644
--- a/docs/snapshot/ref/Constraints/nullable.html
+++ b/docs/snapshot/ref/Constraints/nullable.html
@@ -219,6 +219,20 @@ grails.databinding.convertEmptyStringsToNull = <span class="predefined-constant"
 <span class="comment">// ...</span></code></pre>
 </div>
 </div>
+<div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">grails-app/conf/application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="error">// the default value for this property is true</span>
+<span class="key">grails</span>:
+    <span class="key">databinding</span>:
+        <span class="key">convertEmptyStringsToNull</span>: <span class="string"><span class="content">false</span></span>
+
+<span class="error">// ...</span></code></pre>
+</div>
+</div>
 </div>
 </div>
 </div>
diff --git a/docs/snapshot/ref/Controllers/withFormat.html b/docs/snapshot/ref/Controllers/withFormat.html
index 6b9cd000e51..202820b81ed 100644
--- a/docs/snapshot/ref/Controllers/withFormat.html
+++ b/docs/snapshot/ref/Controllers/withFormat.html
@@ -281,6 +281,23 @@ Grails ignores the HTTP Accept header unless you add a <code>grails.mime.use.acc
 </tr>
 </table>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="groovy">grails.mime.use.accept.header = <span class="predefined-constant">true</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">mime</span>:
+        <span class="key">use</span>:
+            <span class="key">accept</span>:
+                <span class="key">header</span>: <span class="string"><span class="content">true</span></span></code></pre>
+</div>
+</div>
 </div>
 </div>
 </div>
diff --git a/docs/snapshot/ref/Domain Classes/save.html b/docs/snapshot/ref/Domain Classes/save.html
index 7e6159fde98..3738e1ffcae 100644
--- a/docs/snapshot/ref/Domain Classes/save.html	
+++ b/docs/snapshot/ref/Domain Classes/save.html	
@@ -227,6 +227,25 @@ b.save()</code></pre>
 <li>
 <p><code>failOnError</code> (optional) - When set to <code>true</code> the <code>save</code> method with throw a <code>grails.validation.ValidationException</code> if <a href="../../guide/validation.html">validation</a> fails. This behavior may also be triggered by setting the <code>grails.gorm.failOnError</code> property in <code>grails-app/conf/application.groovy</code>. If the Config property is set and the argument is passed to the method, the method argument will always take precede [...]
 </li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="groovy">grails.gorm.failOnError = <span class="predefined-constant">true</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Or the equivalent in <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">grails</span>:
+    <span class="key">gorm</span>:
+        <span class="key">failOnError</span>: <span class="string"><span class="content">true</span></span></code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
 <li>
 <p><code>deepValidate</code> (optional) - Determines whether associations of the domain instance should also be validated, i.e. whether validation cascades. This is <code>true</code> by default - set to <code>false</code> to disable cascading validation.</p>
 </li>
diff --git a/docs/snapshot/ref/Plug-ins/dataSource.html b/docs/snapshot/ref/Plug-ins/dataSource.html
index 23c474eee90..f4d8316e035 100644
--- a/docs/snapshot/ref/Plug-ins/dataSource.html
+++ b/docs/snapshot/ref/Plug-ins/dataSource.html
@@ -197,6 +197,20 @@ Companies deploy assistants like this [](https://kapa.ai) on docs via [website w
 </div>
 </div>
 <div class="paragraph">
+<p>Or the equivalent in <code>grails-app/conf/application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yaml"><span class="key">dataSource</span>:
+    <span class="key">pooled</span>: <span class="string"><span class="content">true</span></span>
+    <span class="key">dbCreate</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">update</span><span class="delimiter">&quot;</span></span>
+    <span class="key">url</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">jdbc:mysql://localhost/yourDB</span><span class="delimiter">&quot;</span></span>
+    <span class="key">driverClassName</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">com.mysql.jdbc.Driver</span><span class="delimiter">&quot;</span></span>
+    <span class="key">username</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">yourUser</span><span class="delimiter">&quot;</span></span>
+    <span class="key">password</span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">yourPassword</span><span class="delimiter">&quot;</span></span></code></pre>
+</div>
+</div>
+<div class="paragraph">
 <p>A <code>DataSource</code> configured to look up via JNDI:</p>
 </div>
 <div class="listingblock">