Reworked docs for GRAILS-10789
Merge branch '2.3.x'