You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/06/02 16:48:27 UTC

[isis] 13/47: ISIS-2062: reorg pages for rgcms

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

danhaywood pushed a commit to branch ISIS-2062-antora
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 94edd1e4fd88bebf36efb54cd11afd02507b7f37
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jun 2 10:22:23 2019 +0100

    ISIS-2062: reorg pages for rgcms
---
 antora/components/rg/modules/cms/nav.adoc          | 124 ++++++++++++++++++++-
 .../cms/pages/_partials/_rgcms_classes.adoc        |  24 ----
 .../pages/_partials/_rgcms_classes_utility.adoc    |  14 ---
 .../rg/modules/{cfg => cms}/pages/_partials/x.sh   |   2 +-
 ...gcms_methods_prefixes_set.adoc => classes.adoc} |   5 +-
 .../AppManifest-bootstrapping.adoc}                |   0
 .../AppManifest2-bootstrapping.adoc}               |   0
 .../rg/modules/cms/pages/classes/_attributes.adoc  |   4 +
 .../contributee.adoc}                              |   2 -
 .../contributee/HasTransactionId.adoc}             |   0
 .../contributee/HasUserName.adoc}                  |   0
 .../domainevent.adoc}                              |   4 -
 .../domainevent/AbstractDomainEvent.adoc}          |   0
 .../domainevent/ActionDomainEvent.adoc}            |   0
 .../domainevent/CollectionDomainEvent.adoc}        |   0
 .../domainevent/PropertyDomainEvent.adoc}          |   0
 .../_rgcms_classes_i18n.adoc => classes/i18n.adoc} |   1 -
 .../i18n/TranslatableString.adoc}                  |   0
 .../layout.adoc}                                   |   0
 .../lifecycleevent.adoc}                           |   8 --
 .../lifecycleevent/AbstractLifecycleEvent.adoc}    |   0
 .../lifecycleevent/ObjectCreatedEvent.adoc}        |   0
 .../lifecycleevent/ObjectLoadedEvent.adoc}         |   0
 .../lifecycleevent/ObjectPersistedEvent.adoc}      |   0
 .../lifecycleevent/ObjectPersistingEvent.adoc}     |   0
 .../lifecycleevent/ObjectRemovingEvent.adoc}       |   0
 .../lifecycleevent/ObjectUpdatedEvent.adoc}        |   0
 .../lifecycleevent/ObjectUpdatingEvent.adoc}       |   0
 .../menubars.adoc}                                 |   0
 .../mixins.adoc}                                   |   3 -
 .../mixins/Dto.adoc}                               |   0
 .../mixins/Object.adoc}                            |   0
 .../mixins/Persistable.adoc}                       |   0
 .../roles.adoc}                                    |   3 -
 .../roles/HoldsUpdatedAt.adoc}                     |   0
 .../roles/HoldsUpdatedBy.adoc}                     |   0
 .../roles/Timestampable.adoc}                      |   0
 .../_rgcms_classes_spec.adoc => classes/spec.adoc} |   0
 .../super.adoc}                                    |   5 -
 .../super/AbstractService.adoc}                    |   0
 .../super/AbstractSubscriber.adoc}                 |   0
 .../super/AbstractViewModel.adoc}                  |   0
 .../super/FixtureScript.adoc}                      |   0
 .../super/FixtureScripts.adoc}                     |   0
 .../uievent.adoc}                                  |   3 -
 .../uievent/CssClassUiEvent.adoc}                  |   0
 .../uievent/IconUiEvent.adoc}                      |   0
 .../uievent/TitleUiEvent.adoc}                     |   0
 .../utility.adoc}                                  |   8 +-
 .../utility/Enums.adoc}                            |   0
 .../utility/ObjectContracts.adoc}                  |   0
 .../utility/Reasons.adoc}                          |   0
 .../utility/TitleBuffer.adoc}                      |   0
 .../value-types.adoc}                              |   6 -
 .../value-types/Blob.adoc}                         |   0
 .../value-types/Clob.adoc}                         |   0
 .../value-types/Color.adoc}                        |   0
 .../value-types/Markup.adoc}                       |   0
 .../value-types/Money.adoc}                        |   0
 .../value-types/Password.adoc}                     |   0
 .../_rgcms_methods.adoc => methods.adoc}           |   3 -
 .../rg/modules/cms/pages/methods/_attributes.adoc  |   4 +
 .../lifecycle.adoc}                                |  10 --
 .../cms/pages/methods/lifecycle/_attributes.adoc   |   4 +
 .../lifecycle/created.adoc}                        |   0
 .../lifecycle/jdo-api.adoc}                        |   0
 .../lifecycle/loaded.adoc}                         |   0
 .../lifecycle/persisted.adoc}                      |   0
 .../lifecycle/persisting.adoc}                     |   0
 .../lifecycle/removed.adoc}                        |   0
 .../lifecycle/removing.adoc}                       |   0
 .../lifecycle/updated.adoc}                        |   0
 .../lifecycle/updating.adoc}                       |   0
 .../prefixes.adoc}                                 |  14 ---
 .../cms/pages/methods/prefixes/_attributes.adoc    |   4 +
 .../prefixes/addTo.adoc}                           |   0
 .../prefixes/autoComplete.adoc}                    |   0
 .../prefixes/choices.adoc}                         |   0
 .../prefixes/clear.adoc}                           |   0
 .../prefixes/default.adoc}                         |   0
 .../prefixes/disable.adoc}                         |   0
 .../prefixes/get.adoc}                             |   0
 .../prefixes/hide.adoc}                            |   0
 .../prefixes/modify.adoc}                          |   0
 .../prefixes/removeFrom.adoc}                      |   0
 .../prefixes/set.adoc}                             |   0
 .../prefixes/validate.adoc}                        |   0
 .../prefixes/validateAddTo.adoc}                   |   0
 .../prefixes/validateRemoveFrom.adoc}              |   0
 .../reserved.adoc}                                 |   7 --
 .../cms/pages/methods/reserved/_attributes.adoc    |   4 +
 .../reserved/cssClass.adoc}                        |   0
 .../reserved/disable.adoc}                         |   0
 .../reserved/getId.adoc}                           |   0
 .../reserved/hide.adoc}                            |   0
 .../reserved/iconName.adoc}                        |   0
 .../reserved/layout.adoc}                          |   0
 .../reserved/title.adoc}                           |   0
 .../reserved/validate.adoc}                        |   0
 antora/components/rg/modules/cms/pages/rgcms.adoc  |   3 -
 .../_rgcms_schema-aim.adoc => schema-aim.adoc}     |   0
 .../_rgcms_schema-chg.adoc => schema-chg.adoc}     |   0
 .../_rgcms_schema-cmd.adoc => schema-cmd.adoc}     |   0
 ...rgcms_schema-common.adoc => schema-common.adoc} |   0
 .../_rgcms_schema-ixn.adoc => schema-ixn.adoc}     |   0
 .../_rgcms_schema-mml.adoc => schema-mml.adoc}     |   0
 .../{_partials/_rgcms_schema.adoc => schema.adoc}  |   0
 107 files changed, 149 insertions(+), 120 deletions(-)

