This is an automated email from the ASF dual-hosted git repository. jdaugherty pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/grails-spring-security.git
commit 02110a75d71cdc75574be6498267643aec7141a3 Merge: 0f83030b9 f62a67977 Author: James Daugherty <[email protected]> AuthorDate: Thu Mar 19 00:36:27 2026 -0400 Merge pull request #1211 from jdaugherty/doc-combination Doc Combination & Upgrade Guide docs/build.gradle | 213 ++++++++ docs/src/docs/index.adoc | 262 ++++++++++ docs/src/docs/index.tmpl | 568 +++++++++++++++++++++ docs/src/docs/introduction.adoc | 68 +++ .../src/docs/upgrading.adoc | 7 +- docs/src/docs/upgrading/upgrading7x.adoc | 128 +++++ docs/src/docs/whatsNew.adoc | 52 ++ gradle/docs-config.gradle | 128 ----- plugin-acl/docs/build.gradle | 40 +- plugin-acl/docs/src/docs/AclUtilService.adoc | 2 +- .../src/docs/AclUtilService/addPermission.adoc | 2 +- .../docs/src/docs/AclUtilService/changeOwner.adoc | 2 +- .../docs/src/docs/AclUtilService/deleteAcl.adoc | 2 +- .../src/docs/AclUtilService/deletePermission.adoc | 2 +- .../src/docs/AclUtilService/hasPermission.adoc | 2 +- .../docs/src/docs/AclUtilService/readAcl.adoc | 2 +- plugin-acl/docs/src/docs/Scripts.adoc | 2 +- .../src/docs/Scripts/s2-create-acl-domains.adoc | 2 +- plugin-acl/docs/src/docs/TagLibraries.adoc | 2 +- .../docs/src/docs/TagLibraries/notPermitted.adoc | 2 +- .../docs/src/docs/TagLibraries/permitted.adoc | 2 +- plugin-acl/docs/src/docs/history.adoc | 2 +- plugin-acl/docs/src/docs/history/authors.adoc | 2 +- plugin-acl/docs/src/docs/history/previouswork.adoc | 3 +- plugin-acl/docs/src/docs/installing.adoc | 2 +- .../docs/src/docs/installing/distribution.adoc | 2 +- plugin-acl/docs/src/docs/installing/snapshots.adoc | 2 +- plugin-acl/docs/src/docs/introduction.adoc | 4 +- plugin-acl/docs/src/docs/sampleApp.adoc | 2 +- plugin-acl/docs/src/docs/tutorial.adoc | 4 +- plugin-acl/docs/src/docs/usage.adoc | 2 +- plugin-acl/docs/src/docs/usage/acls.adoc | 2 +- plugin-acl/docs/src/docs/usage/configuration.adoc | 2 +- .../docs/src/docs/usage/customPermissions.adoc | 2 +- plugin-acl/docs/src/docs/usage/domainClasses.adoc | 4 +- plugin-acl/docs/src/docs/usage/runAs.adoc | 2 +- plugin-acl/docs/src/docs/usage/serviceMethods.adoc | 2 +- plugin-cas/docs/build.gradle | 43 +- plugin-cas/docs/src/docs/configuration.adoc | 2 +- plugin-cas/docs/src/docs/history.adoc | 1 + plugin-cas/docs/src/docs/introduction.adoc | 2 +- plugin-cas/docs/src/docs/usage.adoc | 2 +- plugin-core/docs/build.gradle | 46 +- plugin-core/docs/src/docs/authentication.adoc | 2 +- plugin-core/docs/src/docs/authentication/ajax.adoc | 2 +- .../docs/authentication/basicAndDigestAuth.adoc | 2 +- .../src/docs/authentication/rememberMeCookie.adoc | 4 +- plugin-core/docs/src/docs/authentication/x509.adoc | 2 +- .../docs/src/docs/authenticationProviders.adoc | 2 +- plugin-core/docs/src/docs/channelSecurity.adoc | 2 +- plugin-core/docs/src/docs/controllerMethods.adoc | 2 +- plugin-core/docs/src/docs/debugging.adoc | 2 +- .../docs/src/docs/domainClassProperties.adoc | 2 +- plugin-core/docs/src/docs/domainClasses.adoc | 6 +- .../src/docs/domainClasses/authorityClass.adoc | 2 +- .../authorityGroupAuthorityClass.adoc | 4 +- .../docs/domainClasses/authorityGroupClass.adoc | 8 +- .../docs/src/docs/domainClasses/gormAutowire.adoc | 2 +- .../docs/domainClasses/personAuthorityClass.adoc | 2 +- .../domainClasses/personAuthorityGroupClass.adoc | 4 +- .../docs/src/docs/domainClasses/personClass.adoc | 4 +- .../src/docs/domainClasses/requestmapClass.adoc | 4 +- plugin-core/docs/src/docs/events.adoc | 2 +- .../docs/src/docs/events/eventNotification.adoc | 2 +- .../docs/events/registeringCallbackClosures.adoc | 2 +- .../src/docs/events/registeringEventListener.adoc | 2 +- plugin-core/docs/src/docs/examples.adoc | 2 +- plugin-core/docs/src/docs/filters.adoc | 2 +- plugin-core/docs/src/docs/helperClasses.adoc | 2 +- .../src/docs/helperClasses/securityTagLib.adoc | 5 +- .../docs/helperClasses/springSecurityService.adoc | 4 +- .../docs/helperClasses/springSecurityUtils.adoc | 2 +- plugin-core/docs/src/docs/hierarchicalRoles.adoc | 4 +- plugin-core/docs/src/docs/i18n.adoc | 2 +- plugin-core/docs/src/docs/index.tmpl | 172 ------- plugin-core/docs/src/docs/introduction.adoc | 2 +- .../docs/src/docs/introduction/configGroovy.adoc | 2 +- .../docs/src/docs/introduction/gettingStarted.adoc | 2 +- .../docs/src/docs/introduction/installation.adoc | 4 +- plugin-core/docs/src/docs/ip.adoc | 2 +- plugin-core/docs/src/docs/logoutHandlers.adoc | 2 +- plugin-core/docs/src/docs/miscProperties.adoc | 16 +- plugin-core/docs/src/docs/passwords.adoc | 2 +- plugin-core/docs/src/docs/passwords/hashing.adoc | 2 +- plugin-core/docs/src/docs/passwords/locking.adoc | 4 +- plugin-core/docs/src/docs/passwords/salt.adoc | 4 +- plugin-core/docs/src/docs/requestMappings.adoc | 10 +- .../src/docs/requestMappings/configGroovyMap.adoc | 2 +- .../docs/src/docs/requestMappings/expressions.adoc | 4 +- .../docs/requestMappings/requestmapInstances.adoc | 6 +- .../docs/requestMappings/securedAnnotations.adoc | 2 +- plugin-core/docs/src/docs/scripts.adoc | 2 +- .../docs/scripts/s2-create-persistent-token.adoc | 2 +- .../scripts/s2-create-role-hierarchy-entry.adoc | 2 +- .../docs/src/docs/scripts/s2-quickstart.adoc | 2 +- plugin-core/docs/src/docs/sessionFixation.adoc | 2 +- plugin-core/docs/src/docs/switchUser.adoc | 2 +- plugin-core/docs/src/docs/tutorials.adoc | 2 +- .../docs/tutorials/usingControllerAnnotations.adoc | 8 +- plugin-core/docs/src/docs/urlProperties.adoc | 6 +- plugin-core/docs/src/docs/userDetailsService.adoc | 2 +- plugin-core/docs/src/docs/voters.adoc | 2 +- plugin-core/docs/src/docs/whatsNew.adoc | 2 +- plugin-ldap/docs/build.gradle | 78 +-- plugin-ldap/docs/src/docs/configuration.adoc | 2 +- plugin-ldap/docs/src/docs/introduction.adoc | 2 +- plugin-ldap/docs/src/docs/usage.adoc | 2 +- plugin-oauth2/docs/build.gradle | 44 +- plugin-oauth2/docs/src/docs/history.adoc | 1 + plugin-oauth2/docs/src/docs/introduction.adoc | 2 +- plugin-rest/docs/build.gradle | 42 +- plugin-rest/docs/src/docs/authentication.adoc | 10 +- plugin-rest/docs/src/docs/configuration.adoc | 5 +- plugin-rest/docs/src/docs/events.adoc | 11 +- plugin-rest/docs/src/docs/faq.adoc | 9 +- plugin-rest/docs/src/docs/introduction.adoc | 5 +- plugin-rest/docs/src/docs/oauth.adoc | 9 +- plugin-rest/docs/src/docs/tokenGeneration.adoc | 11 +- plugin-rest/docs/src/docs/tokenRendering.adoc | 3 +- plugin-rest/docs/src/docs/tokenStorage.adoc | 28 +- plugin-rest/docs/src/docs/tokenValidation.adoc | 7 +- plugin-rest/docs/src/docs/whatsNew14.adoc | 11 +- plugin-rest/docs/src/docs/whatsNew15.adoc | 9 +- plugin-rest/docs/src/docs/whatsNew20.adoc | 13 +- plugin-rest/docs/src/docs/whatsNew50.adoc | 9 +- plugin-rest/docs/src/docs/whatsNew60.adoc | 9 +- plugin-ui/docs/build.gradle | 43 +- plugin-ui/docs/src/docs/acls.adoc | 2 +- plugin-ui/docs/src/docs/acls/aclClass.adoc | 4 +- plugin-ui/docs/src/docs/acls/aclEntry.adoc | 4 +- .../docs/src/docs/acls/aclObjectIdentity.adoc | 4 +- plugin-ui/docs/src/docs/acls/aclSid.adoc | 4 +- plugin-ui/docs/src/docs/configUI.adoc | 2 +- plugin-ui/docs/src/docs/customization.adoc | 6 +- plugin-ui/docs/src/docs/forgotPassword.adoc | 6 +- plugin-ui/docs/src/docs/introduction.adoc | 2 +- plugin-ui/docs/src/docs/persistentCookie.adoc | 4 +- plugin-ui/docs/src/docs/requestmap.adoc | 4 +- plugin-ui/docs/src/docs/role.adoc | 4 +- plugin-ui/docs/src/docs/scripts.adoc | 2 +- .../scripts/s2ui-create-challenge-questions.adoc | 2 +- plugin-ui/docs/src/docs/scripts/s2ui-override.adoc | 4 +- plugin-ui/docs/src/docs/user.adoc | 4 +- plugin-ui/docs/src/docs/userRegistration.adoc | 8 +- settings.gradle | 3 + 145 files changed, 1621 insertions(+), 799 deletions(-)