diff --git a/antora/components/rg/modules/cms/nav.adoc b/antora/components/rg/modules/cms/nav.adoc
index 60c71ee..73c7fb6 100644
--- a/antora/components/rg/modules/cms/nav.adoc
+++ b/antora/components/rg/modules/cms/nav.adoc
@@ -1,5 +1,127 @@
 * Classes, Methods & Schema
 
 ** xref:about.adoc[About]
-** xref:rgcms.adoc[Guide]
+
+
+
+
+
+** xref:methods.adoc[Methods]
+
+*** xref:methods/prefixes.adoc[Prefixes]
+**** xref:methods/prefixes/addTo.adoc[addTo]
+**** xref:methods/prefixes/autoComplete.adoc[autoComplete]
+**** xref:methods/prefixes/choices.adoc[choices]
+**** xref:methods/prefixes/clear.adoc[clear]
+**** xref:methods/prefixes/default.adoc[default]
+**** xref:methods/prefixes/disable.adoc[disable]
+**** xref:methods/prefixes/get.adoc[get]
+**** xref:methods/prefixes/hide.adoc[hide]
+**** xref:methods/prefixes/modify.adoc[modify]
+**** xref:methods/prefixes/removeFrom.adoc[removeFrom]
+**** xref:methods/prefixes/set.adoc[set]
+**** xref:methods/prefixes/validate.adoc[validate]
+**** xref:methods/prefixes/validateAddTo.adoc[validateAddTo]
+**** xref:methods/prefixes/validateRemoveFrom.adoc[validateRemoveFrom]
+
+*** xref:methods/reserved.adoc[Reserved]
+**** xref:methods/reserved/cssClass.adoc[cssClass]
+**** xref:methods/reserved/disable.adoc[disable]
+**** xref:methods/reserved/getId.adoc[getId]
+**** xref:methods/reserved/hide.adoc[hide]
+**** xref:methods/reserved/iconName.adoc[iconName]
+**** xref:methods/reserved/title.adoc[title]
+**** xref:methods/reserved/validate.adoc[validate]
+
+*** xref:methods/lifecycle.adoc[Lifecycle]
+**** xref:methods/lifecycle/created.adoc[created]
+**** xref:methods/lifecycle/loaded.adoc[loaded]
+**** xref:methods/lifecycle/persisted.adoc[persisted]
+**** xref:methods/lifecycle/persisting.adoc[persisting]
+**** xref:methods/lifecycle/removed.adoc[removed]
+**** xref:methods/lifecycle/removing.adoc[removing]
+**** xref:methods/lifecycle/updated.adoc[updated]
+**** xref:methods/lifecycle/updating.adoc[updating]
+**** xref:methods/lifecycle/jdo-api.adoc[JDO API]
+
+
+
+
+
+** xref:classes.adoc[Classes]
+
+*** xref:classes/AppManifest-bootstrapping.adoc[AppManifest Bootstrapping]
+
+*** xref:classes/super.adoc[Super Classes]
+**** xref:classes/super/AbstractService.adoc[AbstractService]
+**** xref:classes/super/AbstractSubscriber.adoc[AbstractSubscriber]
+**** xref:classes/super/AbstractViewModel.adoc[AbstractViewModel]
+**** xref:classes/super/FixtureScript.adoc[FixtureScript]
+**** xref:classes/super/FixtureScripts.adoc[FixtureScripts]
+
+*** xref:classes/domainevent.adoc[Domain Event Classes]
+**** xref:classes/domainevent/AbstractDomainEvent.adoc[AbstractDomainEvent]
+**** xref:classes/domainevent/ActionDomainEvent.adoc[ActionDomainEvent]
+**** xref:classes/domainevent/CollectionDomainEvent.adoc[CollectionDomainEvent]
+**** xref:classes/domainevent/PropertyDomainEvent.adoc[PropertyDomainEvent]
+
+*** xref:classes/uievent.adoc[UI Event Classes]
+**** xref:classes/uievent/TitleUiEvent.adoc[TitleUiEvent]
+**** xref:classes/uievent/IconUiEvent.adoc[IconUiEvent]
+**** xref:classes/uievent/CssClassUiEvent.adoc[CssClassUiEvent]
+
+*** xref:classes/lifecycleevent.adoc[Lifecycle Event Classes]
+**** xref:classes/lifecycleevent/AbstractLifecycleEvent.adoc[AbstractLifecycleEvent]
+**** xref:classes/lifecycleevent/ObjectCreatedEvent.adoc[ObjectCreatedEvent]
+**** xref:classes/lifecycleevent/ObjectLoadedEvent.adoc[ObjectLoadedEvent]
+**** xref:classes/lifecycleevent/ObjectPersistedEvent.adoc[ObjectPersistedEvent]
+**** xref:classes/lifecycleevent/ObjectPersistingEvent.adoc[ObjectPersistingEvent]
+**** xref:classes/lifecycleevent/ObjectRemovingEvent.adoc[ObjectRemovingEvent]
+**** xref:classes/lifecycleevent/ObjectUpdatedEvent.adoc[ObjectUpdatedEvent]
+**** xref:classes/lifecycleevent/ObjectUpdatingEvent.adoc[ObjectUpdatingEvent]
+
+*** xref:classes/value-types.adoc[Value Types]
+**** xref:classes/value-types/Blob.adoc[Blob]
+**** xref:classes/value-types/Clob.adoc[Clob]
+//**** xref:classes/value-types/Color.adoc[Color]   // not properly supported
+**** xref:classes/value-types/Markup.adoc[Markup]
+//**** xref:classes/value-types/Money.adoc[Money]   // not properly supported
+//**** xref:classes/value-types/Password.adoc[Password]    // not properly supported
+
+*** xref:classes/utility.adoc[Utility Classes]
+**** xref:classes/utility/Enums.adoc[Enums]
+**** xref:classes/utility/ObjectContracts.adoc[ObjectContracts]
+**** xref:classes/utility/Reasons.adoc[Reasons]
+**** xref:classes/utility/TitleBuffer.adoc[TitleBuffer]
+
+
+*** xref:classes/spec.adoc[Specification Classes]
+
+*** xref:classes/i18n.adoc[i18n Classes]
+**** xref:classes/i18n/TranslatableString.adoc[TranslatableString]
+
+*** xref:classes/contributee.adoc[Contributee]
+**** xref:classes/contributee/HasTransactionId.adoc[HasTransactionId]
+**** xref:classes/contributee/HasUserName.adoc[HasUserName]
+
+
+*** xref:classes/roles.adoc[Roles]
+**** xref:classes/roles/HoldsUpdatedAt.adoc[HoldsUpdatedAt]
+**** xref:classes/roles/HoldsUpdatedBy.adoc[HoldsUpdatedBy]
+**** xref:classes/roles/Timestampable.adoc[Timestampable]
+
+*** xref:classes/mixins.adoc[Mixins]
+**** xref:classes/mixins/Object.adoc[Object]
+**** xref:classes/mixins/Dto.adoc[Dto]
+**** xref:classes/mixins/Persistable.adoc[Persistable]
+
+
+*** xref:classes/layout.adoc[(Object) Layout]
+*** xref:classes/menubars.adoc[Menubars]
+
+
+
+** xref:schema.adoc[Schema]
+
+
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes.adoc b/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes.adoc
deleted file mode 100644
index d3d8f4b..0000000
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-= Classes and Interfaces
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::_attributes.adoc[]
-
-
-This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rg:svc:rgsvc.adoc#[domain services], xref:ug:vw:ugvw.adoc#_ugvw_layout[object layout] or xref:rg:cfg:rgcfg.adoc#_rgcfg[configuration].
-
-
-include::partial$_rgcms_classes_AppManifest-bootstrapping.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_super.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_domainevent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_uievent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_value-types.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_utility.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_spec.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_i18n.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_contributee.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_roles.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_mixins.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_layout.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_menubars.adoc[leveloffset=+1]
-
-
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility.adoc b/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility.adoc
deleted file mode 100644
index c7e298f..0000000
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= Applib Utility Classes
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::_attributes.adoc[]
-
-The `org.apache.isis.applib.util` package has a number of simple utility
-classes designed to simplify the coding of some common tasks.
-
-
-include::partial$_rgcms_classes_utility_Enums.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_utility_ObjectContracts.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_utility_Reasons.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_utility_TitleBuffer.adoc[leveloffset=+1]
-
-
diff --git a/antora/components/rg/modules/cfg/pages/_partials/x.sh b/antora/components/rg/modules/cms/pages/_partials/x.sh
similarity index 82%
rename from antora/components/rg/modules/cfg/pages/_partials/x.sh
rename to antora/components/rg/modules/cms/pages/_partials/x.sh
index d142905..72820d1 100644
--- a/antora/components/rg/modules/cfg/pages/_partials/x.sh
+++ b/antora/components/rg/modules/cms/pages/_partials/x.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-for a in `ls | grep _rgcfg`
+for a in `ls | grep _rgcms`
 do
 	b=$(echo $a | cut -c8- | sed 's|_|/|g')
 	d=$(dirname $b)
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_set.adoc b/antora/components/rg/modules/cms/pages/classes.adoc
similarity index 74%
copy from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_set.adoc
copy to antora/components/rg/modules/cms/pages/classes.adoc
index 4b543e3..a3cb09c 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_set.adoc
+++ b/antora/components/rg/modules/cms/pages/classes.adoc
@@ -1,11 +1,10 @@
-= `set...()`
+= Classes and Interfaces
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 include::_attributes.adoc[]
 
 
+This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rg:svc:rgsvc.adoc#[domain services], xref:ug:vw:ugvw.adoc#_ugvw_layout[object layout] or xref:rg:cfg:rgcfg.adoc#_rgcfg[configuration].
 
 
-The `set...()` prefix is simply the normal JavaBean setter prefix that denotes writeable properties or collections.
 
 
-See also xref:rg:cms:rgcms.adoc#_rgcms_methods_prefixes_get[`get...()`].
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest-bootstrapping.adoc b/antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest-bootstrapping.adoc
rename to antora/components/rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest2-bootstrapping.adoc b/antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest2-bootstrapping.adoc
rename to antora/components/rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
diff --git a/antora/components/rg/modules/cms/pages/classes/_attributes.adoc b/antora/components/rg/modules/cms/pages/classes/_attributes.adoc
new file mode 100644
index 0000000..d011536
--- /dev/null
+++ b/antora/components/rg/modules/cms/pages/classes/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ../..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_contributee.adoc b/antora/components/rg/modules/cms/pages/classes/contributee.adoc
similarity index 86%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_contributee.adoc
rename to antora/components/rg/modules/cms/pages/classes/contributee.adoc
index 8b26ef1..18cfe1e 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_contributee.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/contributee.adoc
@@ -6,6 +6,4 @@ include::_attributes.adoc[]
 The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces.
 
 
-include::partial$_rgcms_classes_contributee_HasTransactionId.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_contributee_HasUserName.adoc[leveloffset=+1]
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_contributee_HasTransactionId.adoc b/antora/components/rg/modules/cms/pages/classes/contributee/HasTransactionId.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_contributee_HasTransactionId.adoc
rename to antora/components/rg/modules/cms/pages/classes/contributee/HasTransactionId.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_contributee_HasUserName.adoc b/antora/components/rg/modules/cms/pages/classes/contributee/HasUserName.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_contributee_HasUserName.adoc
rename to antora/components/rg/modules/cms/pages/classes/contributee/HasUserName.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent.adoc b/antora/components/rg/modules/cms/pages/classes/domainevent.adoc
similarity index 89%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent.adoc
rename to antora/components/rg/modules/cms/pages/classes/domainevent.adoc
index 9fc5eb0..862d246 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/domainevent.adoc
@@ -67,8 +67,4 @@ is specified.
 
 
 
-include::partial$_rgcms_classes_domainevent_AbstractDomainEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_domainevent_ActionDomainEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_domainevent_CollectionDomainEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_domainevent_PropertyDomainEvent.adoc[leveloffset=+1]
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_AbstractDomainEvent.adoc b/antora/components/rg/modules/cms/pages/classes/domainevent/AbstractDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_AbstractDomainEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/domainevent/AbstractDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_ActionDomainEvent.adoc b/antora/components/rg/modules/cms/pages/classes/domainevent/ActionDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_ActionDomainEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/domainevent/ActionDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_CollectionDomainEvent.adoc b/antora/components/rg/modules/cms/pages/classes/domainevent/CollectionDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_CollectionDomainEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/domainevent/CollectionDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_PropertyDomainEvent.adoc b/antora/components/rg/modules/cms/pages/classes/domainevent/PropertyDomainEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_domainevent_PropertyDomainEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/domainevent/PropertyDomainEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n.adoc b/antora/components/rg/modules/cms/pages/classes/i18n.adoc
similarity index 92%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n.adoc
rename to antora/components/rg/modules/cms/pages/classes/i18n.adoc
index 37c45ae..f5d24ea 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/i18n.adoc
@@ -6,4 +6,3 @@ include::_attributes.adoc[]
 The `org.apache.isis.applib.services.i18n` package contains a single class to support i18n.
 
 
-include::partial$_rgcms_classes_i18n_TranslatableString.adoc[leveloffset=+1]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n_TranslatableString.adoc b/antora/components/rg/modules/cms/pages/classes/i18n/TranslatableString.adoc
similarity index 100%
copy from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n_TranslatableString.adoc
copy to antora/components/rg/modules/cms/pages/classes/i18n/TranslatableString.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_layout.adoc b/antora/components/rg/modules/cms/pages/classes/layout.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_layout.adoc
rename to antora/components/rg/modules/cms/pages/classes/layout.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent.adoc
similarity index 87%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent.adoc
index 41a0be0..812395c 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/lifecycleevent.adoc
@@ -109,12 +109,4 @@ This is done either explicitly when the current transaction is flushed using the
 
 
 
-include::partial$_rgcms_classes_lifecycleevent_AbstractLifecycleEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent_ObjectCreatedEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent_ObjectLoadedEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent_ObjectPersistedEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent_ObjectPersistingEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent_ObjectRemovingEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent_ObjectUpdatedEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_lifecycleevent_ObjectUpdatingEvent.adoc[leveloffset=+1]
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_AbstractLifecycleEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_AbstractLifecycleEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectCreatedEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectCreatedEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectLoadedEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectLoadedEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectPersistedEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectPersistedEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectPersistingEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectPersistingEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectRemovingEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectRemovingEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectUpdatedEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectUpdatedEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectUpdatingEvent.adoc b/antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_lifecycleevent_ObjectUpdatingEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_menubars.adoc b/antora/components/rg/modules/cms/pages/classes/menubars.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_menubars.adoc
rename to antora/components/rg/modules/cms/pages/classes/menubars.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins.adoc b/antora/components/rg/modules/cms/pages/classes/mixins.adoc
similarity index 83%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins.adoc
rename to antora/components/rg/modules/cms/pages/classes/mixins.adoc
index af1a04c..705491d 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/mixins.adoc
@@ -11,8 +11,5 @@ See the xref:ug:fun:ugfun.adoc#_ugfun_building-blocks_types-of-domain-objects_mi
 ====
 
 
-include::partial$_rgcms_classes_mixins_Object.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_mixins_Dto.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_mixins_Persistable.adoc[leveloffset=+1]
 
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins_Dto.adoc b/antora/components/rg/modules/cms/pages/classes/mixins/Dto.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins_Dto.adoc
rename to antora/components/rg/modules/cms/pages/classes/mixins/Dto.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins_Object.adoc b/antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins_Object.adoc
rename to antora/components/rg/modules/cms/pages/classes/mixins/Object.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins_Persistable.adoc b/antora/components/rg/modules/cms/pages/classes/mixins/Persistable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_mixins_Persistable.adoc
rename to antora/components/rg/modules/cms/pages/classes/mixins/Persistable.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles.adoc b/antora/components/rg/modules/cms/pages/classes/roles.adoc
similarity index 81%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles.adoc
rename to antora/components/rg/modules/cms/pages/classes/roles.adoc
index 5f707e8..5207d28 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/roles.adoc
@@ -6,8 +6,5 @@ include::_attributes.adoc[]
 The interfaces listed in this chapter are role interfaces; they define a contract for the framework to interact with those domain objects that implement these interfaces.
 
 
-include::partial$_rgcms_classes_roles_HoldsUpdatedAt.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_roles_HoldsUpdatedBy.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_roles_Timestampable.adoc[leveloffset=+1]
 
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles_HoldsUpdatedAt.adoc b/antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles_HoldsUpdatedAt.adoc
rename to antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedAt.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles_HoldsUpdatedBy.adoc b/antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles_HoldsUpdatedBy.adoc
rename to antora/components/rg/modules/cms/pages/classes/roles/HoldsUpdatedBy.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles_Timestampable.adoc b/antora/components/rg/modules/cms/pages/classes/roles/Timestampable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_roles_Timestampable.adoc
rename to antora/components/rg/modules/cms/pages/classes/roles/Timestampable.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_spec.adoc b/antora/components/rg/modules/cms/pages/classes/spec.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_spec.adoc
rename to antora/components/rg/modules/cms/pages/classes/spec.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super.adoc b/antora/components/rg/modules/cms/pages/classes/super.adoc
similarity index 85%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super.adoc
rename to antora/components/rg/modules/cms/pages/classes/super.adoc
index 548e9ae..1d574f9 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/super.adoc
@@ -68,10 +68,5 @@ Impl'n (g: a:)
 
 
 
-include::partial$_rgcms_classes_super_AbstractService.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_super_AbstractSubscriber.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_super_AbstractViewModel.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_super_FixtureScript.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_super_FixtureScripts.adoc[leveloffset=+1]
 
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_AbstractService.adoc b/antora/components/rg/modules/cms/pages/classes/super/AbstractService.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_AbstractService.adoc
rename to antora/components/rg/modules/cms/pages/classes/super/AbstractService.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_AbstractSubscriber.adoc b/antora/components/rg/modules/cms/pages/classes/super/AbstractSubscriber.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_AbstractSubscriber.adoc
rename to antora/components/rg/modules/cms/pages/classes/super/AbstractSubscriber.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_AbstractViewModel.adoc b/antora/components/rg/modules/cms/pages/classes/super/AbstractViewModel.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_AbstractViewModel.adoc
rename to antora/components/rg/modules/cms/pages/classes/super/AbstractViewModel.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_FixtureScript.adoc b/antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_FixtureScript.adoc
rename to antora/components/rg/modules/cms/pages/classes/super/FixtureScript.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_FixtureScripts.adoc b/antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_super_FixtureScripts.adoc
rename to antora/components/rg/modules/cms/pages/classes/super/FixtureScripts.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent.adoc b/antora/components/rg/modules/cms/pages/classes/uievent.adoc
similarity index 93%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent.adoc
rename to antora/components/rg/modules/cms/pages/classes/uievent.adoc
index 4c8a9a4..27b9830 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/uievent.adoc
@@ -54,7 +54,4 @@ will take precedence.
 
 
 
-include::partial$_rgcms_classes_uievent_TitleUiEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_uievent_IconUiEvent.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_uievent_CssClassUiEvent.adoc[leveloffset=+1]
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent_CssClassUiEvent.adoc b/antora/components/rg/modules/cms/pages/classes/uievent/CssClassUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent_CssClassUiEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/uievent/CssClassUiEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent_IconUiEvent.adoc b/antora/components/rg/modules/cms/pages/classes/uievent/IconUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent_IconUiEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/uievent/IconUiEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent_TitleUiEvent.adoc b/antora/components/rg/modules/cms/pages/classes/uievent/TitleUiEvent.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_uievent_TitleUiEvent.adoc
rename to antora/components/rg/modules/cms/pages/classes/uievent/TitleUiEvent.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n_TranslatableString.adoc b/antora/components/rg/modules/cms/pages/classes/utility.adoc
similarity index 83%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n_TranslatableString.adoc
rename to antora/components/rg/modules/cms/pages/classes/utility.adoc
index 27d0afa..61a44e5 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_i18n_TranslatableString.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/utility.adoc
@@ -1,11 +1,9 @@
-= `TranslatableString`
+= Applib Utility Classes
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 include::_attributes.adoc[]
 
-
-IMPORTANT: FIXME - see xref:ug:btb:ugbtb.adoc#_ugbtb_i18n[user guide, i18n].
-
-The `TranslatableString` utility class ...
+The `org.apache.isis.applib.util` package has a number of simple utility
+classes designed to simplify the coding of some common tasks.
 
 
 
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_Enums.adoc b/antora/components/rg/modules/cms/pages/classes/utility/Enums.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_Enums.adoc
rename to antora/components/rg/modules/cms/pages/classes/utility/Enums.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_ObjectContracts.adoc b/antora/components/rg/modules/cms/pages/classes/utility/ObjectContracts.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_ObjectContracts.adoc
rename to antora/components/rg/modules/cms/pages/classes/utility/ObjectContracts.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_Reasons.adoc b/antora/components/rg/modules/cms/pages/classes/utility/Reasons.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_Reasons.adoc
rename to antora/components/rg/modules/cms/pages/classes/utility/Reasons.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_TitleBuffer.adoc b/antora/components/rg/modules/cms/pages/classes/utility/TitleBuffer.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_utility_TitleBuffer.adoc
rename to antora/components/rg/modules/cms/pages/classes/utility/TitleBuffer.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types.adoc b/antora/components/rg/modules/cms/pages/classes/value-types.adoc
similarity index 83%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types.adoc
rename to antora/components/rg/modules/cms/pages/classes/value-types.adoc
index f3d97eb..361ecdc 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types.adoc
+++ b/antora/components/rg/modules/cms/pages/classes/value-types.adoc
@@ -62,9 +62,3 @@ A simple wrapper around a string, but never shown in plain-text.
 
 
 
-include::partial$_rgcms_classes_value-types_Blob.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_value-types_Clob.adoc[leveloffset=+1]
-//include::partial$_rgcms_classes_value-types_Color.adoc[leveloffset=+1]
-include::partial$_rgcms_classes_value-types_Markup.adoc[leveloffset=+1]
-//include::partial$_rgcms_classes_value-types_Money.adoc[leveloffset=+1]
-//include::partial$_rgcms_classes_value-types_Password.adoc[leveloffset=+1]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Blob.adoc b/antora/components/rg/modules/cms/pages/classes/value-types/Blob.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Blob.adoc
rename to antora/components/rg/modules/cms/pages/classes/value-types/Blob.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Clob.adoc b/antora/components/rg/modules/cms/pages/classes/value-types/Clob.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Clob.adoc
rename to antora/components/rg/modules/cms/pages/classes/value-types/Clob.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Color.adoc b/antora/components/rg/modules/cms/pages/classes/value-types/Color.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Color.adoc
rename to antora/components/rg/modules/cms/pages/classes/value-types/Color.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Markup.adoc b/antora/components/rg/modules/cms/pages/classes/value-types/Markup.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Markup.adoc
rename to antora/components/rg/modules/cms/pages/classes/value-types/Markup.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Money.adoc b/antora/components/rg/modules/cms/pages/classes/value-types/Money.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Money.adoc
rename to antora/components/rg/modules/cms/pages/classes/value-types/Money.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Password.adoc b/antora/components/rg/modules/cms/pages/classes/value-types/Password.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_value-types_Password.adoc
rename to antora/components/rg/modules/cms/pages/classes/value-types/Password.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods.adoc b/antora/components/rg/modules/cms/pages/methods.adoc
similarity index 86%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods.adoc
rename to antora/components/rg/modules/cms/pages/methods.adoc
index 1ff216a..b71ff7b 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods.adoc
+++ b/antora/components/rg/modules/cms/pages/methods.adoc
@@ -9,7 +9,4 @@ The Apache Isis metamodel is built up from declaratively (ie, xref:rg:ant:rgant.
 This chapter documents the supporting methods and the reserved methods.  It also documents (separately) the reserved methods that act as callback hooks into the persistence lifecycle of domain entities.
 
 
-include::partial$_rgcms_methods_prefixes.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_reserved.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle.adoc[leveloffset=+1]
 
diff --git a/antora/components/rg/modules/cms/pages/methods/_attributes.adoc b/antora/components/rg/modules/cms/pages/methods/_attributes.adoc
new file mode 100644
index 0000000..d011536
--- /dev/null
+++ b/antora/components/rg/modules/cms/pages/methods/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ../..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle.adoc
similarity index 81%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle.adoc
index 187cf33..35ec37a 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/lifecycle.adoc
@@ -52,13 +52,3 @@ The lifecycle callback methods supported by Apache Isis are:
 
 
 
-include::partial$_rgcms_methods_lifecycle_created.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle_loaded.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle_persisted.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle_persisting.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle_removed.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle_removing.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle_updated.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_lifecycle_updating.adoc[leveloffset=+1]
-
-include::partial$_rgcms_methods_lifecycle_jdo-api.adoc[leveloffset=+1]
diff --git a/antora/components/rg/modules/cms/pages/methods/lifecycle/_attributes.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/_attributes.adoc
new file mode 100644
index 0000000..ee19aa2
--- /dev/null
+++ b/antora/components/rg/modules/cms/pages/methods/lifecycle/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ../../..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_created.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/created.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_created.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/created.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_jdo-api.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/jdo-api.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_jdo-api.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/jdo-api.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_loaded.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/loaded.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_loaded.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/loaded.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_persisted.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/persisted.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_persisted.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/persisted.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_persisting.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/persisting.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_persisting.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/persisting.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_removed.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/removed.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_removed.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/removed.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_removing.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/removing.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_removing.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/removing.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_updated.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/updated.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_updated.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/updated.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_updating.adoc b/antora/components/rg/modules/cms/pages/methods/lifecycle/updating.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_lifecycle_updating.adoc
rename to antora/components/rg/modules/cms/pages/methods/lifecycle/updating.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes.adoc
similarity index 86%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes.adoc
index 3a207d8..200d1c6 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/prefixes.adoc
@@ -200,18 +200,4 @@ See also xref:rg:cms:rgcms.adoc#_rgcms_methods_prefixes_validateAddTo[`validateA
 
 
 
-include::partial$_rgcms_methods_prefixes_addTo.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_autoComplete.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_choices.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_clear.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_default.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_disable.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_get.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_hide.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_modify.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_removeFrom.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_set.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_validate.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_validateAddTo.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_prefixes_validateRemoveFrom.adoc[leveloffset=+1]
 
diff --git a/antora/components/rg/modules/cms/pages/methods/prefixes/_attributes.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/_attributes.adoc
new file mode 100644
index 0000000..ee19aa2
--- /dev/null
+++ b/antora/components/rg/modules/cms/pages/methods/prefixes/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ../../..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_addTo.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_addTo.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/addTo.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_autoComplete.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/autoComplete.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_autoComplete.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/autoComplete.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_choices.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/choices.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_choices.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/choices.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_clear.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/clear.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_clear.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/clear.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_default.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/default.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_default.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/default.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_disable.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/disable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_disable.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/disable.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_get.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/get.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_get.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/get.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_hide.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/hide.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_hide.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/hide.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_modify.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/modify.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_modify.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/modify.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_removeFrom.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_removeFrom.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/removeFrom.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_set.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/set.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_set.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/set.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_validate.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/validate.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_validate.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/validate.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_validateAddTo.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_validateAddTo.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/validateAddTo.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_validateRemoveFrom.adoc b/antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_prefixes_validateRemoveFrom.adoc
rename to antora/components/rg/modules/cms/pages/methods/prefixes/validateRemoveFrom.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved.adoc b/antora/components/rg/modules/cms/pages/methods/reserved.adoc
similarity index 81%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved.adoc
index f5d0026..6f1c97e 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved.adoc
+++ b/antora/components/rg/modules/cms/pages/methods/reserved.adoc
@@ -43,10 +43,3 @@ If not provided, then the class name is used to locate an image.
 
 
 
-include::partial$_rgcms_methods_reserved_cssClass.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_reserved_disable.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_reserved_getId.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_reserved_hide.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_reserved_iconName.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_reserved_title.adoc[leveloffset=+1]
-include::partial$_rgcms_methods_reserved_validate.adoc[leveloffset=+1]
diff --git a/antora/components/rg/modules/cms/pages/methods/reserved/_attributes.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/_attributes.adoc
new file mode 100644
index 0000000..ee19aa2
--- /dev/null
+++ b/antora/components/rg/modules/cms/pages/methods/reserved/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ../../..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_cssClass.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_cssClass.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/cssClass.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_disable.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/disable.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_disable.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/disable.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_getId.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_getId.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/getId.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_hide.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/hide.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_hide.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/hide.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_iconName.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_iconName.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/iconName.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_layout.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_layout.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/layout.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_title.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/title.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_title.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/title.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_validate.adoc b/antora/components/rg/modules/cms/pages/methods/reserved/validate.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_methods_reserved_validate.adoc
rename to antora/components/rg/modules/cms/pages/methods/reserved/validate.adoc
diff --git a/antora/components/rg/modules/cms/pages/rgcms.adoc b/antora/components/rg/modules/cms/pages/rgcms.adoc
index a497176..069c094 100644
--- a/antora/components/rg/modules/cms/pages/rgcms.adoc
+++ b/antora/components/rg/modules/cms/pages/rgcms.adoc
@@ -6,6 +6,3 @@ include::_attributes.adoc[]
 
 
 
-include::partial$_rgcms_methods.adoc[leveloffset=+1]
-include::partial$_rgcms_classes.adoc[leveloffset=+1]
-include::partial$_rgcms_schema.adoc[leveloffset=+1]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-aim.adoc b/antora/components/rg/modules/cms/pages/schema-aim.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-aim.adoc
rename to antora/components/rg/modules/cms/pages/schema-aim.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-chg.adoc b/antora/components/rg/modules/cms/pages/schema-chg.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-chg.adoc
rename to antora/components/rg/modules/cms/pages/schema-chg.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-cmd.adoc b/antora/components/rg/modules/cms/pages/schema-cmd.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-cmd.adoc
rename to antora/components/rg/modules/cms/pages/schema-cmd.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-common.adoc b/antora/components/rg/modules/cms/pages/schema-common.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-common.adoc
rename to antora/components/rg/modules/cms/pages/schema-common.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-ixn.adoc b/antora/components/rg/modules/cms/pages/schema-ixn.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-ixn.adoc
rename to antora/components/rg/modules/cms/pages/schema-ixn.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-mml.adoc b/antora/components/rg/modules/cms/pages/schema-mml.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_schema-mml.adoc
rename to antora/components/rg/modules/cms/pages/schema-mml.adoc
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_schema.adoc b/antora/components/rg/modules/cms/pages/schema.adoc
similarity index 100%
rename from antora/components/rg/modules/cms/pages/_partials/_rgcms_schema.adoc
rename to antora/components/rg/modules/cms/pages/schema.adoc