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 2021/02/21 12:38:07 UTC

[isis] 01/02: ISIS-2444: moving hook files over

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

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

commit f1a0e151950cb04796a7eb613c5b1901df135ecb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 21 10:52:39 2021 +0000

    ISIS-2444: moving hook files over
---
 .../pages/what-is-apache-isis/screencasts.adoc     |   18 +-
 .../modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc |    4 +-
 .../pages/index/applib/annotation/Action.adoc      |    2 +
 .../index/applib/annotation/ActionLayout.adoc      |    2 +
 .../pages/index/applib/annotation/Collection.adoc  |    2 +
 .../index/applib/annotation/CollectionLayout.adoc  |    2 +
 .../hooks/ActionLayout_010-examples-and-usage.adoc |    0
 .../hooks/Action_010-examples-and-usage.adoc       |    0
 .../CollectionLayout_010-examples-and-usage.adoc   |    2 +-
 .../hooks/Collection_010-examples-and-usage.adoc   |    2 +-
 .../DomainObjectLayout_010-examples-and-usage.adoc |   22 +-
 .../hooks/DomainObject_010-examples-and-usage.adoc |   42 +-
 ...DomainServiceLayout_010-examples-and-usage.adoc |    0
 .../DomainService_010-examples-and-usage.adoc      |    0
 .../hooks/Facets_010-examples-and-usage.adoc       |    0
 .../hooks/HomePage_010-examples-and-usage.adoc     |    0
 .../InteractionScope_010-examples-and-usage.adoc   |    0
 .../hooks/MemberOrder_010-examples-and-usage.adoc  |   10 +
 .../hooks/MinLength_010-examples-and-usage.adoc    |    0
 .../ParameterLayout_010-examples-and-usage.adoc    |    0
 .../hooks/Parameter_010-examples-and-usage.adoc    |    0
 .../hooks/Programmatic_010-examples-and-usage.adoc |    0
 .../PropertyLayout_010-examples-and-usage.adoc     |    2 +-
 .../hooks/Property_010-examples-and-usage.adoc     |    2 +-
 .../hooks/Title_010-examples-and-usage.adoc        |    0
 .../AcceptHeaderService_010-implementation.adoc    |    0
 ...AcceptHeaderService_020-examples-and-usage.adoc |    2 +-
 ...cationFeatureRepository_010-implementation.adoc |    0
 ...onFeatureRepository_020-examples-and-usage.adoc |    0
 .../hooks/BookmarkService_010-implementation.adoc  |    0
 .../BookmarkService_020-examples-and-usage.adoc    |    4 +-
 .../BookmarkUiService_010-implementation.adoc      |    0
 .../BookmarkUiService_020-examples-and-usage.adoc  |    0
 .../hooks/ClockService_010-implementation.adoc     |    0
 .../hooks/ClockService_020-examples-and-usage.adoc |    0
 .../CommandExecutorService_010-implementation.adoc |    0
 ...mandExecutorService_020-examples-and-usage.adoc |    0
 ...mandDtoProcessorService_010-implementation.adoc |    0
 ...DtoProcessorService_020-examples-and-usage.adoc |    0
 .../ConfigurationMenu_010-implementation.adoc      |    0
 .../ConfigurationMenu_020-examples-and-usage.adoc  |    0
 ...onfigurationViewService_010-implementation.adoc |    0
 ...gurationViewService_020-examples-and-usage.adoc |    0
 .../ContentMappingService_010-implementation.adoc  |    2 +-
 ...ntentMappingService_020-examples-and-usage.adoc |    0
 .../hooks/EmailService_010-implementation.adoc     |    0
 .../hooks/EmailService_020-examples-and-usage.adoc |    0
 .../ErrorReportingService_010-implementation.adoc  |    0
 ...rorReportingService_020-examples-and-usage.adoc |    0
 .../hooks/EventBusService_010-implementation.adoc  |    0
 .../EventBusService_020-examples-and-usage.adoc    |   12 +-
 ...eptionRecognizerService_010-implementation.adoc |    0
 ...onRecognizerService_020-examples-and-usage.adoc |    0
 .../ExceptionRecognizer_010-implementation.adoc    |    0
 ...ExceptionRecognizer_020-examples-and-usage.adoc |    0
 .../hooks/FactoryService_010-implementation.adoc   |    0
 .../FactoryService_020-examples-and-usage.adoc     |    0
 .../GridLoaderService_010-implementation.adoc      |    0
 .../GridLoaderService_020-examples-and-usage.adoc  |    0
 .../grid/hooks/GridService_010-implementation.adoc |    0
 .../hooks/GridService_020-examples-and-usage.adoc  |    0
 .../GridSystemService_010-implementation.adoc      |    0
 .../GridSystemService_020-examples-and-usage.adoc  |    0
 .../HealthCheckService_010-implementation.adoc     |    0
 .../HealthCheckService_020-examples-and-usage.adoc |    0
 .../hooks/HintIdProvider_010-implementation.adoc   |    0
 .../HintIdProvider_020-examples-and-usage.adoc     |    0
 .../hint/hooks/HintStore_010-implementation.adoc   |    0
 .../hooks/HintStore_020-examples-and-usage.adoc    |    0
 ...HomePageResolverService_010-implementation.adoc |    0
 ...PageResolverService_020-examples-and-usage.adoc |    0
 .../hooks/LocaleProvider_010-implementation.adoc   |    0
 .../LocaleProvider_020-examples-and-usage.adoc     |    0
 .../TranslationService_010-implementation.adoc     |    0
 .../TranslationService_020-examples-and-usage.adoc |    0
 .../TranslationsResolver_010-implementation.adoc   |    0
 ...ranslationsResolver_020-examples-and-usage.adoc |    0
 .../iactn/hooks/Execution_010-implementation.adoc  |    0
 .../hooks/Execution_020-examples-and-usage.adoc    |    0
 .../InteractionContext_010-implementation.adoc     |    0
 .../InteractionContext_020-examples-and-usage.adoc |    0
 .../hooks/Interaction_010-implementation.adoc      |    0
 .../hooks/Interaction_020-examples-and-usage.adoc  |    0
 .../hooks/ServiceInjector_010-implementation.adoc  |    0
 .../ServiceInjector_020-examples-and-usage.adoc    |    0
 .../jaxb/hooks/JaxbService_010-implementation.adoc |    0
 .../hooks/JaxbService_020-examples-and-usage.adoc  |    0
 .../LayoutServiceMenu_010-implementation.adoc      |    0
 .../LayoutServiceMenu_020-examples-and-usage.adoc  |    0
 .../hooks/LayoutService_010-implementation.adoc    |    0
 .../LayoutService_020-examples-and-usage.adoc      |    4 +-
 .../hooks/DeepLinkService_010-implementation.adoc  |    0
 .../DeepLinkService_020-examples-and-usage.adoc    |    0
 .../MenuBarsLoaderService_010-implementation.adoc  |    0
 ...nuBarsLoaderService_020-examples-and-usage.adoc |    0
 .../hooks/MenuBarsService_010-implementation.adoc  |    0
 .../MenuBarsService_020-examples-and-usage.adoc    |    0
 .../hooks/MessageService_010-implementation.adoc   |    0
 .../MessageService_020-examples-and-usage.adoc     |    0
 .../MetaModelServiceMenu_010-implementation.adoc   |    0
 ...etaModelServiceMenu_020-examples-and-usage.adoc |    0
 .../hooks/MetaModelService_010-implementation.adoc |    0
 .../MetaModelService_020-examples-and-usage.adoc   |    0
 .../hooks/MetricsService_010-implementation.adoc   |    0
 .../MetricsService_020-examples-and-usage.adoc     |    0
 .../CommandSubscriber_010-implementation.adoc      |    0
 .../CommandSubscriber_020-examples-and-usage.adoc  |    0
 ...EntityChangesSubscriber_010-implementation.adoc |    0
 ...tyChangesSubscriber_020-examples-and-usage.adoc |    0
 ...ropertyChangeSubscriber_010-implementation.adoc |    0
 ...rtyChangeSubscriber_020-examples-and-usage.adoc |    0
 .../ExecutionSubscriber_010-implementation.adoc    |    0
 ...ExecutionSubscriber_020-examples-and-usage.adoc |    0
 ...ueryResultsCacheControl_010-implementation.adoc |    0
 ...ResultsCacheControl_020-examples-and-usage.adoc |    0
 .../QueryResultsCache_010-implementation.adoc      |    0
 .../QueryResultsCache_020-examples-and-usage.adoc  |    0
 .../hooks/ServiceRegistry_010-implementation.adoc  |    0
 .../ServiceRegistry_020-examples-and-usage.adoc    |    0
 .../RepositoryService_010-implementation.adoc      |    0
 .../RepositoryService_020-examples-and-usage.adoc  |    0
 .../hooks/RoutingService_010-implementation.adoc   |    0
 .../RoutingService_020-examples-and-usage.adoc     |    0
 .../hooks/Scratchpad_010-implementation.adoc       |    2 +-
 .../hooks/Scratchpad_020-examples-and-usage.adoc   |    0
 .../SessionLoggingService_010-implementation.adoc  |    0
 ...ssionLoggingService_020-examples-and-usage.adoc |    0
 .../SudoServiceListener_010-implementation.adoc    |    0
 ...SudoServiceListener_020-examples-and-usage.adoc |    0
 .../sudo/hooks/SudoService_010-implementation.adoc |    0
 .../hooks/SudoService_020-examples-and-usage.adoc  |    0
 .../hooks/SwaggerService_010-implementation.adoc   |    0
 .../SwaggerService_020-examples-and-usage.adoc     |    0
 ...TableColumnOrderService_010-implementation.adoc |    0
 ...eColumnOrderService_020-examples-and-usage.adoc |    0
 .../hooks/TitleService_010-implementation.adoc     |    0
 .../hooks/TitleService_020-examples-and-usage.adoc |    0
 .../UrlEncodingService_010-implementation.adoc     |    0
 .../UrlEncodingService_020-examples-and-usage.adoc |    0
 .../user/hooks/UserService_010-implementation.adoc |    0
 .../hooks/UserService_020-examples-and-usage.adoc  |    0
 .../UserProfileService_010-implementation.adoc     |    0
 .../UserProfileService_020-examples-and-usage.adoc |    0
 ...mailNotificationService_010-implementation.adoc |    0
 ...NotificationService_020-examples-and-usage.adoc |    0
 ...UserRegistrationService_010-implementation.adoc |    0
 ...RegistrationService_020-examples-and-usage.adoc |    0
 .../hooks/WrapperFactory_010-implementation.adoc   |    0
 .../WrapperFactory_020-examples-and-usage.adoc     |    4 +-
 .../TransactionService_010-implementation.adoc     |    0
 .../TransactionService_020-examples-and-usage.adoc |    0
 .../TransactionalProcessor_010-implementation.adoc |    0
 ...nsactionalProcessor_020-examples-and-usage.adoc |    0
 .../xml/hooks/XmlService_010-implementation.adoc   |    0
 .../hooks/XmlService_020-examples-and-usage.adoc   |    0
 .../XmlSnapshotService_010-implementation.adoc     |    0
 .../XmlSnapshotService_020-examples-and-usage.adoc |    0
 .../modules/generated/pages/system-overview.adoc   | 3737 ++++++++++----------
 .../btb/pages/hints-and-tips/are-you-sure.adoc     |    2 +-
 .../how-to-handle-void-and-null-results.adoc       |    2 +-
 .../how-to-implement-a-spellchecker.adoc           |    4 +-
 .../simulating-collections-of-values.adoc          |    2 +-
 .../fun/pages/business-rules/usability.adoc        |    4 +-
 .../modules/fun/pages/business-rules/validity.adoc |    2 +-
 .../fun/pages/concepts-patterns/core-values.adoc   |    2 +-
 .../domain-services.adoc                           |   14 +-
 .../inject-services.adoc                           |    2 +-
 .../modules/fun/pages/drop-downs-and-defaults.adoc |    6 +-
 .../modules/fun/pages/meta-annotations.adoc        |    4 +-
 api/adoc/userguide/modules/fun/pages/mixins.adoc   |   10 +-
 .../modules/fun/pages/object-members/actions.adoc  |   16 +-
 .../fun/pages/object-members/collections.adoc      |    8 +-
 .../fun/pages/object-members/properties.adoc       |   10 +-
 .../modules/fun/pages/overview/events.adoc         |   10 +-
 .../modules/fun/pages/overview/identifiers.adoc    |    2 +-
 .../modules/fun/pages/overview/object-members.adoc |   16 +-
 .../pages/overview/types-of-domain-objects.adoc    |    2 +-
 .../modules/fun/pages/ui/action-icons-and-css.adoc |   10 +-
 .../modules/fun/pages/ui/menubars-layout.adoc      |    8 +-
 .../fun/pages/ui/names-and-descriptions.adoc       |   20 +-
 .../modules/fun/pages/ui/object-layout.adoc        |    6 +-
 .../fun/pages/ui/object-titles-and-icons.adoc      |   14 +-
 .../userguide/modules/fun/pages/view-models.adoc   |    4 +-
 .../modules/fun/pages/view-models/UNUSED-dto.adoc  |    2 +-
 .../modules/fun/partials/_deployment-options.adoc  |    2 +-
 .../Action/_summary.adoc                           |   16 +-
 .../Action/commandPublishing.adoc                  |    2 +-
 .../Action/domainEvent.adoc                        |    4 +-
 .../Action/executionPublishing.adoc                |    4 +-
 .../Action/hidden.adoc                             |    6 +-
 .../Action/typeOf.adoc                             |    2 +-
 .../ActionLayout/_summary.adoc                     |    6 +-
 .../ActionLayout/bookmarking.adoc                  |    6 +-
 .../ActionLayout/cssClass.adoc                     |   10 +-
 .../ActionLayout/cssClassFa.adoc                   |    4 +-
 .../ActionLayout/describedAs.adoc                  |    8 +-
 .../ActionLayout/hidden.adoc                       |    6 +-
 .../ActionLayout/named.adoc                        |   10 +-
 .../ActionLayout/position.adoc                     |    2 +-
 .../ActionLayout/redirect.adoc                     |    2 +-
 .../Collection/_summary.adoc                       |    6 +-
 .../Collection/domainEvent.adoc                    |    6 +-
 .../Collection/hidden.adoc                         |    6 +-
 .../Collection/typeOf.adoc                         |    2 +-
 .../CollectionLayout/_summary.adoc                 |   14 +-
 .../CollectionLayout/cssClass.adoc                 |    8 +-
 .../CollectionLayout/describedAs.adoc              |    2 +-
 .../CollectionLayout/hidden.adoc                   |    6 +-
 .../CollectionLayout/named.adoc                    |   10 +-
 .../CollectionLayout/paged.adoc                    |    2 +-
 .../DomainObject/actionDomainEvent.adoc            |    2 +-
 .../DomainObject/autoCompleteRepository.adoc       |    2 +-
 .../DomainObject/bounding.adoc                     |    2 +-
 .../DomainObject/collectionDomainEvent.adoc        |    2 +-
 .../DomainObject/mixinMethod.adoc                  |    4 +-
 .../DomainObject/nature.adoc                       |    2 +-
 .../DomainObject/propertyDomainEvent.adoc          |    6 +-
 .../DomainObjectLayout/bookmarking.adoc            |    2 +-
 .../DomainObjectLayout/cssClass.adoc               |   10 +-
 .../DomainObjectLayout/cssClassFa.adoc             |    4 +-
 .../DomainObjectLayout/describedAs.adoc            |    8 +-
 .../DomainObjectLayout/named.adoc                  |   12 +-
 .../DomainObjectLayout/paged.adoc                  |    2 +-
 .../DomainObjectLayout/titleUiEvent.adoc           |    2 +-
 .../DomainService/_summary.adoc                    |    6 +-
 .../DomainServiceLayout/_summary.adoc              |    4 +-
 .../DomainServiceLayout/named.adoc                 |   10 +-
 .../MemberOrder/_summary.adoc                      |    4 +-
 .../MemberOrder/name.adoc                          |    4 +-
 .../Parameter/_summary.adoc                        |   10 +-
 .../Parameter/fileAccept.adoc                      |    2 +-
 .../Parameter/maxLength.adoc                       |    2 +-
 .../Parameter/mustSatisfy.adoc                     |    4 +-
 .../Parameter/optionality.adoc                     |    2 +-
 .../Parameter/regexPattern.adoc                    |    2 +-
 .../ParameterLayout/_summary.adoc                  |   18 +-
 .../ParameterLayout/cssClass.adoc                  |   10 +-
 .../ParameterLayout/describedAs.adoc               |    2 +-
 .../ParameterLayout/labelPosition.adoc             |    6 +-
 .../ParameterLayout/multiLine.adoc                 |    4 +-
 .../ParameterLayout/named.adoc                     |   10 +-
 .../ParameterLayout/renderDay.adoc                 |    2 +-
 .../ParameterLayout/typicalLength.adoc             |    2 +-
 .../Property/_summary.adoc                         |   24 +-
 .../Property/commandPublishing.adoc                |    4 +-
 .../Property/domainEvent.adoc                      |    4 +-
 .../Property/editing.adoc                          |    4 +-
 .../Property/executionPublishing.adoc              |    4 +-
 .../Property/fileAccept.adoc                       |    2 +-
 .../Property/hidden.adoc                           |    8 +-
 .../Property/maxLength.adoc                        |    2 +-
 .../Property/mustSatisfy.adoc                      |    4 +-
 .../Property/optionality.adoc                      |    2 +-
 .../Property/regexPattern.adoc                     |    2 +-
 .../PropertyLayout/_summary.adoc                   |   26 +-
 .../PropertyLayout/cssClass.adoc                   |    8 +-
 .../PropertyLayout/describedAs.adoc                |    2 +-
 .../PropertyLayout/hidden.adoc                     |    8 +-
 .../PropertyLayout/labelPosition.adoc              |    4 +-
 .../PropertyLayout/multiLine.adoc                  |    4 +-
 .../PropertyLayout/named.adoc                      |   10 +-
 .../PropertyLayout/renderDay.adoc                  |    2 +-
 .../PropertyLayout/repainting.adoc                 |    2 +-
 .../PropertyLayout/typicalLength.adoc              |    2 +-
 .../main/adoc/modules/applib-ant/pages/Action.adoc |   12 -
 .../modules/applib-ant/pages/ActionLayout.adoc     |   17 -
 .../adoc/modules/applib-ant/pages/Collection.adoc  |   13 -
 .../modules/applib-ant/pages/CollectionLayout.adoc |   12 -
 .../main/adoc/modules/applib-ant/pages/Column.adoc |    6 +-
 .../pages/Column/hooks/examples-and-usage.adoc     |    0
 .../modules/applib-ant/pages/DomainObject.adoc     |   15 -
 .../applib-ant/pages/DomainObjectLayout.adoc       |   12 -
 .../modules/applib-ant/pages/DomainService.adoc    |   24 -
 .../applib-ant/pages/DomainServiceLayout.adoc      |   31 -
 .../main/adoc/modules/applib-ant/pages/Facets.adoc |   10 -
 .../adoc/modules/applib-ant/pages/HomePage.adoc    |    9 -
 .../modules/applib-ant/pages/InteractionScope.adoc |    9 -
 .../adoc/modules/applib-ant/pages/MemberOrder.adoc |   10 -
 .../MemberOrder/hooks/examples-and-usage.adoc      |   10 -
 .../adoc/modules/applib-ant/pages/MinLength.adoc   |   29 -
 .../adoc/modules/applib-ant/pages/Nullable.adoc    |    6 +-
 .../adoc/modules/applib-ant/pages/Parameter.adoc   |   13 -
 .../modules/applib-ant/pages/ParameterLayout.adoc  |   13 -
 .../modules/applib-ant/pages/Programmatic.adoc     |   10 -
 .../adoc/modules/applib-ant/pages/Property.adoc    |   11 -
 .../modules/applib-ant/pages/PropertyLayout.adoc   |   12 -
 .../main/adoc/modules/applib-ant/pages/Title.adoc  |   12 -
 .../modules/applib-ant/pages/XmlRootElement.adoc   |    6 +-
 .../adoc/modules/applib-ant/pages/about/main.adoc  |   24 +-
 .../adoc/modules/applib-ant/pages/about/other.adoc |   12 +-
 .../modules/applib-ant/partials/module-nav.adoc    |   39 +-
 .../applib-classes/pages/events/domainevent.adoc   |    2 +-
 .../events/domainevent/ActionDomainEvent.adoc      |    2 +-
 .../events/domainevent/CollectionDomainEvent.adoc  |    2 +-
 .../events/domainevent/PropertyDomainEvent.adoc    |    2 +-
 .../events/lifecycleevent/ObjectCreatedEvent.adoc  |    2 +-
 .../lifecycleevent/ObjectPersistedEvent.adoc       |    2 +-
 .../lifecycleevent/ObjectPersistingEvent.adoc      |    2 +-
 .../events/lifecycleevent/ObjectRemovingEvent.adoc |    2 +-
 .../events/lifecycleevent/ObjectUpdatedEvent.adoc  |    2 +-
 .../events/lifecycleevent/ObjectUpdatingEvent.adoc |    2 +-
 .../applib-classes/pages/events/uievent.adoc       |    6 +-
 .../pages/events/uievent/IconUiEvent.adoc          |    2 +-
 .../pages/events/uievent/TitleUiEvent.adoc         |    2 +-
 .../applib-classes/pages/layout/menubars.adoc      |    4 +-
 .../applib-classes/pages/layout/object-layout.adoc |   10 +-
 .../adoc/modules/applib-classes/pages/spec.adoc    |    2 +-
 .../applib-methods/pages/lifecycle/created.adoc    |    2 +-
 .../applib-methods/pages/lifecycle/loaded.adoc     |    2 +-
 .../applib-methods/pages/lifecycle/persisted.adoc  |    2 +-
 .../applib-methods/pages/lifecycle/persisting.adoc |    2 +-
 .../applib-methods/pages/lifecycle/removing.adoc   |    2 +-
 .../applib-methods/pages/lifecycle/updated.adoc    |    2 +-
 .../applib-methods/pages/lifecycle/updating.adoc   |    2 +-
 .../modules/applib-methods/pages/prefixes.adoc     |    2 +-
 .../pages/prefixes/autoComplete.adoc               |    4 +-
 .../pages/reserved/deprecated/getId.adoc           |    2 +-
 .../applib-methods/pages/reserved/layout.adoc      |    2 +-
 .../applib-methods/pages/reserved/title.adoc       |    2 +-
 .../pages-removed-services/AuditerService.adoc     |   83 -
 .../hooks/_summary.adoc                            |   11 -
 .../modules/applib-svc/pages/BookmarkService.adoc  |    2 +-
 .../applib-svc/pages/BookmarkUiService.adoc        |    2 +-
 .../hooks/examples_and_usage.adoc                  |    4 -
 .../modules/applib-svc/pages/ClockService.adoc     |    2 +-
 .../pages/CommandDtoProcessorService.adoc          |    2 +-
 .../CommandExecutorService/hooks/_summary.adoc     |   10 -
 .../ContentMappingService/hooks/_summary.adoc      |    5 -
 .../main/adoc/modules/applib-svc/pages/about.adoc  |   12 +-
 .../pages/about/hooks/implementation.adoc          |    5 -
 .../src/main/adoc/modules/schema/pages/chg.adoc    |    2 +-
 .../src/main/adoc/modules/schema/pages/common.adoc |    2 +-
 .../src/main/adoc/modules/config/pages/about.adoc  |    2 +-
 .../application-specific/application-css.adoc      |    8 +-
 .../pages/EntityChangesPublisher.adoc              |    4 +-
 .../pages/EntityPropertyChangePublisher.adoc       |    2 +-
 .../runtime-services/pages/ExecutionPublisher.adoc |    4 +-
 .../partials/_application-layer.adoc               |    4 +-
 .../adoc/modules/audit-trail/pages/about.adoc      |    4 +-
 security/adoc/modules/ROOT/pages/about.adoc        |    2 +-
 .../adoc/modules/starters/pages/helloworld.adoc    |    8 +-
 .../adoc/modules/starters/pages/simpleapp.adoc     |   10 +-
 testing/adoc/modules/ROOT/pages/about.adoc         |    2 +-
 .../j2adoc/format/UnitFormatterAbstract.java       |   25 +-
 .../j2adoc/format/UnitFormatterAbstractTest.java   |   27 +
 .../ROOT/pages/configuration-properties.adoc       |   12 +-
 .../ROOT/pages/features/bookmarked-pages.adoc      |    6 +-
 347 files changed, 2504 insertions(+), 2712 deletions(-)

diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 3b7ef2d..2bef057 100644
--- a/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -138,7 +138,7 @@ include::screencasts/playlists.adoc[]
 
 
 |link:https://www.youtube.com/watch?v=dfRZeYqzMtI[012^] +
-Implementing business logic using a (no-arg) action, and associating with a property using either the xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder`] annotations or using xref:userguide:fun:ui.adoc#object-layout[dynamic (XML) layouts].
+Implementing business logic using a (no-arg) action, and associating with a property using either the xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`] annotations or using xref:userguide:fun:ui.adoc#object-layout[dynamic (XML) layouts].
 |x||||||||x||
 
 
@@ -159,7 +159,7 @@ Using the xref:refguide:applib-cm:methods.adoc#title[`title()`], xref:refguide:a
 
 
 |link:https://www.youtube.com/watch?v=7ToRKBOeemM[015^] +
-Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the xref:refguide:applib-cm:classes/uievent.adoc#IconUiEvent[`IconUiEvent`] as per the xref:refguide:applib-ant:DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] annotation
+Moving the responsibility to specify the icon for a domain object out and into a subscriber, using the xref:refguide:applib-cm:classes/uievent.adoc#IconUiEvent[`IconUiEvent`] as per the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] annotation
 ||||||x|||||
 
 
@@ -219,7 +219,7 @@ Demonstrates how the end-user can copy and share URLs for domain objects - inclu
 
 
 |link:https://www.youtube.com/watch?v=a0QQLT_16To[021^] +
-Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' xref:vw:ROOT:about.adoc[Wicket viewer], and how the developer can ensure that xref:refguide:applib-ant:DomainObjectLayout.adoc#bookmarking[domain objects] and (xref:refguide:applib-ant:Action.adoc#semantics[query-only]) xref:refguide:applib-ant:ActionLayout.adoc#bookmarking[actions] can be bookmarked.
+Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Isis' xref:vw:ROOT:about.adoc[Wicket viewer], and how the developer can ensure that xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#bookmarking[domain objects] and (xref:system:generated:index/applib/annotation/Action.adoc#semantics[query-only]) xref:system:generated:index/applib/annotation/ActionLayout.adoc#bookmarking[actions] can be bookmarked.
 |||x||||||||
 
 
@@ -265,7 +265,7 @@ Using a domain event subscriber to hide functionality, in this
 
 
 |link:https://www.youtube.com/watch?v=qj4bMkQRBUY[026^] +
-Using the xref:refguide:applib-ant:Title.adoc[`@Title`] annotation (instead of the xref:refguide:applib-cm:methods.adoc#title[`title()`] reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.
+Using the xref:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation (instead of the xref:refguide:applib-cm:methods.adoc#title[`title()`] reserved method) to obtain the title of a domain object, so that the end-user can distinguish one object from another.
 |x||||||||x||
 
 
@@ -319,7 +319,7 @@ How to validate action parameters using a supporting xref:refguide:applib-cm:met
 
 
 |link:https://www.youtube.com/watch?v=1Vlzob89pYI[031^] +
-How to validate action parameters using the xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]  and the Specification interface.
+How to validate action parameters using the xref:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]  and the Specification interface.
 |||||||||x||
 
 
@@ -378,7 +378,7 @@ include::screencasts/playlists.adoc[]
 
 
 |link:https://www.youtube.com/watch?v=1SCyBlMM2Bo[037^] +
-How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to xref:refguide:applib-ant:PropertyLayout.adoc#hidden[`@PropertyLayout#hidden()`]).
+How to hide properties as columns in tables (parented collections or standalone collections), using the dynamic XML layout (equivalent to xref:system:generated:index/applib/annotation/PropertyLayout.adoc#hidden[`@PropertyLayout#hidden()`]).
 ||||x|||||||
 
 
@@ -442,7 +442,7 @@ How to use the supporting xref:refguide:applib-cm:methods.adoc#default[`defaultX
 
 
 |link:https://www.youtube.com/watch?v=qAJDGxztWIQ[044^] +
-How to use xref:refguide:applib-ant:DomainObject.adoc#bounding[`@DomainObject#bounding()`] so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.
+How to use xref:system:generated:index/applib/annotation/DomainObject.adoc#bounding[`@DomainObject#bounding()`] so that a drop-down list is automatically provided for any parameters to actions that are for (domain entity) reference types.
 |||||||||x||
 
 
@@ -478,7 +478,7 @@ component.
 
 
 |link:https://www.youtube.com/watch?v=0YoFa44Xr6M[049^] +
-Using the xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`] annotation to exclude methods from a domain object
+Using the xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] annotation to exclude methods from a domain object
 (eg implementing methods of an interface as defined by the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s fullcalendar2 wicket component) that would
 otherwise be part of the Apache Isis metamodel (and thus show up in the UI).
 ||||||||||x|
@@ -545,7 +545,7 @@ How to rename a menu (on the top-level menubar) as rendered in the  xref:vw:ROOT
 
 
 |link:https://www.youtube.com/watch?v=mgHqRxQrp28[058^] +
-How to rename various elements (collections, title) of the xref:refguide:applib-ant:HomePage.adoc[home page] view model,
+How to rename various elements (collections, title) of the xref:system:generated:index/applib/annotation/HomePage.adoc[home page] view model,
 for an improved initial page.
 ||||||||||x|
 
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc
index fa1cc33..e8f3843 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc
@@ -15,9 +15,9 @@ Other new groups have been introduced: "value-types", "subdomains", (bounded con
 
 This milestone also introduces a number of new features:
 
-* new xref:refguide:applib-ant:Property.adoc#projecting[`@Property#projecting`] allows view model summaries to be returned as "projections" of underlying entities.
+* new xref:system:generated:index/applib/annotation/Property.adoc#projecting[`@Property#projecting`] allows view model summaries to be returned as "projections" of underlying entities.
 * new xref:refguide:applib-methods:reserved.adoc#layout[`layout()`] method (or xref:refguide:applib-classes:events.adoc#ui-event-classes[UI event]) allows a domain object to specify which layout file should be used to render it.
-* no longer any need to specify xref:refguide:applib-ant:ParameterLayout.adoc#named[`@ParameterLayout#named()`]
+* no longer any need to specify xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[`@ParameterLayout#named()`]
 * security integration with xref:security:keycloak:about.adoc[Keycloak]
 
 * New value types:
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc
index 035cbe3..244f21c 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc
@@ -173,3 +173,5 @@ The type-of the elements returned by the action.
 For downloading xref:system:generated:index/applib/value/Blob.adoc[Blob] or xref:system:generated:index/applib/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ).
 
 The value should be of the form "file_extension|audio/*|video/*|image/*|media_type".
+
+include::hooks/Action_010-examples-and-usage.adoc[]
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/ActionLayout.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/ActionLayout.adoc
index c856807..c07f798 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/ActionLayout.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/ActionLayout.adoc
@@ -129,3 +129,5 @@ How this parameters for this action are prompted, either _PromptStyle#DIALOG dia
 === redirectPolicy
 
 If the action returns its target, then determines whether to update the page or instead to redirect (forcing a re-rendering of a new page).
+
+include::hooks/ActionLayout_010-examples-and-usage.adoc[]
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Collection.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/Collection.adoc
index 9038cf3..5782d92 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/Collection.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/Collection.adoc
@@ -73,3 +73,5 @@ Indicates when the collection is not visible to the user.
 === typeOf
 
 The type-of the elements held within the collection.
+
+include::hooks/Collection_010-examples-and-usage.adoc[]
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/CollectionLayout.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/CollectionLayout.adoc
index 19ded48..3b71ac7 100644
--- a/antora/components/system/modules/generated/pages/index/applib/annotation/CollectionLayout.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/CollectionLayout.adoc
@@ -116,3 +116,5 @@ Whenever there is a collection of type _java.util.SortedSet_ , the domain entity
 However, in some circumstances the ordering of collection may be different to the entity's natural ordering. For example, the entity may represent an interval of time sorted by its _startDate_ ascending, but the collection may wish to sort by _startDate_ .
 
 The purpose of this annotation is to provide a _java.util.Comparator_ such that the collection may be sorted in an order more suitable to the context.
+
+include::hooks/CollectionLayout_010-examples-and-usage.adoc[]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Action/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Action_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/Action/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Action_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
similarity index 68%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
index 070414f..3864787 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/hooks/examples-and-usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
@@ -24,6 +24,6 @@ As an alternative to using the `@CollectionLayout` annotation, a xref:userguide:
 
 [TIP]
 ====
-The annotation is one of a handful (others including xref:refguide:applib-ant:Collection.adoc[`@Collection`], xref:refguide:applib-ant:Property.adoc[`@Property`] and xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`]) that can also be applied to the field, rather than the getter method.
+The annotation is one of a handful (others including xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`], xref:system:generated:index/applib/annotation/Property.adoc[`@Property`] and xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`]) that can also be applied to the field, rather than the getter method.
 This is specifically so that boilerplate-busting tools such as link:https://projectlombok.org/[Project Lombok] can be used.
 ====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_010-examples-and-usage.adoc
similarity index 70%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/Collection/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_010-examples-and-usage.adoc
index 1bfa503..38cc7d8 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/hooks/examples-and-usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_010-examples-and-usage.adoc
@@ -28,7 +28,7 @@ public class ToDoItem {
 
 [TIP]
 ====
-The annotation is one of a handful (others including xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`], xref:refguide:applib-ant:Property.adoc[`@Property`] and xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`]) that can also be applied to the field, rather than the getter method.
+The annotation is one of a handful (others including xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`], xref:system:generated:index/applib/annotation/Property.adoc[`@Property`] and xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`]) that can also be applied to the field, rather than the getter method.
 This is so that boilerplate-busting tools such as link:https://projectlombok.org/[Project Lombok] can be used.
 ====
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
similarity index 65%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
index 33066a1..c612bdc 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/hooks/examples-and-usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
@@ -4,15 +4,15 @@
 //----
 //include::refguide:applib-ant:example$annotation/DomainObjectLayout.java[tags="refguide"]
 //----
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#bookmarking[`bookmarking`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#bookmarking[`bookmarking`]
 //+
 //Whether (and how) this domain object should be automatically bookmarked
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClass[`cssClass`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[`cssClass`]
 //+
 //The css class that a domain class (type) should have, to allow more targetted styling in xref:refguide:config:application-specific/application-css.adoc[`application.css`]
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`cssClassFa`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[`cssClassFa`]
 //+
 //Any valid link:http://fortawesome.github.io/Font-Awesome/[Font awesome] icon name for the domain object's menu link or icon. +
 //
@@ -22,22 +22,22 @@
 //
 //
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#describedAs[`describedAs`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#describedAs[`describedAs`]
 //+
 //Description of this class, eg to be rendered in a tooltip.
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#named[`named`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[`named`]
 //+
 //To override the name inferred from the action's name in code. +
 //+
 //A typical use case is if the desired name is a reserved Java keyword, such as `default` or `package`.
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#paged[`paged`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#paged[`paged`]
 //+
 //The page size for instances of this class when rendered within a table (as returned from an action invocation)
 //
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#plural[`plural`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#plural[`plural`]
 //+
 //The plural name of the class
 //
@@ -50,19 +50,19 @@
 //----
 //include::refguide:applib-ant:example$annotation/DomainObjectLayout.java[tags="refguide-ui-events"]
 //----
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassUiEvent[`cssClassUiEvent`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`cssClassUiEvent`]
 //+
 //The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] to obtain a CSS class for the domain object.
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#iconUiEvent[`iconUiEvent`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#iconUiEvent[`iconUiEvent`]
 //+
 //The event type to be posted to obtain the icon (name) for the domain object.
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#layoutUiEvent[`layoutUiEvent`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#layoutUiEvent[`layoutUiEvent`]
 //+
 //The event type to be posted to obtain the layout (name) for the domain object.
 //
-//<.> xref:refguide:applib-ant:DomainObjectLayout.adoc#titleUiEvent[`titleUiEvent`]
+//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`titleUiEvent`]
 //+
 //The event type to be posted to obtain the title for the domain object.
 //
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_010-examples-and-usage.adoc
similarity index 70%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_010-examples-and-usage.adoc
index db89a0a..853b852 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/hooks/examples-and-usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_010-examples-and-usage.adoc
@@ -4,19 +4,19 @@
 //== Main API
 //
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`autoCompleteRepository()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteRepository[`autoCompleteRepository()`]
 //+
 //Nominate a method on a domain service to be used for looking up instances of the domain object
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#autoCompleteAction[`autoCompleteAction()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteAction[`autoCompleteAction()`]
 //+
 //Override the method name to use on the auto-complete repository
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#bounding[`bounding()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#bounding[`bounding()`]
 //+
 //Whether the number of instances of this domain class is relatively small (a "bounded" set), such that instances could be selected from a drop-down list box or similar.
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#editing[`editing()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#editing[`editing()`]
 //+
 //Whether the object's properties and collections can be edited or not (ie whether the instance should be considered to be immutable)
 //
@@ -24,24 +24,24 @@
 //+
 //The default reason why the object's properties and collections cannot be edited.
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#entityChangePublishing[`entityChangePublishing()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#entityChangePublishing[`entityChangePublishing()`]
 //+
 //Indicates whether each of the changed properties of an object should be submitted to the registered
-//xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`](s) and
+//xref:refguide:applib-svc:EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber](s) and
 //whether entity changes, captured as `ChangingEntities` should be published to xref:refguide:applib-svc:EntityChangesSubscriber.adoc[`EntityChangesSubscriber`](s). (Does only apply to entity objects.)
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#mixinMethod[`mixinMethod()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#mixinMethod[`mixinMethod()`]
 //+
 //How to recognize the "reserved" method name, meaning that the mixin's own name will be inferred from the mixin type.
 //Typical examples are "exec", "execute", "invoke", "apply" and so on.
 //The default "reserved" method name is `$$`.
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#nature[`nature()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#nature[`nature()`]
 //+
 //Whether the domain object logically is an entity (part of the domain layer) or is a view model (part of the application layer); or is a mixin.
 //If an entity, indicates how its persistence is managed.
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#objectType[`objectType()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#objectType[`objectType()`]
 //+
 //Specify an alias for the domain class used to uniquely identify the object both within the Apache Isis runtime and externally
 
@@ -55,31 +55,31 @@
 //----
 //include::refguide:applib-ant:example$annotation/DomainObject.java[tags="refguide-lifecycle-events"]
 //----
-//<.> xref:refguide:applib-ant:DomainObject.adoc#createdLifecycleEvent[`createdLifecycleEvent()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#createdLifecycleEvent[`createdLifecycleEvent()`]
 //+
 //The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] whenever an instance is created
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#persistingLifecycleEvent[`persistingLifecycleEvent()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#persistingLifecycleEvent[`persistingLifecycleEvent()`]
 //+
 //The event type to be posted to whenever an instance is about to be persisted
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#persistedLifecycleEvent[`persistedLifecycleEvent()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#persistedLifecycleEvent[`persistedLifecycleEvent()`]
 //+
 //The event type to be posted whenever an instance has just been persisted
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#loadedLifecycleEvent[`loadedLifecycleEvent()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#loadedLifecycleEvent[`loadedLifecycleEvent()`]
 //+
 //The event type to be posted whenever an instance has just been loaded from the datastore
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#removingLifecycleEvent[`removingLifecycleEvent()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#removingLifecycleEvent[`removingLifecycleEvent()`]
 //+
 //The event type to be posted whenever an instance is about to be deleted
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#updatedLifecycleEvent[`updatedLifecycleEvent()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#updatedLifecycleEvent[`updatedLifecycleEvent()`]
 //+
 //The event type to be posted whenever an instance has just been updated
 //
-//<.> xref:refguide:applib-ant:DomainObject.adoc#updatingLifecycleEvent[`updatingLifecycleEvent()`]
+//<.> xref:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[`updatingLifecycleEvent()`]
 //+
 //The event type to be posted whenever an instance is about to be updated
 
@@ -97,15 +97,15 @@
 //----
 //<.> `actionDomainEvent()`
 //+
-//The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] whenever an action of the domain object is interacted with (if not overridden using xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent()]`).
+//The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] whenever an action of the domain object is interacted with (if not overridden using xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()]`).
 //
 //<.> `propertyDomainEvent()`
 //+
-//The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] whenever a property of the domain object is interacted with (if not overridden using xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent()]`).
+//The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] whenever a property of the domain object is interacted with (if not overridden using xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()]`).
 //
 //<.> `collectionDomainEvent()`
 //+
-//The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] whenever a collection of the domain object is interacted with (if not overridden using xref:refguide:applib-ant:Collection.adoc#domainEvent[`@Collection#domainEvent()]`).
+//The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] whenever a collection of the domain object is interacted with (if not overridden using xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`@Collection#domainEvent()]`).
 //
 //
 //// TODO: v2: currently missing subpages for these attributes.
@@ -170,8 +170,8 @@ See this xref:userguide:btb:hints-and-tips/view-model-instantiation.adoc[tip] fo
 View models must have a no-arg constructor; this is used internally by the framework for subsequent "recreation".
 
 The view model's memento will be derived from the value of the view model object's properties.
-Any properties annotated with xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`] will be excluded from the memento.
-Properties that are merely xref:refguide:applib-ant:Property.adoc#hidden[hidden] _are_ included in the memento.
+Any properties annotated with xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] will be excluded from the memento.
+Properties that are merely xref:system:generated:index/applib/annotation/Property.adoc#hidden[hidden] _are_ included in the memento.
 
 View models when defined using `@DomainObject(nature=VIEW_MODEL)` have some limitations:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainServiceLayout_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/MinLength/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainServiceLayout_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainService_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainService_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Facets/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Facets_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/Facets/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Facets_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/HomePage/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/HomePage_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/HomePage/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/HomePage_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/InteractionScope/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/InteractionScope_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/InteractionScope/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/InteractionScope_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MemberOrder_010-examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
new file mode 100644
index 0000000..4c49666
--- /dev/null
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
@@ -0,0 +1,10 @@
+== Notes
+
+As this is an important topic, there is xref:userguide:fun:ui.adoc#object-layout[chapter] in the user guide that discusses object layout in full.
+
+
+[TIP]
+====
+The annotation is one of a handful (others including xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`], xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`], xref:system:generated:index/applib/annotation/Property.adoc[`@Property`]) and xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`] that can also be applied to the field, rather than the getter method.
+This is specifically so that boilerplate-busting tools such as link:https://projectlombok.org/[Project Lombok] can be used.
+====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MinLength_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MinLength_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ParameterLayout_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ParameterLayout_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Parameter_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Parameter_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Programmatic/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Programmatic_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/Programmatic/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Programmatic_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
similarity index 65%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
index ca175cd..7832715 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/hooks/examples-and-usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
@@ -31,7 +31,7 @@ As an alternative to using the `@PropertyLayout` annotation, a xref:userguide:fu
 
 [TIP]
 ====
-The annotation is one of a handful (others including xref:refguide:applib-ant:Collection.adoc[`@Collection`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] and xref:refguide:applib-ant:Property.adoc[`@Property`]) that can also be applied to the field, rather than the getter method.  This is specifically
+The annotation is one of a handful (others including xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`], xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`] and xref:system:generated:index/applib/annotation/Property.adoc[`@Property`]) that can also be applied to the field, rather than the getter method.  This is specifically
 so that boilerplate-busting tools such as link:https://projectlombok.org/[Project Lombok] can be used.
 ====
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Property/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Property_010-examples-and-usage.adoc
similarity index 71%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/Property/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Property_010-examples-and-usage.adoc
index 4d6d93a..ddcaab1 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Property/hooks/examples-and-usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Property_010-examples-and-usage.adoc
@@ -32,6 +32,6 @@ public class Customer {
 
 [TIP]
 ====
-The annotation is one of a handful (others including xref:refguide:applib-ant:Collection.adoc[`@Collection`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] and xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`]) that can also be applied to the field, rather than the getter method.  This is specifically
+The annotation is one of a handful (others including xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`], xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`] and xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`]) that can also be applied to the field, rather than the getter method.  This is specifically
 so that boilerplate-busting tools such as link:https://projectlombok.org/[Project Lombok] can be used.
 ====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Title/hooks/examples-and-usage.adoc b/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Title_010-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-ant/pages/Title/hooks/examples-and-usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Title_010-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/AcceptHeaderService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/AcceptHeaderService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/AcceptHeaderService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
similarity index 92%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/AcceptHeaderService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
index d85e8c4..2f11309 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/AcceptHeaderService/hooks/examples_and_usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
@@ -12,7 +12,7 @@ The diagram below illustrated this:
 
 image::reference-services-api/acceptheaderservice.png[width="700px"]
 
-The REST request is submitted to a domain service with a xref:refguide:applib-ant:DomainService.adoc#nature[nature] of `VIEW_REST_ONLY` (`MyRestApi` in the diagram).
+The REST request is submitted to a domain service with a xref:system:generated:index/applib/annotation/DomainService.adoc#nature[nature] of `VIEW_REST_ONLY` (`MyRestApi` in the diagram).
 This uses the `AcceptHeaderService` to obtain the values of the HTTP `Accept` header.
 Based on this it delegates to the appropriate underlying domain service (with a nature of `DOMAIN` so that they are not exposed in the REST API at all).
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ApplicationFeatureRepository/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ApplicationFeatureRepository/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ApplicationFeatureRepository/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ApplicationFeatureRepository/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
similarity index 86%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
index 5b4217d..3d55487 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkService/hooks/examples_and_usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
@@ -23,13 +23,13 @@ Either of these can be suppressed, if required, using a vetoing subscriber that
 
 //== Examples
 //
-//For example, a `Customer` object with an xref:refguide:applib-ant:DomainObject.adoc#objectType[object type] of "custmgmt.Customer" and an id of 123
+//For example, a `Customer` object with an xref:system:generated:index/applib/annotation/DomainObject.adoc#objectType[object type] of "custmgmt.Customer" and an id of 123
 //would correspond to a xref:BookmarkService.adoc#bookmark[`Bookmark`] with a string representation of "custmgmt.Customer|123".
 //
 //Bookmarks are useful to store a reference to an arbitrary object, although be aware that there is no referential integrity.
 //
 //Several of the extension libraries use bookmarks.
-//For example the xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`] uses bookmarks to identify the object that is being modified.
+//For example the xref:refguide:applib-svc:EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] uses bookmarks to identify the object that is being modified.
 //
 //Serialized form of bookmarks also appear within  xref:refguide:schema:about.adoc[schema] instances, for example as used by xref:refguide:applib-svc:CommandServiceInternal.adoc[`CommandService`] and the xref:refguide:applib-svc:ExecutionSubscriber.adoc[`PublisherService`].
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkUiService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/BookmarkUiService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/about/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/about/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ClockService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ClockService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ClockService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ClockService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/CommandExecutorService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessorService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessorService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessorService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/CommandDtoProcessorService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationMenu/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationMenu/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationMenu/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationMenu/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ConfigurationViewService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_010-implementation.adoc
similarity index 86%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_010-implementation.adoc
index 6ba8603..405509a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService/hooks/implementation.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_010-implementation.adoc
@@ -13,7 +13,7 @@ The implementations are:
 * `o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandDto` will map any single instance of a `HasCommandDto` into a `CommandDto` XML document
 * `o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto` will map a list of ``HasCommandDto``s into a `CommandsDto` XML document, and will wrap any single instance of a `CommandWithDto` into a singleton list and thence into a `CommandsDto` XML document.
 
-If the action invocation or property edit represent provides an implementation of a `CommandDtoProcessor` (by way of xref:refguide:applib-ant:Action.adoc#commandDtoProcessor[`@Action#commandDtoProcessor()`] or xref:refguide:applib-ant:Property.adoc#commandDtoProcessor[`@Property#commandDtoProcessor()`]) then this is also called to post-process the persisted `CommandDto` if required.
+If the action invocation or property edit represent provides an implementation of a `CommandDtoProcessor` (by way of xref:system:generated:index/applib/annotation/Action.adoc#commandDtoProcessor[`@Action#commandDtoProcessor()`] or xref:system:generated:index/applib/annotation/Property.adoc#commandDtoProcessor[`@Property#commandDtoProcessor()`]) then this is also called to post-process the persisted `CommandDto` if required.
 A typical use case for this is to dynamically add in serialized ``Blob``s or ``Clob``s, the values of which are not captured by default in `CommandDto`.
 
 To support the writing of custom implementations of this interface, the framework also provides `ContentMappingService.Util` which includes a couple of convenience utilities:
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ContentMappingService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EmailService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EmailService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ErrorReportingService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
similarity index 87%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
index 3f76ae1..b7e4adc 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/EventBusService/hooks/examples_and_usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
@@ -3,7 +3,7 @@
 
 == Usage by the Framework
 
-The primary user of the service is the framework itself, which automatically emit events for xref:refguide:applib-ant:Action.adoc#domainEvent[actions], xref:refguide:applib-ant:Property.adoc#domainEvent[properties] and xref:refguide:applib-ant:Collection.adoc#domainEvent[collections].
+The primary user of the service is the framework itself, which automatically emit events for xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[actions], xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[properties] and xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[collections].
 Multiple events are generated:
 
 * when an object member is to be viewed, an event is fired; subscribers can veto (meaning that the member is hidden)
@@ -14,7 +14,7 @@ Multiple events are generated:
 
 If a subscriber throws an exception in the first three steps, then the interaction is vetoed.
 If a subscriber throws an exception in the last two steps, then the transaction is aborted.
-For more on this topic, see xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent()`], xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent()`] and xref:refguide:applib-ant:Collection.adoc#domainEvent[`@Collection#domainEvent()`].
+For more on this topic, see xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`], xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`] and xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`@Collection#domainEvent()`].
 
 It is also possible for domain objects to programmatically generate domain events.
 However the events are published, the primary use case is to decoupling interactions from one module/package/namespace and another.
@@ -209,7 +209,7 @@ public class LibraryMember {
 ----
 <.> `LibraryMember.LeaveEvent` could be _any_ class, not just a subclass of `o.a.i.applib.event.ActionDomainEvent`.
 
-In practice we suspect there will be few cases where the programmatic approach is required rather than the declarative approach afforded by xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent()`] et al.
+In practice we suspect there will be few cases where the programmatic approach is required rather than the declarative approach afforded by xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`] et al.
 
 
 == Using `WrapperFactory`
@@ -256,18 +256,18 @@ There are several mechanisms to suport coarse-grained publish/subscribe for syst
 
 * Command publishing, representing the _intention_ to invoke an action or edit a property.
 +
-These events apply to actions annotated with xref:refguide:applib-ant:Action.adoc#commandPublishing[`@Action#commandPublishing()`]) and to properties properties annotated with xref:refguide:applib-ant:Property.adoc#commandPublishing[`@Property#commandPublishing`]).
+These events apply to actions annotated with xref:system:generated:index/applib/annotation/Action.adoc#commandPublishing[`@Action#commandPublishing()`]) and to properties properties annotated with xref:system:generated:index/applib/annotation/Property.adoc#commandPublishing[`@Property#commandPublishing`]).
 +
 The events are received by any/all xref:refguide:applib-svc:CommandSubscriber.adoc[`CommandSubscriber`]s.
 
 * Execution publishing, representing the _completion_ of an action invocation or property edit.
 +
-These events apply to actions annotated with xref:refguide:applib-ant:Action.adoc#executionPublishing[`@Action#executionPublishing()`]) and properties annotated with xref:refguide:applib-ant:Property.adoc#executionPublishing[`@Property#executionPublishing`]).
+These events apply to actions annotated with xref:system:generated:index/applib/annotation/Action.adoc#executionPublishing[`@Action#executionPublishing()`]) and properties annotated with xref:system:generated:index/applib/annotation/Property.adoc#executionPublishing[`@Property#executionPublishing`]).
 +
 The events are received by any/all xref:refguide:applib-svc:ExecutionSubscriber.adoc[`ExecutionSubscriber`]s
 
 * Entity change publishing, representing an entity that has changed its state.
 +
-These events apply to objects annotated with xref:refguide:applib-ant:DomainObject.adoc#entityChangePublishing[`@DomainObject#entityChangePublishing()`]).
+These events apply to objects annotated with xref:system:generated:index/applib/annotation/DomainObject.adoc#entityChangePublishing[`@DomainObject#entityChangePublishing()`]).
 +
 The events are received by any/all xref:refguide:applib-svc:EntityChangesSubscriber.adoc[`EntityChangesSubscriber`]s
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizer/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/FactoryService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/GridLoaderService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/GridService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/GridService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/GridSystemService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HealthCheckService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HealthCheckService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HealthCheckService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HealthCheckService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HintIdProvider/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HintIdProvider/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HintStore/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HintStore/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HintStore/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HomePageResolverService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HomePageResolverService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HomePageResolverService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HomePageResolverService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/LocaleProvider/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TranslationService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TranslationsResolver/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Execution/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/Execution/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Execution/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/Execution/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/InteractionContext/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Interaction/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/Interaction/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ServiceInjector/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/JaxbService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Interaction/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/Interaction/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/LayoutServiceMenu/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
similarity index 91%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
index 76a045b..d07aecb 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/LayoutService/hooks/examples_and_usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
@@ -26,8 +26,8 @@ The table below summarises the choices:
 |===
 
 | Style
-| xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder`]
-| xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`], xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`]
+| xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`]
+| xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`], xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`], xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`]
 
 
 |`COMPLETE`
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/DeepLinkService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsLoaderService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MenuBarsService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MessageService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MessageService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MessageService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MessageService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MetricsService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandSubscriber/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/CommandSubscriber/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/MetaModelServiceMenu/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EntityChangesSubscriber/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EntityChangesSubscriber/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EntityChangesSubscriber/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EntityChangesSubscriber/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EntityPropertyChangeSubscriber/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EntityPropertyChangeSubscriber/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EntityPropertyChangeSubscriber/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EntityPropertyChangeSubscriber/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExecutionSubscriber/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ExecutionSubscriber/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExecutionSubscriber/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ExecutionSubscriber/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCacheControl/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/HintIdProvider/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/HintIdProvider/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/QueryResultsCache/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ServiceRegistry/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/RepositoryService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/RoutingService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
similarity index 86%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
index 8be2235..aaeece1 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad/hooks/implementation.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
@@ -6,4 +6,4 @@
 == Implementation
 
 This framework provides a default implementation of `o.a.i.core.runtimeservices.scratchpad.ScratchpadDefault`.
-This is just an xref:refguide:applib-ant:InteractionScope.adoc[`@InteractionScope`]'d wrapper around a `java.util.Map`
+This is just an xref:system:generated:index/applib/annotation/InteractionScope.adoc[`@InteractionScope`]'d wrapper around a `java.util.Map`
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/Scratchpad/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SessionLoggingService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/ExceptionRecognizerService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SudoServiceListener/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SudoServiceListener/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SudoServiceListener/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SudoServiceListener/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SudoService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SudoService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SudoService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SudoService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/SwaggerService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TableColumnOrderService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/CommandSubscriber/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/CommandSubscriber/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TitleService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TitleService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TitleService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TitleService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UrlEncodingService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UserService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UserService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UserProfileService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/EmailNotificationService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/UserRegistrationService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
similarity index 92%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
index 07ca70a..b2c88c2 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/WrapperFactory/hooks/examples_and_usage.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
@@ -44,7 +44,7 @@ For domain objects (not mixins), the wrapper can be interacted with as follows:
 * any action
 
 Calling any of the above methods may result in a (subclass of) `InteractionException` if the object disallows it.
-For example, if a property is annotated with xref:refguide:applib-ant:ActionLayout.adoc#hidden[`@ActionLayout#hidden`] then a `HiddenException` will be thrown.
+For example, if a property is annotated with xref:system:generated:index/applib/annotation/ActionLayout.adoc#hidden[`@ActionLayout#hidden`] then a `HiddenException` will be thrown.
 Similarly if an action has a xref:refguide:applib-methods:prefixes.adoc[`validateXxx()`] method and the supplied arguments are invalid then an `InvalidException` will be thrown.
 
 In addition, the following methods may also be called:
@@ -54,7 +54,7 @@ In addition, the following methods may also be called:
 
 An exception will be thrown if any other methods are thrown.
 
-If the interface is performed (action invoked or property set), then - irrespective of whether the business rules were checked or skipped - a xref:refguide:applib-ant:Action.adoc#command[command] will be created and pre- and post-execute xref:refguide:applib-ant:Action.adoc#domainEvent[domain event]s) will be fired.
+If the interface is performed (action invoked or property set), then - irrespective of whether the business rules were checked or skipped - a xref:system:generated:index/applib/annotation/Action.adoc#command[command] will be created and pre- and post-execute xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[domain event]s) will be fired.
 
 === Mixins
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TransactionService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionalProcessor/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TransactionalProcessor/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/TransactionalProcessor/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/TransactionalProcessor/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/XmlService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/XmlService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/XmlService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/XmlService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_020-examples-and-usage.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService/hooks/implementation.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_010-implementation.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService/hooks/implementation.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_010-implementation.adoc
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService/hooks/examples_and_usage.adoc b/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
similarity index 100%
rename from api/applib/src/main/adoc/modules/applib-svc/pages/XmlSnapshotService/hooks/examples_and_usage.adoc
rename to antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/system-overview.adoc b/antora/components/system/modules/generated/pages/system-overview.adoc
index 9b4b775..599fc27 100644
--- a/antora/components/system/modules/generated/pages/system-overview.adoc
+++ b/antora/components/system/modules/generated/pages/system-overview.adoc
@@ -5,7 +5,7 @@ These tables summarize all Maven artifacts available with _Apache Isis_.
 
 == Core
 
-[plantuml,Core,svg]
+[plantuml,Core,png]
 ----
 @startuml(id=Core)
 title Core - Containers
@@ -19,7 +19,6 @@ skinparam {
   maxMessageSize 100
 }
 hide stereotype
-left to right direction
 skinparam rectangle<<11>> {
   BackgroundColor #438dd5
   FontColor #fffffe
@@ -136,10 +135,11 @@ Folder: \core
 ----
 |Core framework, providing metamodel, runtime and core APIs.
 
+[%collapsible]
 .Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Core - AppLib
 [source,yaml]
@@ -152,35 +152,36 @@ Folder: \api\applib
 |Isis application library, defining annotations and utilities for the
 default (Java) programming model.
 
+[%collapsible]
 .Components
-****
-o.a.i.applib.annotation.DomainObject +
-o.a.i.applib.annotation.DomainService +
-o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandDto +
-o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto +
-o.a.i.applib.services.commanddto.processor.spi.CommandDtoProcessorServiceIdentity +
-o.a.i.applib.services.publishing.log.CommandLogger +
-o.a.i.applib.services.publishing.log.EntityChangesLogger +
-o.a.i.applib.services.publishing.log.EntityPropertyChangeLogger +
-o.a.i.applib.services.publishing.log.ExecutionLogger +
-o.a.i.applib.services.session.SessionLoggingServiceLogging +
-****
-
-.Dependencies
-****
-com.google.code.findbugs:annotations:jar:<managed> +
-javax:javaee-api:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-schema:jar:<managed> +
-org.assertj:assertj-core:jar:<managed> +
-org.jmock:jmock:jar:<managed> +
-****
-
+====
+* o.a.i.applib.annotation.DomainObject
+* o.a.i.applib.annotation.DomainService
+* o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandDto
+* o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto
+* o.a.i.applib.services.commanddto.processor.spi.CommandDtoProcessorServiceIdentity
+* o.a.i.applib.services.publishing.log.CommandLogger
+* o.a.i.applib.services.publishing.log.EntityChangesLogger
+* o.a.i.applib.services.publishing.log.EntityPropertyChangeLogger
+* o.a.i.applib.services.publishing.log.ExecutionLogger
+* o.a.i.applib.services.session.SessionLoggingServiceLogging
+====
+[%collapsible]
+.Dependencies
+====
+* com.google.code.findbugs:annotations:jar:<managed>
+* javax:javaee-api:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-schema:jar:<managed>
+* org.assertj:assertj-core:jar:<managed>
+* org.jmock:jmock:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/applib/AbstractViewModel.adoc[AbstractViewModel], xref:system:generated:index/applib/Identifier.adoc[Identifier], xref:system:generated:index/applib/IsisModuleApplib.adoc[IsisModuleApplib], xref:system:generated:index/applib/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:system:generated:index/applib/ViewModel.adoc[ViewModel], xref:system:generated:index/applib/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:syst [...]
-****
+====
 
 |Apache Isis Core - Code Gen (ByteBuddy)
 [source,yaml]
@@ -192,17 +193,18 @@ Folder: \core\codegen-bytebuddy
 ----
 |Code generation using ByteBuddy.
 
+[%collapsible]
 .Components
-****
-o.a.i.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy +
-****
-
+====
+* o.a.i.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy
+====
+[%collapsible]
 .Dependencies
-****
-net.bytebuddy:byte-buddy:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.objenesis:objenesis:jar:<managed> +
-****
+====
+* net.bytebuddy:byte-buddy:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.objenesis:objenesis:jar:<managed>
+====
 
 |Apache Isis Core - Configuration
 [source,yaml]
@@ -214,31 +216,33 @@ Folder: \core\config
 ----
 |Isis configuration library for framework internal use.
 
+[%collapsible]
 .Components
-****
-o.a.i.core.config.beans.IsisBeanFactoryPostProcessorForSpring +
-o.a.i.core.config.beans.IsisBeanTypeRegistryDefault +
-o.a.i.core.config.converters.PatternsConverter +
-o.a.i.core.config.environment.IsisLocaleInitializer +
-o.a.i.core.config.environment.IsisSystemEnvironment +
-o.a.i.core.config.environment.IsisTimeZoneInitializer +
-o.a.i.core.config.validators.PatternOptionalStringConstraintValidator +
-o.a.i.core.config.viewer.wicket.WebAppContextPath +
-****
-
-.Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.hibernate.validator:hibernate-validator:jar:<managed> +
-org.springframework.boot:spring-boot-configuration-processor:jar:<managed> +
-****
-
+====
+* o.a.i.core.config.beans.IsisBeanFactoryPostProcessorForSpring
+* o.a.i.core.config.beans.IsisBeanTypeRegistryDefault
+* o.a.i.core.config.converters.PatternsConverter
+* o.a.i.core.config.datasources.DataSourceIntrospectionService
+* o.a.i.core.config.environment.IsisLocaleInitializer
+* o.a.i.core.config.environment.IsisSystemEnvironment
+* o.a.i.core.config.environment.IsisTimeZoneInitializer
+* o.a.i.core.config.validators.PatternOptionalStringConstraintValidator
+* o.a.i.core.config.viewer.wicket.WebAppContextPath
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.hibernate.validator:hibernate-validator:jar:<managed>
+* org.springframework.boot:spring-boot-configuration-processor:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/core/config/datasources/DataSourceIntrospectionService.adoc[DataSourceIntrospectionService]
-****
+====
 
 |Apache Isis Core - Interaction
 [source,yaml]
@@ -252,22 +256,23 @@ Folder: \core\interaction
 Top level action execution or property changes are wrapped in an _Interaction_.
 That typically corresponds to a http request/response cycle or a JUnit test method execution.
 
+[%collapsible]
 .Components
-****
-o.a.i.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler +
-o.a.i.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor +
-****
-
+====
+* o.a.i.core.interaction.integration.InteractionAwareTransactionalBoundaryHandler
+* o.a.i.core.interaction.scope.InteractionScopeBeanFactoryPostProcessor
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/core/interaction/session/InteractionFactory.adoc[InteractionFactory]
-****
+====
 
 |Apache Isis Core - Unit Test Support
 [source,yaml]
@@ -279,25 +284,26 @@ Folder: \core\internaltestsupport
 ----
 |Support for writing unit tests in either JUnit 4 or JUnit 5; should be added as a dependency with scope=test only
 
+[%collapsible]
 .Dependencies
-****
-net.bytebuddy:byte-buddy:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-core-codegen-bytebuddy:jar:<managed> +
-org.assertj:assertj-core:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-org.hamcrest:hamcrest-library:jar:<managed> +
-org.jmock:jmock:jar:<managed> +
-org.jmock:jmock-junit4:jar:<managed> +
-org.junit.jupiter:junit-jupiter-api:jar:<managed> +
-org.junit.jupiter:junit-jupiter-engine:jar:<managed> +
-org.junit.vintage:junit-vintage-engine:jar:<managed> +
-org.mockito:mockito-core:jar:<managed> +
-org.picocontainer:picocontainer:jar:<managed> +
-org.slf4j:slf4j-api:jar:${slf4j-api.version} +
-org.springframework:spring-test:jar:<managed> +
-org.springframework.boot:spring-boot-starter-test:jar:<managed> +
-****
+====
+* net.bytebuddy:byte-buddy:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-core-codegen-bytebuddy:jar:<managed>
+* org.assertj:assertj-core:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+* org.hamcrest:hamcrest-library:jar:<managed>
+* org.jmock:jmock:jar:<managed>
+* org.jmock:jmock-junit4:jar:<managed>
+* org.junit.jupiter:junit-jupiter-api:jar:<managed>
+* org.junit.jupiter:junit-jupiter-engine:jar:<managed>
+* org.junit.vintage:junit-vintage-engine:jar:<managed>
+* org.mockito:mockito-core:jar:<managed>
+* org.picocontainer:picocontainer:jar:<managed>
+* org.slf4j:slf4j-api:jar:${slf4j-api.version}
+* org.springframework:spring-test:jar:<managed>
+* org.springframework.boot:spring-boot-starter-test:jar:<managed>
+====
 
 |Apache Isis Core - MetaModel
 [source,yaml]
@@ -307,49 +313,50 @@ Artifact: isis-core-metamodel
 Type: jar
 Folder: \core\metamodel
 ----
-|.Components
-****
-o.a.i.core.metamodel.facets.schema.IsisSchemaMetaModelRefiner +
-o.a.i.core.metamodel.facets.schema.IsisSchemaValueTypeProvider +
-o.a.i.core.metamodel.objectmanager.ObjectManagerDefault +
-o.a.i.core.metamodel.progmodel.ProgrammingModelInitFilterDefault +
-o.a.i.core.metamodel.services.ServiceInjectorDefault +
-o.a.i.core.metamodel.services.appfeat.ApplicationFeatureFactory +
-o.a.i.core.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault +
-o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorDefault +
-o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorForCollections +
-o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorForDomainObjects +
-o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry +
-o.a.i.core.metamodel.services.events.MetamodelEventService +
-o.a.i.core.metamodel.services.exceprecog.ExceptionRecognizerForRecoverableException +
-o.a.i.core.metamodel.services.grid.GridLoaderServiceDefault +
-o.a.i.core.metamodel.services.grid.GridReaderUsingJaxb +
-o.a.i.core.metamodel.services.grid.GridServiceDefault +
-o.a.i.core.metamodel.services.grid.bootstrap3.GridSystemServiceBS3 +
-o.a.i.core.metamodel.services.layout.LayoutServiceDefault +
-o.a.i.core.metamodel.services.metamodel.MetaModelServiceDefault +
-o.a.i.core.metamodel.services.registry.ServiceRegistryDefault +
-o.a.i.core.metamodel.services.tablecol.TableColumnOrderServiceDefault +
-o.a.i.core.metamodel.services.title.TitleServiceDefault +
-o.a.i.core.metamodel.specloader.InjectorMethodEvaluatorDefault +
-o.a.i.core.metamodel.specloader.ProgrammingModelServiceDefault +
-o.a.i.core.metamodel.specloader.SpecificationLoaderDefault +
-o.a.i.core.metamodel.valuetypes.ValueTypeProviderDefault +
-o.a.i.core.metamodel.valuetypes.ValueTypeProviderForBuiltin +
-o.a.i.core.metamodel.valuetypes.ValueTypeProviderForCollections +
-o.a.i.core.metamodel.valuetypes.ValueTypeRegistry +
-****
-
-.Dependencies
-****
-io.swagger:swagger-core:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-security:jar:<managed> +
-org.hibernate.validator:hibernate-validator:jar:<managed> +
-org.jmock:jmock:jar:<managed> +
-****
+|[%collapsible]
+.Components
+====
+* o.a.i.core.metamodel.facets.schema.IsisSchemaMetaModelRefiner
+* o.a.i.core.metamodel.facets.schema.IsisSchemaValueTypeProvider
+* o.a.i.core.metamodel.objectmanager.ObjectManagerDefault
+* o.a.i.core.metamodel.progmodel.ProgrammingModelInitFilterDefault
+* o.a.i.core.metamodel.services.ServiceInjectorDefault
+* o.a.i.core.metamodel.services.appfeat.ApplicationFeatureFactory
+* o.a.i.core.metamodel.services.appfeat.ApplicationFeatureRepositoryDefault
+* o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorDefault
+* o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorForCollections
+* o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorForDomainObjects
+* o.a.i.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry
+* o.a.i.core.metamodel.services.events.MetamodelEventService
+* o.a.i.core.metamodel.services.exceprecog.ExceptionRecognizerForRecoverableException
+* o.a.i.core.metamodel.services.grid.GridLoaderServiceDefault
+* o.a.i.core.metamodel.services.grid.GridReaderUsingJaxb
+* o.a.i.core.metamodel.services.grid.GridServiceDefault
+* o.a.i.core.metamodel.services.grid.bootstrap3.GridSystemServiceBS3
+* o.a.i.core.metamodel.services.layout.LayoutServiceDefault
+* o.a.i.core.metamodel.services.metamodel.MetaModelServiceDefault
+* o.a.i.core.metamodel.services.registry.ServiceRegistryDefault
+* o.a.i.core.metamodel.services.tablecol.TableColumnOrderServiceDefault
+* o.a.i.core.metamodel.services.title.TitleServiceDefault
+* o.a.i.core.metamodel.specloader.InjectorMethodEvaluatorDefault
+* o.a.i.core.metamodel.specloader.ProgrammingModelServiceDefault
+* o.a.i.core.metamodel.specloader.SpecificationLoaderDefault
+* o.a.i.core.metamodel.valuetypes.ValueTypeProviderDefault
+* o.a.i.core.metamodel.valuetypes.ValueTypeProviderForBuiltin
+* o.a.i.core.metamodel.valuetypes.ValueTypeProviderForCollections
+* o.a.i.core.metamodel.valuetypes.ValueTypeRegistry
+====
+[%collapsible]
+.Dependencies
+====
+* io.swagger:swagger-core:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-security:jar:<managed>
+* org.hibernate.validator:hibernate-validator:jar:<managed>
+* org.jmock:jmock:jar:<managed>
+====
 
 |Apache Isis Core - Runtime
 [source,yaml]
@@ -361,19 +368,20 @@ Folder: \core\runtime
 ----
 |Bundles framework internal services, utilities and events.
 
+[%collapsible]
 .Components
-****
-o.a.i.core.runtime.events.AppLifecycleEventService +
-o.a.i.core.runtime.events.TransactionEventEmitter +
-****
-
+====
+* o.a.i.core.runtime.events.MetamodelEventService
+* o.a.i.core.runtime.events.TransactionEventEmitter
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-interaction:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.core:isis-core-transaction:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-core-interaction:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.core:isis-core-transaction:jar:<managed>
+====
 
 |Apache Isis Core - Runtime Services
 [source,yaml]
@@ -385,57 +393,59 @@ Folder: \core\runtimeservices
 ----
 |Introduced to keep the 'runtime' package concise. Viewers don't have dependencies on this module.
 
+[%collapsible]
 .Components
-****
-o.a.i.core.runtimeservices.bookmarks.BookmarkServiceDefault +
-o.a.i.core.runtimeservices.clock.ClockServiceDefault +
-o.a.i.core.runtimeservices.command.CommandDtoServiceInternalDefault +
-o.a.i.core.runtimeservices.command.CommandExecutorServiceDefault +
-o.a.i.core.runtimeservices.confmenu.ConfigurationViewServiceDefault +
-o.a.i.core.runtimeservices.email.EmailServiceDefault +
-o.a.i.core.runtimeservices.eventbus.EventBusServiceSpring +
-o.a.i.core.runtimeservices.exceprecog.ExceptionRecognizerServiceDefault +
-o.a.i.core.runtimeservices.executor.MemberExecutorServiceDefault +
-o.a.i.core.runtimeservices.factory.FactoryServiceDefault +
-o.a.i.core.runtimeservices.homepage.HomePageResolverServiceDefault +
-o.a.i.core.runtimeservices.i18n.po.TranslationServicePo +
-o.a.i.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault +
-o.a.i.core.runtimeservices.jaxb.JaxbServiceDefault +
-o.a.i.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault +
-o.a.i.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3 +
-o.a.i.core.runtimeservices.message.MessageServiceDefault +
-o.a.i.core.runtimeservices.publish.CommandPublisherDefault +
-o.a.i.core.runtimeservices.publish.EntityChangesPublisherDefault +
-o.a.i.core.runtimeservices.publish.EntityPropertyChangePublisherDefault +
-o.a.i.core.runtimeservices.publish.ExecutionPublisherDefault +
-o.a.i.core.runtimeservices.queryresultscache.QueryResultsCacheDefault +
-o.a.i.core.runtimeservices.repository.RepositoryServiceDefault +
-o.a.i.core.runtimeservices.routing.RoutingServiceDefault +
-o.a.i.core.runtimeservices.scratchpad.ScratchpadDefault +
-o.a.i.core.runtimeservices.session.InteractionFactoryDefault +
-o.a.i.core.runtimeservices.sudo.SudoServiceDefault +
-o.a.i.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression +
-o.a.i.core.runtimeservices.user.UserServiceDefault +
-o.a.i.core.runtimeservices.userprof.UserProfileServiceDefault +
-o.a.i.core.runtimeservices.userreg.EmailNotificationServiceDefault +
-o.a.i.core.runtimeservices.wrapper.WrapperFactoryDefault +
-o.a.i.core.runtimeservices.xactn.TransactionServiceSpring +
-o.a.i.core.runtimeservices.xml.XmlServiceDefault +
-o.a.i.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-codegen-bytebuddy:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.hsqldb:hsqldb:jar:<managed> +
-****
-
+====
+* o.a.i.core.runtimeservices.bookmarks.BookmarkServiceDefault
+* o.a.i.core.runtimeservices.clock.ClockServiceDefault
+* o.a.i.core.runtimeservices.command.CommandDtoServiceInternalDefault
+* o.a.i.core.runtimeservices.command.CommandExecutorServiceDefault
+* o.a.i.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
+* o.a.i.core.runtimeservices.email.EmailServiceDefault
+* o.a.i.core.runtimeservices.eventbus.EventBusServiceSpring
+* o.a.i.core.runtimeservices.executor.MemberExecutorServiceDefault
+* o.a.i.core.runtimeservices.factory.FactoryServiceDefault
+* o.a.i.core.runtimeservices.homepage.HomePageResolverServiceDefault
+* o.a.i.core.runtimeservices.i18n.po.TranslationServicePo
+* o.a.i.core.runtimeservices.interaction.InteractionDtoServiceInternalDefault
+* o.a.i.core.runtimeservices.jaxb.JaxbServiceDefault
+* o.a.i.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault
+* o.a.i.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3
+* o.a.i.core.runtimeservices.message.MessageServiceDefault
+* o.a.i.core.runtimeservices.publish.CommandPublisherDefault
+* o.a.i.core.runtimeservices.publish.EntityChangesPublisherDefault
+* o.a.i.core.runtimeservices.publish.EntityPropertyChangePublisherDefault
+* o.a.i.core.runtimeservices.publish.ExecutionPublisherDefault
+* o.a.i.core.runtimeservices.queryresultscache.QueryResultsCacheDefault
+* o.a.i.core.runtimeservices.recognizer.ExceptionRecognizerServiceDefault
+* o.a.i.core.runtimeservices.recognizer.dae.ExceptionRecognizerForDataAccessException
+* o.a.i.core.runtimeservices.repository.RepositoryServiceDefault
+* o.a.i.core.runtimeservices.routing.RoutingServiceDefault
+* o.a.i.core.runtimeservices.scratchpad.ScratchpadDefault
+* o.a.i.core.runtimeservices.session.InteractionFactoryDefault
+* o.a.i.core.runtimeservices.sudo.SudoServiceDefault
+* o.a.i.core.runtimeservices.transaction.TransactionServiceSpring
+* o.a.i.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression
+* o.a.i.core.runtimeservices.user.UserServiceDefault
+* o.a.i.core.runtimeservices.userprof.UserProfileServiceDefault
+* o.a.i.core.runtimeservices.userreg.EmailNotificationServiceDefault
+* o.a.i.core.runtimeservices.wrapper.WrapperFactoryDefault
+* o.a.i.core.runtimeservices.xml.XmlServiceDefault
+* o.a.i.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-codegen-bytebuddy:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.hsqldb:hsqldb:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/core/runtimeservices/transaction/TransactionServiceSpring.adoc[TransactionServiceSpring], xref:system:generated:index/core/runtimeservices/xml/XmlServiceDefault.adoc[XmlServiceDefault]
-****
+====
 
 |Apache Isis Core - Security
 [source,yaml]
@@ -445,22 +455,23 @@ Artifact: isis-core-security
 Type: jar
 Folder: \core\security
 ----
-|.Components
-****
-o.a.i.core.security.authentication.manager.AuthenticationManager +
-o.a.i.core.security.authentication.standard.RandomCodeGeneratorDefault +
-o.a.i.core.security.authorization.manager.AuthorizationManager +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.core.security.authentication.manager.AuthenticationManager
+* o.a.i.core.security.authentication.standard.RandomCodeGeneratorDefault
+* o.a.i.core.security.authorization.manager.AuthorizationManager
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.hamcrest:hamcrest-library:jar:<managed> +
-org.junit.jupiter:junit-jupiter-api:jar:<managed> +
-org.junit.jupiter:junit-jupiter-engine:jar:<managed> +
-org.junit.vintage:junit-vintage-engine:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.hamcrest:hamcrest-library:jar:<managed>
+* org.junit.jupiter:junit-jupiter-api:jar:<managed>
+* org.junit.jupiter:junit-jupiter-engine:jar:<managed>
+* org.junit.vintage:junit-vintage-engine:jar:<managed>
+====
 
 |Apache Isis Core - Transaction
 [source,yaml]
@@ -473,22 +484,23 @@ Folder: \core\transaction
 |Provides transaction integration with Spring and also
 entity change tracking, with associated publishing and pre/post value events.
 
+[%collapsible]
 .Components
-****
-o.a.i.core.transaction.changetracking.EntityChangeTrackerDefault +
-o.a.i.core.transaction.changetracking.events.TimestampService +
-****
-
+====
+* o.a.i.core.transaction.changetracking.EntityChangeTrackerDefault
+* o.a.i.core.transaction.changetracking.events.TimestampService
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc[EntityChangeTrackerDefault], xref:system:generated:index/core/transaction/events/TransactionAfterCompletionEvent.adoc[TransactionAfterCompletionEvent]
-****
+====
 
 |Apache Isis Core - WebApp
 [source,yaml]
@@ -501,25 +513,26 @@ Folder: \core\webapp
 |Bundles all the web specific classes a srequired by viewers.
 Introduced to keep the 'runtime' package concise.
 
+[%collapsible]
 .Components
-****
-o.a.i.core.webapp.health.HealthIndicatorUsingHealthCheckService +
-o.a.i.core.webapp.modules.logonlog.WebModuleLogOnExceptionLogger +
-o.a.i.core.webapp.modules.templresources.WebModuleTemplateResources +
-o.a.i.core.webapp.webappctx.IsisWebAppContextInitializer +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-interaction:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.core:isis-core-transaction:jar:<managed> +
-org.springframework:spring-web:jar:<managed> +
-org.springframework.boot:spring-boot:jar:<managed> +
-org.springframework.boot:spring-boot-actuator:jar:<managed> +
-org.springframework.boot:spring-boot-starter-thymeleaf:jar:<managed> +
-****
+====
+* o.a.i.core.webapp.health.HealthIndicatorUsingHealthCheckService
+* o.a.i.core.webapp.modules.logonlog.WebModuleLogOnExceptionLogger
+* o.a.i.core.webapp.modules.templresources.WebModuleTemplateResources
+* o.a.i.core.webapp.webappctx.IsisWebAppContextInitializer
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-interaction:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.core:isis-core-transaction:jar:<managed>
+* org.springframework:spring-web:jar:<managed>
+* org.springframework.boot:spring-boot:jar:<managed>
+* org.springframework.boot:spring-boot-actuator:jar:<managed>
+* org.springframework.boot:spring-boot-starter-thymeleaf:jar:<managed>
+====
 
 |Apache Isis - JDK Supplemental
 [source,yaml]
@@ -535,18 +548,19 @@ had been removed with later JDK versions.
 Will be removed once the framework migrates to Java 11 as the required
 minimum version.
 
+[%collapsible]
 .Dependencies
-****
-com.fasterxml.woodstox:woodstox-core:jar:<managed> +
-com.sun.xml.bind:jaxb-core:jar:<managed> +
-com.sun.xml.bind:jaxb-impl:jar:<managed> +
-com.sun.xml.ws:jaxws-ri:pom:<managed> +
-com.sun.xml.ws:jaxws-rt:jar:${jaxws-ri.version} +
-javax.xml.bind:jaxb-api:jar:<managed> +
-org.codehaus.woodstox:stax2-api:jar:<managed> +
-org.eclipse.persistence:org.eclipse.persistence.moxy:jar:<managed> +
-org.eclipse.persistence:org.eclipse.persistence.sdo:jar:<managed> +
-****
+====
+* com.fasterxml.woodstox:woodstox-core:jar:<managed>
+* com.sun.xml.bind:jaxb-core:jar:<managed>
+* com.sun.xml.bind:jaxb-impl:jar:<managed>
+* com.sun.xml.ws:jaxws-ri:pom:<managed>
+* com.sun.xml.ws:jaxws-rt:jar:${jaxws-ri.version}
+* javax.xml.bind:jaxb-api:jar:<managed>
+* org.codehaus.woodstox:stax2-api:jar:<managed>
+* org.eclipse.persistence:org.eclipse.persistence.moxy:jar:<managed>
+* org.eclipse.persistence:org.eclipse.persistence.sdo:jar:<managed>
+====
 
 |Apache Isis Core - Schemas
 [source,yaml]
@@ -558,21 +572,22 @@ Folder: \api\schema
 ----
 |Apache Isis schemas, for conversion into canonical DTOs (for use in integration scenarios).
 
+[%collapsible]
 .Dependencies
-****
-joda-time:joda-time:jar:<managed> +
-org.springframework:spring-context:jar:<managed> +
-****
-
+====
+* joda-time:joda-time:jar:<managed>
+* org.springframework:spring-context:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/schema/IsisModuleSchema.adoc[IsisModuleSchema]
-****
+====
 |===
 
 == Other
 
-[plantuml,Other,svg]
+[plantuml,Other,png]
 ----
 @startuml(id=Other)
 title Other - Containers
@@ -586,7 +601,6 @@ skinparam {
   maxMessageSize 100
 }
 hide stereotype
-left to right direction
 skinparam rectangle<<88>> {
   BackgroundColor #438dd5
   FontColor #fffffe
@@ -642,22 +656,22 @@ skinparam rectangle<<90>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<91>> {
+skinparam rectangle<<118>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<118>> {
+skinparam rectangle<<91>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<119>> {
+skinparam rectangle<<92>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<92>> {
+skinparam rectangle<<119>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -697,12 +711,12 @@ skinparam rectangle<<98>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<11>> {
+skinparam rectangle<<99>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<99>> {
+skinparam rectangle<<11>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -792,12 +806,12 @@ skinparam rectangle<<4>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<5>> {
+skinparam rectangle<<126>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<126>> {
+skinparam rectangle<<5>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -812,12 +826,12 @@ skinparam rectangle<<127>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<128>> {
+skinparam rectangle<<7>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<7>> {
+skinparam rectangle<<128>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -1372,12 +1386,12 @@ skinparam rectangle<<106>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<80>> {
+skinparam rectangle<<107>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<107>> {
+skinparam rectangle<<80>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -1842,27 +1856,28 @@ Folder: \commons
 ----
 |Apache Isis Commons is a library with utilities, that are shared with the entire Apache Isis ecosystem.
 
+[%collapsible]
 .Dependencies
-****
-com.fasterxml.jackson.core:jackson-databind:jar:<managed> +
-com.google.code.findbugs:annotations:jar:<managed> +
-javax:javaee-api:jar:<managed> +
-org.junit.jupiter:junit-jupiter-api:jar:<managed> +
-org.junit.jupiter:junit-jupiter-engine:jar:<managed> +
-org.junit.jupiter:junit-jupiter-params:jar:<managed> +
-org.junit.vintage:junit-vintage-engine:jar:<managed> +
-org.slf4j:slf4j-api:jar:<managed> +
-org.springframework:spring-context:jar:<managed> +
-org.springframework:spring-tx:jar:<managed> +
-org.springframework.boot:spring-boot-starter:jar:<managed> +
-org.springframework.boot:spring-boot-starter-log4j2:jar:<managed> +
-org.yaml:snakeyaml:jar:<managed> +
-****
-
+====
+* com.fasterxml.jackson.core:jackson-databind:jar:<managed>
+* com.google.code.findbugs:annotations:jar:<managed>
+* javax:javaee-api:jar:<managed>
+* org.junit.jupiter:junit-jupiter-api:jar:<managed>
+* org.junit.jupiter:junit-jupiter-engine:jar:<managed>
+* org.junit.jupiter:junit-jupiter-params:jar:<managed>
+* org.junit.vintage:junit-vintage-engine:jar:<managed>
+* org.slf4j:slf4j-api:jar:<managed>
+* org.springframework:spring-context:jar:<managed>
+* org.springframework:spring-tx:jar:<managed>
+* org.springframework.boot:spring-boot-starter:jar:<managed>
+* org.springframework.boot:spring-boot-starter-log4j2:jar:<managed>
+* org.yaml:snakeyaml:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/commons/collections/Can.adoc[Can], xref:system:generated:index/commons/collections/Cardinality.adoc[Cardinality], xref:system:generated:index/commons/functional/Result.adoc[Result], xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId], xref:system:generated:index/commons/having/HasUpdatedAt.adoc[HasUpdatedAt], xref:system:generated:index/commons/having/HasUpdatedBy.adoc[HasUpdatedBy], xref:system:generated:index/commons/having/HasUsername.a [...]
-****
+====
 
 |Demo - Parent
 [source,yaml]
@@ -1872,24 +1887,25 @@ Artifact: demo-parent
 Type: pom
 Folder: \examples\demo
 ----
-|.Dependencies
-****
-com.h2database:h2:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-exceldownload-ui:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-modelannotation:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-persistence-jdo-dn5:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-persistence-jdo-dn5:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-sse-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* com.h2database:h2:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-exceldownload-ui:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-modelannotation:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-persistence-jdo-dn5:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-persistence-jdo-dn5:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-sse-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Demo - Domain
 [source,yaml]
@@ -1899,188 +1915,189 @@ Artifact: demo-domain
 Type: jar
 Folder: \examples\demo\domain
 ----
-|.Components
-****
-demoapp.dom.AppConfiguration +
-demoapp.dom._infra.DefaultTitleProvider +
-demoapp.dom._infra.LibraryPreloadingService +
-demoapp.dom._infra.fixtures.DemoFixtureScriptSpecificationProvider +
-demoapp.dom._infra.resources.AsciiDocConverterService +
-demoapp.dom._infra.resources.AsciiDocReaderService +
-demoapp.dom._infra.resources.MarkdownReaderService +
-demoapp.dom._infra.resources.MarkupReaderService +
-demoapp.dom._infra.resources.MarkupVariableResolverService +
-demoapp.dom._infra.resources.ResourceReaderService +
-demoapp.dom._infra.samples.NameSamples +
-demoapp.dom._infra.urlencoding.UrlEncodingServiceNaiveInMemory +
-demoapp.dom.domain._changes.EntityChangesSubscriberToCaptureChangesInMemory +
-demoapp.dom.domain._commands.ExposePersistedCommands$TableColumnOrderDefault +
-demoapp.dom.domain._interactions.ExecutionListenerToCaptureInteractionsInMemory +
-demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoEntities +
-demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoSeedService +
-demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoEntities +
-demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoSeedService +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoSeedService +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoSeedService +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoSeedService +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities +
-demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoSeedService +
-demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.ChildJdoEntities +
-demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.seed.ChildJdoSeedService +
-demoapp.dom.domain.objects.other.embedded.NumberConstantJdoRepository +
-demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoEntities +
-demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoSeedService +
-demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoEntities +
-demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoSeedService +
-demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoEntities +
-demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoSeedService +
-demoapp.dom.domain.properties.PropertyLayout.navigable.FileTreeNodeService +
-demoapp.dom.domain.properties.PropertyLayout.repainting.PdfJsViewerAdvisorFallback +
-demoapp.dom.featured.customui.geocoding.GeoapifyClient +
-demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoImplementation +
-demoapp.dom.services.core.eventbusservice.EventLogEntryJdoRepository +
-demoapp.dom.services.core.eventbusservice.EventSubscriberDemoImplementation +
-demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoEntities +
-demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoSeedService +
-demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo +
-demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdoEntities +
-demoapp.dom.services.extensions.secman.apptenancy.entities.seed.TenantedJdoSeedService +
-demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities +
-demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoSeedService +
-demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples +
-demoapp.dom.types.isis.clobs.jdo.IsisClobJdoEntities +
-demoapp.dom.types.isis.clobs.jdo.IsisClobJdoSeedService +
-demoapp.dom.types.isis.clobs.samples.IsisClobsSamples +
-demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoEntities +
-demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoSeedService +
-demoapp.dom.types.isis.localresourcepaths.samples.IsisLocalResourcePathsSamples +
-demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoEntities +
-demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoSeedService +
-demoapp.dom.types.isis.markups.samples.IsisMarkupSamples +
-demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoEntities +
-demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoSeedService +
-demoapp.dom.types.isis.passwords.samples.IsisPasswordsSamples +
-demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoEntities +
-demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoSeedService +
-demoapp.dom.types.isisext.asciidocs.samples.IsisAsciiDocSamples +
-demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoEntities +
-demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoSeedService +
-demoapp.dom.types.isisext.markdowns.samples.IsisMarkdownSamples +
-demoapp.dom.types.javaawt.images.jdo.JavaAwtImageJdoEntities +
-demoapp.dom.types.javaawt.images.jdo.JavaAwtImageJdoSeedService +
-demoapp.dom.types.javaawt.images.samples.JavaAwtImageService +
-demoapp.dom.types.javaawt.images.samples.JavaAwtImagesSamples +
-demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoEntities +
-demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoSeedService +
-demoapp.dom.types.javalang.booleans.samples.WrapperBooleanSamples +
-demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoEntities +
-demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoSeedService +
-demoapp.dom.types.javalang.bytes.samples.WrapperByteSamples +
-demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoEntities +
-demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoSeedService +
-demoapp.dom.types.javalang.characters.samples.WrapperCharacterSamples +
-demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoEntities +
-demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoSeedService +
-demoapp.dom.types.javalang.doubles.samples.WrapperDoubleSamples +
-demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoEntities +
-demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoSeedService +
-demoapp.dom.types.javalang.floats.samples.WrapperFloatSamples +
-demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoEntities +
-demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoSeedService +
-demoapp.dom.types.javalang.integers.samples.WrapperIntegerSamples +
-demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoEntities +
-demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoSeedService +
-demoapp.dom.types.javalang.longs.samples.WrapperLongSamples +
-demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoEntities +
-demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoSeedService +
-demoapp.dom.types.javalang.shorts.samples.WrapperShortSamples +
-demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoEntities +
-demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoSeedService +
-demoapp.dom.types.javalang.strings.samples.JavaLangStringSamples +
-demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoEntities +
-demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoSeedService +
-demoapp.dom.types.javamath.bigdecimals.samples.JavaMathBigDecimalSamples +
-demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoEntities +
-demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoSeedService +
-demoapp.dom.types.javamath.bigintegers.samples.JavaMathBigIntegerSamples +
-demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoEntities +
-demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoSeedService +
-demoapp.dom.types.javanet.urls.samples.JavaNetUrlSamples +
-demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoEntities +
-demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoSeedService +
-demoapp.dom.types.javasql.javasqldate.samples.JavaSqlDateSamples +
-demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoEntities +
-demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoSeedService +
-demoapp.dom.types.javasql.javasqltimestamp.samples.JavaSqlTimestampSamples +
-demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoEntities +
-demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoSeedService +
-demoapp.dom.types.javatime.javatimelocaldate.samples.JavaTimeLocalDateSamples +
-demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoEntities +
-demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoSeedService +
-demoapp.dom.types.javatime.javatimelocaldatetime.samples.JavaTimeLocalDateTimeSamples +
-demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoEntities +
-demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoSeedService +
-demoapp.dom.types.javatime.javatimeoffsetdatetime.samples.JavaTimeOffsetDateTimeSamples +
-demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoEntities +
-demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoSeedService +
-demoapp.dom.types.javatime.javatimeoffsettime.samples.JavaTimeOffsetTimeSamples +
-demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoEntities +
-demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoSeedService +
-demoapp.dom.types.javatime.javatimezoneddatetime.samples.JavaTimeZonedDateTimeSamples +
-demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoEntities +
-demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoSeedService +
-demoapp.dom.types.javautil.javautildate.samples.JavaUtilDateSamples +
-demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoEntities +
-demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoSeedService +
-demoapp.dom.types.javautil.uuids.samples.JavaUtilUuidSamples +
-demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoEntities +
-demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoSeedService +
-demoapp.dom.types.jodatime.jodadatetime.samples.JodaDateTimeSamples +
-demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoEntities +
-demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoSeedService +
-demoapp.dom.types.jodatime.jodalocaldate.samples.JodaLocalDateSamples +
-demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoEntities +
-demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoSeedService +
-demoapp.dom.types.jodatime.jodalocaldatetime.samples.JodaLocalDateTimeSamples +
-demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoEntities +
-demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoSeedService +
-demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoEntities +
-demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoSeedService +
-demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoEntities +
-demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoSeedService +
-demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoEntities +
-demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoSeedService +
-demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoEntities +
-demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoSeedService +
-demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoEntities +
-demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoSeedService +
-demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoEntities +
-demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoSeedService +
-demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities +
-demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoSeedService +
-****
-
-.Dependencies
-****
-com.h2database:h2:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-exceldownload-ui:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-modelannotation:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-pdfjs-applib:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed> +
-org.apache.isis.testing:isis-testing-h2console-ui:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed> +
-org.assertj:assertj-core:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-org.springframework.boot:spring-boot-configuration-processor:jar:<managed> +
-****
+|[%collapsible]
+.Components
+====
+* demoapp.dom.AppConfiguration
+* demoapp.dom._infra.DefaultTitleProvider
+* demoapp.dom._infra.LibraryPreloadingService
+* demoapp.dom._infra.fixtures.DemoFixtureScriptSpecificationProvider
+* demoapp.dom._infra.resources.AsciiDocConverterService
+* demoapp.dom._infra.resources.AsciiDocReaderService
+* demoapp.dom._infra.resources.MarkdownReaderService
+* demoapp.dom._infra.resources.MarkupReaderService
+* demoapp.dom._infra.resources.MarkupVariableResolverService
+* demoapp.dom._infra.resources.ResourceReaderService
+* demoapp.dom._infra.samples.NameSamples
+* demoapp.dom._infra.urlencoding.UrlEncodingServiceNaiveInMemory
+* demoapp.dom.domain._changes.EntityChangesSubscriberToCaptureChangesInMemory
+* demoapp.dom.domain._commands.ExposePersistedCommands$TableColumnOrderDefault
+* demoapp.dom.domain._interactions.ExecutionListenerToCaptureInteractionsInMemory
+* demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoEntities
+* demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoSeedService
+* demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoEntities
+* demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoSeedService
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoEntities
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoSeedService
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoEntities
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoSeedService
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoEntities
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoSeedService
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities
+* demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoSeedService
+* demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.ChildJdoEntities
+* demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.seed.ChildJdoSeedService
+* demoapp.dom.domain.objects.other.embedded.NumberConstantJdoRepository
+* demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoEntities
+* demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoSeedService
+* demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoEntities
+* demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoSeedService
+* demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoEntities
+* demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoSeedService
+* demoapp.dom.domain.properties.PropertyLayout.navigable.FileTreeNodeService
+* demoapp.dom.domain.properties.PropertyLayout.repainting.PdfJsViewerAdvisorFallback
+* demoapp.dom.featured.customui.geocoding.GeoapifyClient
+* demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoImplementation
+* demoapp.dom.services.core.eventbusservice.EventLogEntryJdoRepository
+* demoapp.dom.services.core.eventbusservice.EventSubscriberDemoImplementation
+* demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoEntities
+* demoapp.dom.services.core.wrapperFactory.WrapperFactoryJdoSeedService
+* demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo
+* demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdoEntities
+* demoapp.dom.services.extensions.secman.apptenancy.entities.seed.TenantedJdoSeedService
+* demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities
+* demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoSeedService
+* demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples
+* demoapp.dom.types.isis.clobs.jdo.IsisClobJdoEntities
+* demoapp.dom.types.isis.clobs.jdo.IsisClobJdoSeedService
+* demoapp.dom.types.isis.clobs.samples.IsisClobsSamples
+* demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoEntities
+* demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoSeedService
+* demoapp.dom.types.isis.localresourcepaths.samples.IsisLocalResourcePathsSamples
+* demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoEntities
+* demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoSeedService
+* demoapp.dom.types.isis.markups.samples.IsisMarkupSamples
+* demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoEntities
+* demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoSeedService
+* demoapp.dom.types.isis.passwords.samples.IsisPasswordsSamples
+* demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoEntities
+* demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoSeedService
+* demoapp.dom.types.isisext.asciidocs.samples.IsisAsciiDocSamples
+* demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoEntities
+* demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoSeedService
+* demoapp.dom.types.isisext.markdowns.samples.IsisMarkdownSamples
+* demoapp.dom.types.javaawt.images.jdo.JavaAwtImageJdoEntities
+* demoapp.dom.types.javaawt.images.jdo.JavaAwtImageJdoSeedService
+* demoapp.dom.types.javaawt.images.samples.JavaAwtImageService
+* demoapp.dom.types.javaawt.images.samples.JavaAwtImagesSamples
+* demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoEntities
+* demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoSeedService
+* demoapp.dom.types.javalang.booleans.samples.WrapperBooleanSamples
+* demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoEntities
+* demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoSeedService
+* demoapp.dom.types.javalang.bytes.samples.WrapperByteSamples
+* demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoEntities
+* demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoSeedService
+* demoapp.dom.types.javalang.characters.samples.WrapperCharacterSamples
+* demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoEntities
+* demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoSeedService
+* demoapp.dom.types.javalang.doubles.samples.WrapperDoubleSamples
+* demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoEntities
+* demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoSeedService
+* demoapp.dom.types.javalang.floats.samples.WrapperFloatSamples
+* demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoEntities
+* demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoSeedService
+* demoapp.dom.types.javalang.integers.samples.WrapperIntegerSamples
+* demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoEntities
+* demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoSeedService
+* demoapp.dom.types.javalang.longs.samples.WrapperLongSamples
+* demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoEntities
+* demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoSeedService
+* demoapp.dom.types.javalang.shorts.samples.WrapperShortSamples
+* demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoEntities
+* demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoSeedService
+* demoapp.dom.types.javalang.strings.samples.JavaLangStringSamples
+* demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoEntities
+* demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoSeedService
+* demoapp.dom.types.javamath.bigdecimals.samples.JavaMathBigDecimalSamples
+* demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoEntities
+* demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoSeedService
+* demoapp.dom.types.javamath.bigintegers.samples.JavaMathBigIntegerSamples
+* demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoEntities
+* demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoSeedService
+* demoapp.dom.types.javanet.urls.samples.JavaNetUrlSamples
+* demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoEntities
+* demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoSeedService
+* demoapp.dom.types.javasql.javasqldate.samples.JavaSqlDateSamples
+* demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoEntities
+* demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoSeedService
+* demoapp.dom.types.javasql.javasqltimestamp.samples.JavaSqlTimestampSamples
+* demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoEntities
+* demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoSeedService
+* demoapp.dom.types.javatime.javatimelocaldate.samples.JavaTimeLocalDateSamples
+* demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoEntities
+* demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoSeedService
+* demoapp.dom.types.javatime.javatimelocaldatetime.samples.JavaTimeLocalDateTimeSamples
+* demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoEntities
+* demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoSeedService
+* demoapp.dom.types.javatime.javatimeoffsetdatetime.samples.JavaTimeOffsetDateTimeSamples
+* demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoEntities
+* demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoSeedService
+* demoapp.dom.types.javatime.javatimeoffsettime.samples.JavaTimeOffsetTimeSamples
+* demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoEntities
+* demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoSeedService
+* demoapp.dom.types.javatime.javatimezoneddatetime.samples.JavaTimeZonedDateTimeSamples
+* demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoEntities
+* demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoSeedService
+* demoapp.dom.types.javautil.javautildate.samples.JavaUtilDateSamples
+* demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoEntities
+* demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoSeedService
+* demoapp.dom.types.javautil.uuids.samples.JavaUtilUuidSamples
+* demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoEntities
+* demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoSeedService
+* demoapp.dom.types.jodatime.jodadatetime.samples.JodaDateTimeSamples
+* demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoEntities
+* demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoSeedService
+* demoapp.dom.types.jodatime.jodalocaldate.samples.JodaLocalDateSamples
+* demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoEntities
+* demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoSeedService
+* demoapp.dom.types.jodatime.jodalocaldatetime.samples.JodaLocalDateTimeSamples
+* demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoEntities
+* demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoSeedService
+* demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoEntities
+* demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoSeedService
+* demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoEntities
+* demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoSeedService
+* demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoEntities
+* demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoSeedService
+* demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoEntities
+* demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoSeedService
+* demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoEntities
+* demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoSeedService
+* demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoEntities
+* demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoSeedService
+* demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities
+* demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoSeedService
+====
+[%collapsible]
+.Dependencies
+====
+* com.h2database:h2:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-exceldownload-ui:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-modelannotation:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-pdfjs-applib:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed>
+* org.apache.isis.testing:isis-testing-h2console-ui:jar:<managed>
+* org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed>
+* org.assertj:assertj-core:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+* org.springframework.boot:spring-boot-configuration-processor:jar:<managed>
+====
 
 |Demo - JavaFX
 [source,yaml]
@@ -2090,23 +2107,24 @@ Artifact: demo-javafx
 Type: jar
 Folder: \examples\demo\javafx
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.core:isis-core-security:jar:<managed> +
-org.apache.isis.examples.apps:demo-domain:jar:${project.version} +
-org.apache.isis.incubator.viewer:isis-viewer-javafx-viewer:jar:${project.version} +
-org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.security:isis-security-bypass:jar:<managed> +
-org.apache.isis.security:isis-security-shiro:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui:pom:${project.version} +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-ui:pom:${project.version} +
-org.projectlombok:lombok:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.core:isis-core-security:jar:<managed>
+* org.apache.isis.examples.apps:demo-domain:jar:${project.version}
+* org.apache.isis.incubator.viewer:isis-viewer-javafx-viewer:jar:${project.version}
+* org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.security:isis-security-bypass:jar:<managed>
+* org.apache.isis.security:isis-security-shiro:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui:pom:${project.version}
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-ui:pom:${project.version}
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Demo - Vaadin
 [source,yaml]
@@ -2116,17 +2134,18 @@ Artifact: demo-vaadin
 Type: jar
 Folder: \examples\demo\vaadin
 ----
-|.Dependencies
-****
-org.apache.isis.examples.apps:demo-web:jar:${project.version} +
-org.apache.isis.incubator.viewer:isis-viewer-vaadin-viewer:jar:${project.version} +
-org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui-vaa:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui-wkt:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-ui-wkt:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-sse-ui-wkt:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.examples.apps:demo-web:jar:${project.version}
+* org.apache.isis.incubator.viewer:isis-viewer-vaadin-viewer:jar:${project.version}
+* org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui-vaa:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui-wkt:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-ui-wkt:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-sse-ui-wkt:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Demo - Web
 [source,yaml]
@@ -2136,22 +2155,23 @@ Artifact: demo-web
 Type: jar
 Folder: \examples\demo\web
 ----
-|.Components
-****
-demoapp.web._infra.utils.ThereCanBeOnlyOne +
-****
-
+|[%collapsible]
+.Components
+====
+* demoapp.web._infra.utils.ThereCanBeOnlyOne
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.examples.apps:demo-domain:jar:${project.version} +
-org.apache.isis.extensions:isis-extensions-command-replay-primary:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-command-replay-secondary:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed> +
-org.springframework.boot:spring-boot-starter:jar:<managed> +
-org.springframework.boot:spring-boot-starter-actuator:jar:<managed> +
-org.springframework.boot:spring-boot-starter-log4j2:jar:<managed> +
-****
+====
+* org.apache.isis.examples.apps:demo-domain:jar:${project.version}
+* org.apache.isis.extensions:isis-extensions-command-replay-primary:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-command-replay-secondary:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed>
+* org.springframework.boot:spring-boot-starter:jar:<managed>
+* org.springframework.boot:spring-boot-starter-actuator:jar:<managed>
+* org.springframework.boot:spring-boot-starter-log4j2:jar:<managed>
+====
 
 |Demo - Wicket
 [source,yaml]
@@ -2161,22 +2181,23 @@ Artifact: demo-wicket
 Type: jar
 Folder: \examples\demo\wicket
 ----
-|.Components
-****
-demoapp.webapp.wicket.ui.custom.WhereInTheWorldPanelFactory +
-****
-
+|[%collapsible]
+.Components
+====
+* demoapp.webapp.wicket.ui.custom.WhereInTheWorldPanelFactory
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.examples.apps:demo-web:jar:${project.version} +
-org.apache.isis.extensions:isis-extensions-pdfjs-ui:jar:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui-wkt:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-ui-wkt:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-sse-ui-wkt:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:2.0.0-SNAPSHOT +
-org.apache.isis.viewer:isis-viewer-wicket-viewer:jar:2.0.0-SNAPSHOT +
-****
+====
+* org.apache.isis.examples.apps:demo-web:jar:${project.version}
+* org.apache.isis.extensions:isis-extensions-pdfjs-ui:jar:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-ui-wkt:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-ui-wkt:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-sse-ui-wkt:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:2.0.0-SNAPSHOT
+* org.apache.isis.viewer:isis-viewer-wicket-viewer:jar:2.0.0-SNAPSHOT
+====
 
 |Apache Isis Extensions
 [source,yaml]
@@ -2189,10 +2210,11 @@ Folder: \extensions
 |Extensions to the Apache Isis framework itself.
 These are _not_ intended to be called by the domain logic of an Apache Isis application (see instead org.apache.isis.platform).
 
+[%collapsible]
 .Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Ext - Command Log
 [source,yaml]
@@ -2212,30 +2234,31 @@ Artifact: isis-extensions-command-log-jdo
 Type: jar
 Folder: \extensions\core\command-log\impl
 ----
-|.Components
-****
-o.a.i.extensions.commandlog.impl.CommandSubscriberForJdo +
-o.a.i.extensions.commandlog.impl.jdo.CommandJdo$TableColumnOrderDefault +
-o.a.i.extensions.commandlog.impl.jdo.CommandJdo$TitleProvider +
-o.a.i.extensions.commandlog.impl.jdo.CommandJdoRepository +
-o.a.i.extensions.commandlog.impl.ui.CommandServiceMenu +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.commandlog.impl.CommandSubscriberForJdo
+* o.a.i.extensions.commandlog.impl.jdo.CommandJdo$TableColumnOrderDefault
+* o.a.i.extensions.commandlog.impl.jdo.CommandJdo$TitleProvider
+* o.a.i.extensions.commandlog.impl.jdo.CommandJdoRepository
+* o.a.i.extensions.commandlog.impl.ui.CommandServiceMenu
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/commandlog/impl/CommandSubscriberForJdo.adoc[CommandSubscriberForJdo], xref:system:generated:index/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.adoc[IsisModuleExtCommandLogImpl], xref:system:generated:index/extensions/commandlog/impl/mixins/HasUniqueId_command.adoc[HasUniqueId_command], xref:system:generated:index/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.adoc[HasUsername_recentCommandsByUser], xref:system:generate [...]
-****
+====
 
 |Apache Isis Ext - Command Replay
 [source,yaml]
@@ -2257,27 +2280,28 @@ Folder: \extensions\core\command-replay\primary
 ----
 |A module for obtaining commands from a primary
 
+[%collapsible]
 .Components
-****
-o.a.i.extensions.commandreplay.primary.config.PrimaryConfig +
-o.a.i.extensions.commandreplay.primary.spiimpl.CaptureResultOfCommand +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.core:isis-schema:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-impl:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-****
-
+====
+* o.a.i.extensions.commandreplay.primary.config.PrimaryConfig
+* o.a.i.extensions.commandreplay.primary.spiimpl.CaptureResultOfCommand
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.core:isis-schema:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed>
+* org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed>
+* org.apache.isis.mappings:isis-mappings-jaxrsclient-impl:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc[IsisModuleExtCommandReplayPrimary], xref:system:generated:index/extensions/commandreplay/primary/config/PrimaryConfig.adoc[PrimaryConfig], xref:system:generated:index/extensions/commandreplay/primary/mixins/Object_openOnSecondary.adoc[Object_openOnSecondary], xref:system:generated:index/extensions/commandreplay/primary/restapi/CommandRetrievalService.adoc[CommandRetrievalService], xref:sys [...]
-****
+====
 
 |Apache Isis Ext - Command Replay for Secondary
 [source,yaml]
@@ -2290,33 +2314,34 @@ Folder: \extensions\core\command-replay\secondary
 |A module providing a Quartz Job to run on a secondary system,
 for obtaining commands from a primary and saving them so that they are replayed.
 
+[%collapsible]
 .Components
-****
-o.a.i.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserException +
-o.a.i.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserResult +
-o.a.i.extensions.commandreplay.secondary.analysis.CommandReplayAnalysisService +
-o.a.i.extensions.commandreplay.secondary.clock.TickingClockService +
-o.a.i.extensions.commandreplay.secondary.config.SecondaryConfig +
-o.a.i.extensions.commandreplay.secondary.executor.CommandExecutorServiceWithTime +
-o.a.i.extensions.commandreplay.secondary.fetch.CommandFetcher +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.core:isis-schema:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-quartz-impl:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-jaxrsclient-impl:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-****
-
+====
+* o.a.i.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserException
+* o.a.i.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserResult
+* o.a.i.extensions.commandreplay.secondary.analysis.CommandReplayAnalysisService
+* o.a.i.extensions.commandreplay.secondary.clock.TickingClockService
+* o.a.i.extensions.commandreplay.secondary.config.SecondaryConfig
+* o.a.i.extensions.commandreplay.secondary.executor.CommandExecutorServiceWithTime
+* o.a.i.extensions.commandreplay.secondary.fetch.CommandFetcher
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.core:isis-schema:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-quartz-impl:jar:<managed>
+* org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed>
+* org.apache.isis.mappings:isis-mappings-jaxrsclient-impl:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc[IsisModuleExtCommandReplaySecondary], xref:system:generated:index/extensions/commandreplay/secondary/SecondaryStatus.adoc[SecondaryStatus], xref:system:generated:index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc[CommandReplayAnalyser], xref:system:generated:index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc[CommandReplayAnal [...]
-****
+====
 
 |Apache Isis Ext - CORS (parent)
 [source,yaml]
@@ -2336,18 +2361,19 @@ Artifact: isis-extensions-cors-impl
 Type: jar
 Folder: \extensions\vro\cors\impl
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.springframework:spring-web:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.springframework:spring-web:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/cors/impl/IsisModuleExtCorsImpl.adoc[IsisModuleExtCorsImpl]
-****
+====
 
 |Apache Isis Ext - Wicket Viewer - Excel Download (parent)
 [source,yaml]
@@ -2367,22 +2393,23 @@ Artifact: isis-extensions-exceldownload-ui
 Type: jar
 Folder: \extensions\vw\exceldownload\ui
 ----
-|.Components
-****
-o.a.i.extensions.viewer.wicket.exceldownload.ui.components.CollectionContentsAsExcelFactory +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.viewer.wicket.exceldownload.ui.components.CollectionContentsAsExcelFactory
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-org.apache.poi:poi-ooxml:jar:<managed> +
-org.apache.poi:poi-ooxml-schemas:jar:<managed> +
-****
-
+====
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+* org.apache.poi:poi-ooxml:jar:<managed>
+* org.apache.poi:poi-ooxml-schemas:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc[IsisModuleExtExcelDownloadUi], xref:system:generated:index/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc[CollectionContentsAsExcel], xref:system:generated:index/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc[CollectionContentsAsExcelFactory]
-****
+====
 
 |Apache Isis Ext - Flyway
 [source,yaml]
@@ -2402,14 +2429,15 @@ Artifact: isis-extensions-flyway-impl
 Type: jar
 Folder: \extensions\core\flyway\impl
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.flywaydb:flyway-core:jar:<managed> +
-org.springframework:spring-context:jar:<managed> +
-org.springframework:spring-jdbc:jar:<managed> +
-org.springframework.boot:spring-boot-autoconfigure:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.flywaydb:flyway-core:jar:<managed>
+* org.springframework:spring-context:jar:<managed>
+* org.springframework:spring-jdbc:jar:<managed>
+* org.springframework.boot:spring-boot-autoconfigure:jar:<managed>
+====
 
 |Apache Isis Ext - Wicket Viewer - fullcalendar (parent)
 [source,yaml]
@@ -2429,16 +2457,17 @@ Artifact: isis-extensions-fullcalendar-applib
 Type: jar
 Folder: \extensions\vw\fullcalendar\applib
 ----
-|.Dependencies
-****
-de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/fullcalendar/applib/CalendarEventable.adoc[CalendarEventable], xref:system:generated:index/extensions/fullcalendar/applib/Calendarable.adoc[Calendarable], xref:system:generated:index/extensions/fullcalendar/applib/IsisModuleExtFullCalendarApplib.adoc[IsisModuleExtFullCalendarApplib], xref:system:generated:index/extensions/fullcalendar/applib/spi/CalendarableDereferencingService.adoc[CalendarableDereferencingService], xref:system:generated:index/exte [...]
-****
+====
 
 |Apache Isis Ext - Wicket Viewer - fullcalendar (ui)
 [source,yaml]
@@ -2448,17 +2477,18 @@ Artifact: isis-extensions-fullcalendar-ui
 Type: jar
 Folder: \extensions\vw\fullcalendar\ui
 ----
-|.Dependencies
-****
-net.ftlines.wicket-fullcalendar:wicket-fullcalendar-core:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-fullcalendar-applib:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* net.ftlines.wicket-fullcalendar:wicket-fullcalendar-core:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-fullcalendar-applib:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc[IsisModuleExtFullCalendarUi]
-****
+====
 
 |Apache Isis Ext - @Model
 [source,yaml]
@@ -2470,22 +2500,23 @@ Folder: \extensions\core\model-annotation
 ----
 |Allows supporting methods to be annotated as @Model, to make explicit the bounds of the metamodel.
 
+[%collapsible]
 .Components
-****
-o.a.i.extensions.modelannotation.metamodel.services.IncubatorMetaModelPlugin +
-****
-
+====
+* o.a.i.extensions.modelannotation.metamodel.services.IncubatorMetaModelPlugin
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/modelannotation/applib/IsisModuleIncModelApplib.adoc[IsisModuleIncModelApplib], xref:system:generated:index/extensions/modelannotation/applib/annotation/Model.adoc[Model], xref:system:generated:index/extensions/modelannotation/metamodel/IsisModuleExtModelAnnotation.adoc[IsisModuleExtModelAnnotation], xref:system:generated:index/extensions/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.adoc[SupportingMethodValidatorRefinerFa [...]
-****
+====
 
 |Apache Isis Ext - Wicket Viewer - pdf.js (parent)
 [source,yaml]
@@ -2505,16 +2536,17 @@ Artifact: isis-extensions-pdfjs-applib
 Type: jar
 Folder: \extensions\vw\pdfjs\applib
 ----
-|.Dependencies
-****
-de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.adoc[PdfJsViewer], xref:system:generated:index/extensions/viewer/wicket/pdfjs/applib/config/PdfJsConfig.adoc[PdfJsConfig], xref:system:generated:index/extensions/viewer/wicket/pdfjs/applib/config/Scale.adoc[Scale], xref:system:generated:index/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc[PdfJsViewerAdvisor]
-****
+====
 
 |Apache Isis Ext - Wicket Viewer - pdf.js (metamodel)
 [source,yaml]
@@ -2524,17 +2556,18 @@ Artifact: isis-extensions-pdfjs-metamodel
 Type: jar
 Folder: \extensions\vw\pdfjs\metamodel
 ----
-|.Components
-****
-o.a.i.extensions.viewer.wicket.pdfjs.metamodel.facet.PdfJsViewerFacetFromAnnotationFactory$Register +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.viewer.wicket.pdfjs.metamodel.facet.PdfJsViewerFacetFromAnnotationFactory$Register
+====
+[%collapsible]
 .Dependencies
-****
-de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-pdfjs-applib:jar:<managed> +
-****
+====
+* de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed>
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-pdfjs-applib:jar:<managed>
+====
 
 |Apache Isis Ext - Wicket Viewer - pdf.js (ui)
 [source,yaml]
@@ -2544,21 +2577,22 @@ Artifact: isis-extensions-pdfjs-ui
 Type: jar
 Folder: \extensions\vw\pdfjs\ui
 ----
-|.Components
-****
-o.a.i.extensions.viewer.wicket.pdfjs.ui.components.PdfJsViewerPanelComponentFactory +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.viewer.wicket.pdfjs.ui.components.PdfJsViewerPanelComponentFactory
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.extensions:isis-extensions-pdfjs-metamodel:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
+====
+* org.apache.isis.extensions:isis-extensions-pdfjs-metamodel:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc[IsisModuleExtPdfjsUi]
-****
+====
 
 |Apache Isis Ext - Quartz
 [source,yaml]
@@ -2578,18 +2612,19 @@ Artifact: isis-extensions-quartz-impl
 Type: jar
 Folder: \extensions\core\quartz\impl
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.apache.isis.core:isis-core-security:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed> +
-org.springframework.boot:spring-boot-starter-quartz:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.apache.isis.core:isis-core-security:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed>
+* org.springframework.boot:spring-boot-starter-quartz:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/quartz/IsisModuleExtQuartzImpl.adoc[IsisModuleExtQuartzImpl], xref:system:generated:index/extensions/quartz/context/JobExecutionData.adoc[JobExecutionData], xref:system:generated:index/extensions/quartz/spring/AutowiringSpringBeanJobFactory.adoc[AutowiringSpringBeanJobFactory]
-****
+====
 
 |Apache Isis Ext - Sec Man
 [source,yaml]
@@ -2599,11 +2634,12 @@ Artifact: isis-extensions-secman
 Type: pom
 Folder: \extensions\security\secman
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.core:isis-core-security:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.core:isis-core-security:jar:<managed>
+====
 
 |Apache Isis Ext - Sec Man API
 [source,yaml]
@@ -2613,10 +2649,11 @@ Artifact: isis-extensions-secman-api
 Type: jar
 Folder: \extensions\security\secman\api
 ----
-|.Document Index Entries
-****
+|[%collapsible]
+.Document Index Entries
+====
 xref:system:generated:index/extensions/secman/api/IsisModuleExtSecmanApi.adoc[IsisModuleExtSecmanApi], xref:system:generated:index/extensions/secman/api/SecmanConfiguration.adoc[SecmanConfiguration], xref:system:generated:index/extensions/secman/api/SecurityRealm.adoc[SecurityRealm], xref:system:generated:index/extensions/secman/api/SecurityRealmCharacteristic.adoc[SecurityRealmCharacteristic], xref:system:generated:index/extensions/secman/api/SecurityRealmService.adoc[SecurityRealmServi [...]
-****
+====
 
 |Apache Isis Ext - Sec Man Encryption (Using jbcrypt)
 [source,yaml]
@@ -2626,22 +2663,23 @@ Artifact: isis-extensions-secman-encryption-jbcrypt
 Type: jar
 Folder: \extensions\security\secman\encryption-jbcrypt
 ----
-|.Components
-****
-o.a.i.extensions.secman.encryption.jbcrypt.services.PasswordEncryptionServiceUsingJBcrypt +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.secman.encryption.jbcrypt.services.PasswordEncryptionServiceUsingJBcrypt
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
-org.mindrot:jbcrypt:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed>
+* org.mindrot:jbcrypt:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.adoc[IsisModuleExtSecmanEncryptionJbcrypt], xref:system:generated:index/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.adoc[PasswordEncryptionServiceUsingJBcrypt]
-****
+====
 
 |Apache Isis Ext - Sec Man Model
 [source,yaml]
@@ -2651,21 +2689,22 @@ Artifact: isis-extensions-secman-model
 Type: jar
 Folder: \extensions\security\secman\model
 ----
-|.Components
-****
-o.a.i.extensions.secman.model.facets.TenantedAuthorizationFacetFactory$Register +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.secman.model.facets.TenantedAuthorizationFacetFactory$Register
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/secman/model/IsisModuleExtSecmanModel.adoc[IsisModuleExtSecmanModel], xref:system:generated:index/extensions/secman/model/app/user/MeService.adoc[MeService]
-****
+====
 
 |Apache Isis Ext - Sec Man Persistence (Using JDO)
 [source,yaml]
@@ -2675,29 +2714,30 @@ Artifact: isis-extensions-secman-persistence-jdo
 Type: jar
 Folder: \extensions\security\secman\persistence-jdo
 ----
-|.Components
-****
-o.a.i.extensions.secman.jdo.dom.permission.ApplicationPermissionRepository +
-o.a.i.extensions.secman.jdo.dom.role.ApplicationRoleRepository +
-o.a.i.extensions.secman.jdo.dom.tenancy.ApplicationTenancyRepository +
-o.a.i.extensions.secman.jdo.dom.user.ApplicationUserRepository +
-o.a.i.extensions.secman.jdo.seed.SeedSecurityModuleService +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.secman.jdo.dom.permission.ApplicationPermissionRepository
+* o.a.i.extensions.secman.jdo.dom.role.ApplicationRoleRepository
+* o.a.i.extensions.secman.jdo.dom.tenancy.ApplicationTenancyRepository
+* o.a.i.extensions.secman.jdo.dom.user.ApplicationUserRepository
+* o.a.i.extensions.secman.jdo.seed.SeedSecurityModuleService
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.adoc[IsisModuleExtSecmanPersistenceJdo], xref:system:generated:index/extensions/secman/jdo/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService], xref:system:generated:index/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc[SeedUsersAndRolesFixtureScript], xref:system:generated:index/extensions/secman/jdo/seed/scripts/GlobalTenancy.adoc[GlobalTenancy], xref:system:generated:index/ext [...]
-****
+====
 
 |Apache Isis Ext - Sec Man Persistence (Using JPA)
 [source,yaml]
@@ -2707,19 +2747,29 @@ Artifact: isis-extensions-secman-persistence-jpa
 Type: jar
 Folder: \extensions\security\secman\persistence-jpa
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.secman.jpa.dom.permission.ApplicationPermissionRepository
+* o.a.i.extensions.secman.jpa.dom.role.ApplicationRoleRepository
+* o.a.i.extensions.secman.jpa.dom.tenancy.ApplicationTenancyRepository
+* o.a.i.extensions.secman.jpa.dom.user.ApplicationUserRepository
+* o.a.i.extensions.secman.jpa.seed.SeedSecurityModuleService
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.adoc[IsisModuleExtSecmanPersistenceJpa], xref:system:generated:index/extensions/secman/jpa/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService], xref:system:generated:index/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc[SeedUsersAndRolesFixtureScript], xref:system:generated:index/extensions/secman/jpa/seed/scripts/GlobalTenancy.adoc[GlobalTenancy], xref:system:generated:index/ext [...]
-****
+====
 
 |Apache Isis Ext - Sec Man Realm (Using Shiro)
 [source,yaml]
@@ -2729,22 +2779,23 @@ Artifact: isis-extensions-secman-shiro-realm
 Type: jar
 Folder: \extensions\security\secman\shiro-realm
 ----
-|.Components
-****
-o.a.i.extensions.secman.shiro.services.SecurityRealmServiceUsingShiro +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.secman.shiro.services.SecurityRealmServiceUsingShiro
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:2.0.0-SNAPSHOT +
-org.apache.isis.security:isis-security-shiro:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-api:jar:2.0.0-SNAPSHOT
+* org.apache.isis.security:isis-security-shiro:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc[IsisModuleExtSecmanRealmShiro], xref:system:generated:index/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc[IsisModuleExtSecmanShiroRealm], xref:system:generated:index/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc[SecurityRealmServiceUsingShiro], xref:system:generated:index/extensions/secman/shiro/util/ShiroUtils.adoc[ShiroUtils]
-****
+====
 
 |Apache Isis Ext - Security - Shiro LDAP Realm (parent)
 [source,yaml]
@@ -2764,16 +2815,17 @@ Artifact: isis-extensions-shiro-realm-ldap-impl
 Type: jar
 Folder: \extensions\security\shiro-realm-ldap\impl
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.security:isis-security-shiro:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.security:isis-security-shiro:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc[IsisLdapContextFactory], xref:system:generated:index/extensions/shirorealmldap/realm/impl/IsisLdapRealm.adoc[IsisLdapRealm], xref:system:generated:index/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.adoc[IsisModuleExtShiroRealmLdapImpl]
-****
+====
 
 |Apache Isis Incubator
 [source,yaml]
@@ -2785,10 +2837,11 @@ Folder: \incubator
 ----
 |Collection of Apache Isis extensions, subdomains or BC mappings, currently incubating.
 
+[%collapsible]
 .Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Inc - Client kroViz
 [source,yaml]
@@ -2818,16 +2871,17 @@ Artifact: isis-viewer-javafx-model
 Type: jar
 Folder: \incubator\viewers\javafx\model
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
-org.openjfx:javafx-base:jar:<managed> +
-org.openjfx:javafx-controls:jar:<managed> +
-org.openjfx:javafx-fxml:jar:<managed> +
-org.openjfx:javafx-swing:jar:<managed> +
-org.openjfx:javafx-web:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-common:jar:<managed>
+* org.openjfx:javafx-base:jar:<managed>
+* org.openjfx:javafx-controls:jar:<managed>
+* org.openjfx:javafx-fxml:jar:<managed>
+* org.openjfx:javafx-swing:jar:<managed>
+* org.openjfx:javafx-web:jar:<managed>
+====
 
 |Apache Isis Inc - Viewer JavaFX (UI Components)
 [source,yaml]
@@ -2837,34 +2891,35 @@ Artifact: isis-viewer-javafx-ui
 Type: jar
 Folder: \incubator\viewers\javafx\ui
 ----
-|.Components
-****
-o.a.i.incubator.viewer.javafx.ui.components.UiComponentFactoryFx +
-o.a.i.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.number.NumberFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.objectref.ObjectReferenceFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.other.FallbackFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.temporal.TemporalFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.components.text.TextFieldFactory +
-o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForButton +
-o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForFormField +
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForLabeled +
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForMenuItem +
-o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconServiceDefault +
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForButton +
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForFormField +
-o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider +
-o.a.i.incubator.viewer.javafx.ui.main.MainViewFx +
-o.a.i.incubator.viewer.javafx.ui.main.UiActionHandlerFx +
-o.a.i.incubator.viewer.javafx.ui.main.UiBuilderFx +
-o.a.i.incubator.viewer.javafx.ui.main.UiContextFxDefault +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.incubator.viewer:isis-viewer-javafx-model:jar:<managed> +
-****
+|[%collapsible]
+.Components
+====
+* o.a.i.incubator.viewer.javafx.ui.components.UiComponentFactoryFx
+* o.a.i.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory
+* o.a.i.incubator.viewer.javafx.ui.components.number.NumberFieldFactory
+* o.a.i.incubator.viewer.javafx.ui.components.objectref.ObjectReferenceFieldFactory
+* o.a.i.incubator.viewer.javafx.ui.components.other.FallbackFieldFactory
+* o.a.i.incubator.viewer.javafx.ui.components.temporal.TemporalFieldFactory
+* o.a.i.incubator.viewer.javafx.ui.components.text.TextFieldFactory
+* o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForButton
+* o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForFormField
+* o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForLabeled
+* o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForMenuItem
+* o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconServiceDefault
+* o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForButton
+* o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForFormField
+* o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider
+* o.a.i.incubator.viewer.javafx.ui.main.MainViewFx
+* o.a.i.incubator.viewer.javafx.ui.main.UiActionHandlerFx
+* o.a.i.incubator.viewer.javafx.ui.main.UiBuilderFx
+* o.a.i.incubator.viewer.javafx.ui.main.UiContextFxDefault
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.incubator.viewer:isis-viewer-javafx-model:jar:<managed>
+====
 
 |Apache Isis Inc - Viewer JavaFX (Viewer)
 [source,yaml]
@@ -2874,10 +2929,11 @@ Artifact: isis-viewer-javafx-viewer
 Type: jar
 Folder: \incubator\viewers\javafx\viewer
 ----
-|.Dependencies
-****
-org.apache.isis.incubator.viewer:isis-viewer-javafx-ui:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.incubator.viewer:isis-viewer-javafx-ui:jar:<managed>
+====
 
 |Apache Isis Inc - Viewer Vaadin
 [source,yaml]
@@ -2897,13 +2953,14 @@ Artifact: isis-viewer-vaadin-model
 Type: jar
 Folder: \incubator\viewers\vaadin\model
 ----
-|.Dependencies
-****
-com.vaadin:vaadin:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* com.vaadin:vaadin:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-common:jar:<managed>
+====
 
 |Apache Isis Inc - Viewer Vaadin (UI Components)
 [source,yaml]
@@ -2913,30 +2970,31 @@ Artifact: isis-viewer-vaadin-ui
 Type: jar
 Folder: \incubator\viewers\vaadin\ui
 ----
-|.Components
-****
-o.a.i.incubator.viewer.vaadin.ui.auth.LogoutHandlerVaa +
-o.a.i.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler +
-o.a.i.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa +
-o.a.i.incubator.viewer.vaadin.ui.components.blob.BlobFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.clob.ClobFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.markup.MarkupFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.other.FallbackFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.temporal.TemporalFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.text.TextFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.components.text.uuid.UuidFieldFactory +
-o.a.i.incubator.viewer.vaadin.ui.pages.main.UiActionHandlerVaa +
-o.a.i.incubator.viewer.vaadin.ui.pages.main.UiContextVaaDefault +
-****
-
-.Dependencies
-****
-com.vaadin:vaadin:jar:<managed> +
-com.vaadin:vaadin-spring:jar:<managed> +
-commons-fileupload:commons-fileupload:jar:1.4 +
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.incubator.viewer:isis-viewer-vaadin-model:jar:<managed> +
-****
+|[%collapsible]
+.Components
+====
+* o.a.i.incubator.viewer.vaadin.ui.auth.LogoutHandlerVaa
+* o.a.i.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler
+* o.a.i.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa
+* o.a.i.incubator.viewer.vaadin.ui.components.blob.BlobFieldFactory
+* o.a.i.incubator.viewer.vaadin.ui.components.clob.ClobFieldFactory
+* o.a.i.incubator.viewer.vaadin.ui.components.markup.MarkupFieldFactory
+* o.a.i.incubator.viewer.vaadin.ui.components.other.FallbackFieldFactory
+* o.a.i.incubator.viewer.vaadin.ui.components.temporal.TemporalFieldFactory
+* o.a.i.incubator.viewer.vaadin.ui.components.text.TextFieldFactory
+* o.a.i.incubator.viewer.vaadin.ui.components.text.uuid.UuidFieldFactory
+* o.a.i.incubator.viewer.vaadin.ui.pages.main.UiActionHandlerVaa
+* o.a.i.incubator.viewer.vaadin.ui.pages.main.UiContextVaaDefault
+====
+[%collapsible]
+.Dependencies
+====
+* com.vaadin:vaadin:jar:<managed>
+* com.vaadin:vaadin-spring:jar:<managed>
+* commons-fileupload:commons-fileupload:jar:1.4
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.incubator.viewer:isis-viewer-vaadin-model:jar:<managed>
+====
 
 |Apache Isis Inc - Viewer Vaadin (Viewer)
 [source,yaml]
@@ -2946,10 +3004,11 @@ Artifact: isis-viewer-vaadin-viewer
 Type: jar
 Folder: \incubator\viewers\vaadin\viewer
 ----
-|.Dependencies
-****
-org.apache.isis.incubator.viewer:isis-viewer-vaadin-ui:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.incubator.viewer:isis-viewer-vaadin-ui:jar:<managed>
+====
 
 |Apache Isis Legacy
 [source,yaml]
@@ -2961,10 +3020,11 @@ Folder: \legacy
 ----
 |Collection of deprecated Apache Isis functionality, for removal.
 
+[%collapsible]
 .Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Legacy - Applib
 [source,yaml]
@@ -2976,20 +3036,21 @@ Folder: \legacy\extensions\core\applib
 ----
 |To ease migration from Apache Isis versions 1.16+ to 2.0.0.
 
+[%collapsible]
 .Components
-****
-o.a.i.legacy.applib.DomainObjectContainer +
-****
-
+====
+* o.a.i.legacy.applib.DomainObjectContainer
+====
+[%collapsible]
 .Dependencies
-****
-com.google.guava:guava:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
+====
+* com.google.guava:guava:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+====
 
 |Apache Isis Legacy - Commons
 [source,yaml]
@@ -3001,15 +3062,16 @@ Folder: \legacy\extensions\core\commons
 ----
 |To ease migration from Apache Isis versions 1.16+ to 2.0.0.
 
+[%collapsible]
 .Dependencies
-****
-com.google.guava:guava:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
+====
+* com.google.guava:guava:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+====
 
 |Apache Isis Legacy - Metamodel
 [source,yaml]
@@ -3021,16 +3083,17 @@ Folder: \legacy\extensions\core\metamodel
 ----
 |To ease migration from Apache Isis versions 1.16+ to 2.0.0.
 
+[%collapsible]
 .Dependencies
-****
-com.google.guava:guava:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.legacy:isis-legacy-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
+====
+* com.google.guava:guava:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.legacy:isis-legacy-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+====
 
 |Apache Isis Legacy - REST Client
 [source,yaml]
@@ -3042,13 +3105,14 @@ Folder: \legacy\mappings\restclient
 ----
 |As defined in Isis v1.x RO Applib.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Legacy - Runtime
 [source,yaml]
@@ -3060,18 +3124,19 @@ Folder: \legacy\extensions\core\runtime
 ----
 |To ease migration from Apache Isis versions 1.16+ to 2.0.0.
 
+[%collapsible]
 .Dependencies
-****
-com.google.guava:guava:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.legacy:isis-legacy-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
+====
+* com.google.guava:guava:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.legacy:isis-legacy-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+====
 
 |Apache Isis Mappings
 [source,yaml]
@@ -3084,10 +3149,11 @@ Folder: \mappings
 |Libraries and tools to map one bounded context (usually an Apache Isis application) to some other BC (usually
 _not_ an Apache Isis application).
 
+[%collapsible]
 .Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Map - JaxRS Client (parent)
 [source,yaml]
@@ -3107,16 +3173,17 @@ Artifact: isis-mappings-jaxrsclient-applib
 Type: jar
 Folder: \mappings\jaxrsclient\applib
 ----
-|.Dependencies
-****
-javax:javaee-api:jar:<managed> +
-org.springframework:spring-context:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* javax:javaee-api:jar:<managed>
+* org.springframework:spring-context:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc[IsisModuleExtJaxRsClientApplib], xref:system:generated:index/extensions/jaxrsclient/applib/client/JaxRsClient.adoc[JaxRsClient], xref:system:generated:index/extensions/jaxrsclient/applib/client/JaxRsResponse.adoc[JaxRsResponse]
-****
+====
 
 |Apache Isis Map - JaxRS Client (impl)
 [source,yaml]
@@ -3126,10 +3193,11 @@ Artifact: isis-mappings-jaxrsclient-impl
 Type: jar
 Folder: \mappings\jaxrsclient\testlib
 ----
-|.Dependencies
-****
-org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.mappings:isis-mappings-jaxrsclient-applib:jar:<managed>
+====
 
 |Apache Isis Ext - REST Client (parent)
 [source,yaml]
@@ -3151,16 +3219,17 @@ Folder: \mappings\restclient\applib
 ----
 |A client for the Restful Objects Viewer
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed> +
-org.springframework:spring-context:jar:<managed> +
-****
-
+====
+* org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed>
+* org.springframework:spring-context:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/restclient/ActionParameterListBuilder.adoc[ActionParameterListBuilder], xref:system:generated:index/extensions/restclient/IsisModuleExtRestClient.adoc[IsisModuleExtRestClient], xref:system:generated:index/extensions/restclient/ResponseDigest.adoc[ResponseDigest], xref:system:generated:index/extensions/restclient/RestfulClient.adoc[RestfulClient], xref:system:generated:index/extensions/restclient/RestfulClientConfig.adoc[RestfulClientConfig], xref:sy [...]
-****
+====
 
 |Apache Isis Maven Deps
 [source,yaml]
@@ -3182,12 +3251,13 @@ Folder: \mavendeps\integspecs
 ----
 |Defines a module that can be used as a single dependency for BDD (Cucumber) specs as integration tests.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-specsupport-applib:jar:<managed> +
-****
+====
+* org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-specsupport-applib:jar:<managed>
+====
 
 |Apache Isis Maven Deps - Integration Testing
 [source,yaml]
@@ -3199,12 +3269,13 @@ Folder: \mavendeps\integtests
 ----
 |Defines a module that can be used as a single dependency for integration tests.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-****
+====
+* org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed>
+====
 
 |Apache Isis Maven Deps - JDK11
 [source,yaml]
@@ -3229,12 +3300,13 @@ Folder: \mavendeps\jdo
 |Defines a module that provides the default JDO persistence layer integration
 for running an Apache Isis webapp (Wicket, Restful Objects and Shiro security).
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-schema:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-schema:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed>
+====
 
 |Apache Isis Maven Deps - JPA
 [source,yaml]
@@ -3247,12 +3319,13 @@ Folder: \mavendeps\jpa
 |Defines a module that provides the default JPA persistence layer integration
 for running an Apache Isis webapp (Wicket, Restful Objects and Shiro security).
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-schema:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jpa-eclipselink:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-schema:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jpa-eclipselink:jar:<managed>
+====
 
 |Apache Isis Maven Deps - Testing
 [source,yaml]
@@ -3264,11 +3337,12 @@ Folder: \mavendeps\unittests
 ----
 |Defines a module that can be used as a single dependency for a set of common testing libraries.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-****
+====
+* org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed>
+====
 
 |Apache Isis Maven Deps - Webapp
 [source,yaml]
@@ -3283,21 +3357,22 @@ an Apache Isis webapp (Wicket, Restful Objects and Shiro security).
 
 Note: Also requires a persistence provider.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.core:isis-core-security:jar:<managed> +
-org.apache.isis.core:isis-schema:jar:<managed> +
-org.apache.isis.security:isis-security-bypass:jar:<managed> +
-org.apache.isis.security:isis-security-keycloak:jar:<managed> +
-org.apache.isis.security:isis-security-shiro:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-jaxrsresteasy4:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-viewer:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-viewer:jar:<managed> +
-org.springframework.boot:spring-boot-starter-tomcat:jar:<managed> +
-org.springframework.boot:spring-boot-starter-web:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.core:isis-core-security:jar:<managed>
+* org.apache.isis.core:isis-schema:jar:<managed>
+* org.apache.isis.security:isis-security-bypass:jar:<managed>
+* org.apache.isis.security:isis-security-keycloak:jar:<managed>
+* org.apache.isis.security:isis-security-shiro:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-jaxrsresteasy4:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-viewer:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-viewer:jar:<managed>
+* org.springframework.boot:spring-boot-starter-tomcat:jar:<managed>
+* org.springframework.boot:spring-boot-starter-web:jar:<managed>
+====
 
 |Apache Isis Persistence - JDO
 [source,yaml]
@@ -3319,18 +3394,19 @@ Folder: \persistence\jdo\applib
 ----
 |Supplementary applib for JDO persistence
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.datanucleus:datanucleus-rdbms:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
-
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.datanucleus:datanucleus-rdbms:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/persistence/jdo/applib/IsisModulePersistenceJdoApplib.adoc[IsisModulePersistenceJdoApplib], xref:system:generated:index/persistence/jdo/applib/services/JdoSupportService.adoc[JdoSupportService]
-****
+====
 
 |Apache Isis Persistence - JDO Provider (DataNucleus)
 [source,yaml]
@@ -3342,37 +3418,35 @@ Folder: \persistence\jdo\datanucleus
 ----
 |JDO Implementation (powered by DataNucleus)
 
+[%collapsible]
 .Components
-****
-o.a.i.persistence.jdo.datanucleus.config.DnEntityDiscoveryListener +
-o.a.i.persistence.jdo.datanucleus.config.DnSettings +
-o.a.i.persistence.jdo.datanucleus.entities.DnEntityStateProvider +
-o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDODataStoreException +
-o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException +
-o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForJDOObjectNotFoundException +
-o.a.i.persistence.jdo.datanucleus.exceptions.recognizers.ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException +
-****
-
-.Dependencies
-****
-com.h2database:h2:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-integration:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-provider:jar:<managed> +
-org.datanucleus:datanucleus-api-jdo:jar:<managed> +
-org.datanucleus:datanucleus-core:jar:<managed> +
-org.datanucleus:datanucleus-jdo-query:jar:<managed> +
-org.datanucleus:datanucleus-jodatime:jar:<managed> +
-org.datanucleus:datanucleus-rdbms:jar:<managed> +
-org.springframework.boot:spring-boot-starter-jdbc:jar:<managed> +
-****
-
+====
+* o.a.i.persistence.jdo.datanucleus.config.DnEntityDiscoveryListener
+* o.a.i.persistence.jdo.datanucleus.entities.DnEntityStateProvider
+* o.a.i.persistence.jdo.datanucleus.jdosupport.JdoSupportServiceDefault
+* o.a.i.persistence.jdo.datanucleus.metamodel.JdoDataNucleusProgrammingModel
+====
+[%collapsible]
+.Dependencies
+====
+* com.h2database:h2:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-integration:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-provider:jar:<managed>
+* org.datanucleus:datanucleus-api-jdo:jar:<managed>
+* org.datanucleus:datanucleus-core:jar:<managed>
+* org.datanucleus:datanucleus-jdo-query:jar:<managed>
+* org.datanucleus:datanucleus-jodatime:jar:<managed>
+* org.datanucleus:datanucleus-rdbms:jar:<managed>
+* org.springframework.boot:spring-boot-starter-jdbc:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/persistence/jdo/datanucleus/IsisModuleJdoDatanucleus.adoc[IsisModuleJdoDatanucleus], xref:system:generated:index/persistence/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc[JdoLifecycleListener], xref:system:generated:index/persistence/jdo/datanucleus/dialect/DnJdoDialect.adoc[DnJdoDialect], xref:system:generated:index/persistence/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.adoc[Persistable_datanucleusIdLong], xref:system:generated:index/pers [...]
-****
+====
 
 |Apache Isis Persistence - JDO (integration)
 [source,yaml]
@@ -3384,23 +3458,17 @@ Folder: \persistence\jdo\integration
 ----
 |JDO Integration (powered by DataNucleus)
 
-.Components
-****
-o.a.i.persistence.jdo.integration.jdosupport.IsisJdoSupportDN5 +
-o.a.i.persistence.jdo.integration.metamodel.JdoIntegrationProgrammingModel +
-o.a.i.persistence.jdo.integration.schema.JdoSchemaService +
-****
-
-.Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-metamodel:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-spring:jar:<managed> +
-****
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-metamodel:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-spring:jar:<managed>
+====
 
 |Apache Isis Persistence - JDO (metamodel)
 [source,yaml]
@@ -3412,18 +3480,19 @@ Folder: \persistence\jdo\metamodel
 ----
 |JDO Metamodel Facets / Programming Model
 
+[%collapsible]
 .Components
-****
-o.a.i.persistence.jdo.metamodel.JdoProgrammingModel +
-****
-
+====
+* o.a.i.persistence.jdo.metamodel.JdoProgrammingModel
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-provider:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-provider:jar:<managed>
+====
 
 |Apache Isis Persistence - JDO (provider)
 [source,yaml]
@@ -3435,11 +3504,12 @@ Folder: \persistence\jdo\provider
 ----
 |JDO Provider to be implemented by any actual JDO provider eg. DataNucleus.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+====
 
 |Apache Isis Persistence - JDO (Spring)
 [source,yaml]
@@ -3459,18 +3529,19 @@ Credits to the original authors. See also docs [2].
 [1] https://github.com/spring-projects/spring-framework/issues/18702
 [2] https://docs.spring.io/spring-framework/docs/3.0.0.RC2/reference/html/ch13s04.html
 
+[%collapsible]
 .Dependencies
-****
-javax.servlet:javax.servlet-api:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-config:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-provider:jar:<managed> +
-org.springframework:spring-jdbc:jar:<managed> +
-org.springframework:spring-web:jar:<managed> +
-****
+====
+* javax.servlet:javax.servlet-api:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-config:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-provider:jar:<managed>
+* org.springframework:spring-jdbc:jar:<managed>
+* org.springframework:spring-web:jar:<managed>
+====
 
 |Apache Isis Persistence - JPA
 [source,yaml]
@@ -3492,16 +3563,17 @@ Folder: \persistence\jpa\applib
 ----
 |Supplementary applib for JPA persistence
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
-
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/persistence/jpa/applib/integration/JpaEntityInjectionPointResolver.adoc[JpaEntityInjectionPointResolver], xref:system:generated:index/persistence/jpa/applib/services/JpaSupportService.adoc[JpaSupportService]
-****
+====
 
 |Apache Isis Persistence - JPA EclipseLink
 [source,yaml]
@@ -3513,18 +3585,19 @@ Folder: \persistence\jpa\eclipselink
 ----
 |EclipseLink integration. Sets up EclipseLink as the implementation provider for Spring Data JPA.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jpa-integration:jar:<managed> +
-org.eclipse.persistence:org.eclipse.persistence.jpa:jar:2.7.8 +
-org.springframework.boot:spring-boot-starter-data-jpa:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jpa-integration:jar:<managed>
+* org.eclipse.persistence:org.eclipse.persistence.jpa:jar:2.7.8
+* org.springframework.boot:spring-boot-starter-data-jpa:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.adoc[IsisModuleJpaEclipselink]
-****
+====
 
 |Apache Isis Persistence - JPA (integration)
 [source,yaml]
@@ -3536,19 +3609,20 @@ Folder: \persistence\jpa\integration
 ----
 |JPA integration (facets, jpa-context)
 
+[%collapsible]
 .Components
-****
-o.a.i.persistence.jpa.integration.metamodel.JpaProgrammingModel +
-****
-
+====
+* o.a.i.persistence.jpa.integration.metamodel.JpaProgrammingModel
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jpa-metamodel:jar:<managed> +
-org.springframework.data:spring-data-jpa:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jpa-metamodel:jar:<managed>
+* org.springframework.data:spring-data-jpa:jar:<managed>
+====
 
 |Apache Isis Persistence - JPA (metamodel)
 [source,yaml]
@@ -3560,12 +3634,18 @@ Folder: \persistence\jpa\metamodel
 ----
 |JPA Metamodel Facets / Programming Model
 
+[%collapsible]
+.Components
+====
+* o.a.i.persistence.jpa.metamodel.JpaProgrammingModel
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed>
+====
 
 |Apache Isis - Regression Tests
 [source,yaml]
@@ -3578,32 +3658,33 @@ Folder: \regressiontests
 |Collection of JUnit tests covering core functionalities of the framework.
 (Targeted for JVM 11+)
 
+[%collapsible]
 .Dependencies
-****
-org.apache.directory.server:apacheds-test-framework:jar:2.0.0.AM26 +
-org.apache.isis.extensions:isis-extensions-modelannotation:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-shiro-realm-ldap-impl:jar:<managed> +
-org.apache.isis.mappings:isis-mappings-restclient-applib:jar:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jpa:pom:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed> +
-org.apache.isis.security:isis-security-shiro:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-specsupport-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-model4adoc:jar:${project.version} +
-org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
-org.glassfish:javax.json:jar:1.1.4 +
-org.glassfish.jersey.ext:jersey-spring5:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.apache.directory.server:apacheds-test-framework:jar:2.0.0.AM26
+* org.apache.isis.extensions:isis-extensions-modelannotation:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed>
+* org.apache.isis.extensions:isis-extensions-shiro-realm-ldap-impl:jar:<managed>
+* org.apache.isis.mappings:isis-mappings-restclient-applib:jar:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdk11:pom:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jpa:pom:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-webapp:pom:<managed>
+* org.apache.isis.security:isis-security-shiro:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-specsupport-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-model4adoc:jar:${project.version}
+* org.apache.isis.viewer:isis-viewer-common:jar:<managed>
+* org.glassfish:javax.json:jar:1.1.4
+* org.glassfish.jersey.ext:jersey-spring5:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis - Regression Tests (stable)
 [source,yaml]
@@ -3613,28 +3694,27 @@ Artifact: isis-regressiontests-stable
 Type: jar
 Folder: \regressiontests\stable
 ----
-|.Components
-****
-o.a.i.testdomain.applayer.ApplicationLayerTestFactory +
-o.a.i.testdomain.applayer.ApplicationLayerTestFactory$PreCommitListener +
-o.a.i.testdomain.applayer.publishing.CommandSubscriberForTesting +
-o.a.i.testdomain.applayer.publishing.EntityChangesSubscriberForTesting +
-o.a.i.testdomain.applayer.publishing.EntityPropertyChangeSubscriberForTesting +
-o.a.i.testdomain.applayer.publishing.ExecutionSubscriberForTesting +
-o.a.i.testdomain.conf.Configuration_headless$HeadlessCommandSupport +
-o.a.i.testdomain.jdo.JdoInventoryDao +
-o.a.i.testdomain.jpa.JpaInventoryDao +
-o.a.i.testdomain.jpa.springdata.EmployeeRepository +
-o.a.i.testdomain.util.interaction.InteractionBoundaryProbe +
-o.a.i.testdomain.util.kv.KVStoreForTesting +
-o.a.i.testdomain.util.rest.RestEndpointService +
-****
-
-.Dependencies
-****
-org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed> +
-org.glassfish.jersey.ext:jersey-spring5:jar:<managed> +
-****
+|[%collapsible]
+.Components
+====
+* o.a.i.testdomain.applayer.ApplicationLayerTestFactory
+* o.a.i.testdomain.applayer.ApplicationLayerTestFactory$PreCommitListener
+* o.a.i.testdomain.applayer.publishing.CommandSubscriberForTesting
+* o.a.i.testdomain.applayer.publishing.EntityChangesSubscriberForTesting
+* o.a.i.testdomain.applayer.publishing.EntityPropertyChangeSubscriberForTesting
+* o.a.i.testdomain.applayer.publishing.ExecutionSubscriberForTesting
+* o.a.i.testdomain.conf.Configuration_headless$HeadlessCommandSupport
+* o.a.i.testdomain.jdo.JdoInventoryDao
+* o.a.i.testdomain.jpa.JpaInventoryDao
+* o.a.i.testdomain.jpa.springdata.EmployeeRepository
+* o.a.i.testdomain.util.kv.KVStoreForTesting
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed>
+* org.glassfish.jersey.ext:jersey-spring5:jar:<managed>
+====
 
 |Apache Isis Security - Bypass
 [source,yaml]
@@ -3644,21 +3724,22 @@ Artifact: isis-security-bypass
 Type: jar
 Folder: \security\bypass
 ----
-|.Components
-****
-o.a.i.security.bypass.authentication.AuthenticatorBypass +
-o.a.i.security.bypass.authorization.AuthorizorBypass +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.security.bypass.authentication.AuthenticatorBypass
+* o.a.i.security.bypass.authorization.AuthorizorBypass
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/security/bypass/IsisModuleSecurityBypass.adoc[IsisModuleSecurityBypass], xref:system:generated:index/security/bypass/authentication/AuthenticatorBypass.adoc[AuthenticatorBypass], xref:system:generated:index/security/bypass/authorization/AuthorizorBypass.adoc[AuthorizorBypass]
-****
+====
 
 |Apache Isis Security - Keycloak
 [source,yaml]
@@ -3670,25 +3751,26 @@ Folder: \security\keycloak
 ----
 |Authentication and Authorization using Keycloak
 
+[%collapsible]
 .Components
-****
-o.a.i.security.keycloak.authentication.AuthenticatorKeycloak +
-o.a.i.security.keycloak.authorization.AuthorizorKeycloak +
-o.a.i.security.keycloak.webmodule.WebModuleKeycloak +
-****
-
+====
+* o.a.i.security.keycloak.authentication.AuthenticatorKeycloak
+* o.a.i.security.keycloak.authorization.AuthorizorKeycloak
+* o.a.i.security.keycloak.webmodule.WebModuleKeycloak
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/security/keycloak/IsisModuleSecurityKeycloak.adoc[IsisModuleSecurityKeycloak], xref:system:generated:index/security/keycloak/authentication/AuthenticatorKeycloak.adoc[AuthenticatorKeycloak], xref:system:generated:index/security/keycloak/authorization/AuthorizorKeycloak.adoc[AuthorizorKeycloak], xref:system:generated:index/security/keycloak/webmodule/KeycloakFilter.adoc[KeycloakFilter], xref:system:generated:index/security/keycloak/webmodule/WebModuleKeycloak.a [...]
-****
+====
 
 |Apache Isis Security - Shiro
 [source,yaml]
@@ -3700,27 +3782,28 @@ Folder: \security\shiro
 ----
 |Authentication and Authorization using Apache Shiro.
 
+[%collapsible]
 .Components
-****
-o.a.i.security.shiro.authentication.AuthenticatorShiro +
-o.a.i.security.shiro.authorization.AuthorizorShiro +
-o.a.i.security.shiro.webmodule.WebModuleShiro +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.apache.shiro:shiro-core:jar:<managed> +
-org.apache.shiro:shiro-web:jar:<managed> +
-****
-
+====
+* o.a.i.security.shiro.authentication.AuthenticatorShiro
+* o.a.i.security.shiro.authorization.AuthorizorShiro
+* o.a.i.security.shiro.webmodule.WebModuleShiro
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.apache.shiro:shiro-core:jar:<managed>
+* org.apache.shiro:shiro-web:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/security/shiro/IsisModuleSecurityShiro.adoc[IsisModuleSecurityShiro], xref:system:generated:index/security/shiro/authentication/AuthenticatorShiro.adoc[AuthenticatorShiro], xref:system:generated:index/security/shiro/authorization/AuthorizorShiro.adoc[AuthorizorShiro], xref:system:generated:index/security/shiro/authorization/IsisPermission.adoc[IsisPermission], xref:system:generated:index/security/shiro/authorization/IsisPermissionResolver.adoc[IsisPermissionRe [...]
-****
+====
 
 |Apache Isis Subdomains
 [source,yaml]
@@ -3733,10 +3816,11 @@ Folder: \subdomains
 |A library of domain services and of supporting subdomains (often technical in nature), to be called from the
 core domain of an Apache Isis applications.
 
+[%collapsible]
 .Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Sub - Base (parent)
 [source,yaml]
@@ -3756,24 +3840,25 @@ Artifact: isis-subdomains-base-applib
 Type: jar
 Folder: \subdomains\base\applib
 ----
-|.Components
-****
-o.a.i.subdomains.base.applib.services.calendar.CalendarService +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.subdomains.base.applib.services.calendar.CalendarService
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
-
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/subdomains/base/applib/Chained.adoc[Chained], xref:system:generated:index/subdomains/base/applib/Dflt.adoc[Dflt], xref:system:generated:index/subdomains/base/applib/IsisModuleSubdomainsBaseApplib.adoc[IsisModuleSubdomainsBaseApplib], xref:system:generated:index/subdomains/base/applib/PowerType.adoc[PowerType], xref:system:generated:index/subdomains/base/applib/Titled.adoc[Titled], xref:system:generated:index/subdomains/base/applib/TitledEnum.adoc[TitledEnum],  [...]
-****
+====
 
 |Apache Isis Sub - Docx (parent)
 [source,yaml]
@@ -3793,10 +3878,11 @@ Artifact: isis-subdomains-docx-applib
 Type: jar
 Folder: \subdomains\docx\applib
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
 
 |Apache Isis Sub - Excel (parent)
 [source,yaml]
@@ -3818,26 +3904,27 @@ Artifact: isis-subdomains-excel-applib
 Type: jar
 Folder: \subdomains\excel\applib
 ----
-|.Components
-****
-o.a.i.subdomains.excel.applib.dom.ExcelService +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.subdomains.excel.applib.dom.ExcelService
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.apache.poi:poi-ooxml:jar:<managed> +
-org.apache.poi:poi-ooxml-schemas:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+* org.apache.poi:poi-ooxml:jar:<managed>
+* org.apache.poi:poi-ooxml-schemas:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.adoc[IsisModuleSubdomainsExcelApplib], xref:system:generated:index/subdomains/excel/applib/dom/AggregationType.adoc[AggregationType], xref:system:generated:index/subdomains/excel/applib/dom/ExcelMetaDataEnabled.adoc[ExcelMetaDataEnabled], xref:system:generated:index/subdomains/excel/applib/dom/ExcelService.adoc[ExcelService], xref:system:generated:index/subdomains/excel/applib/dom/HyperLink.adoc[HyperLink [...]
-****
+====
 
 |Apache Isis Sub - Excel (Fixtures)
 [source,yaml]
@@ -3847,15 +3934,16 @@ Artifact: isis-subdomains-excel-fixtures
 Type: jar
 Folder: \subdomains\excel\fixture
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-applib:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-testing:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed>
+* org.apache.isis.subdomains:isis-subdomains-excel-applib:jar:<managed>
+* org.apache.isis.subdomains:isis-subdomains-excel-testing:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Sub - Excel (Integ Tests)
 [source,yaml]
@@ -3865,14 +3953,15 @@ Artifact: isis-subdomains-excel-integtests
 Type: jar
 Folder: \subdomains\excel\integtests
 ----
-|.Dependencies
-****
-org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
-org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-fixtures:jar:<managed> +
-org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
-org.hsqldb:hsqldb:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed>
+* org.apache.isis.mavendeps:isis-mavendeps-jdo:pom:<managed>
+* org.apache.isis.subdomains:isis-subdomains-excel-fixtures:jar:<managed>
+* org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed>
+* org.hsqldb:hsqldb:jar:<managed>
+====
 
 |Apache Isis Sub - Excel (testing support)
 [source,yaml]
@@ -3882,17 +3971,18 @@ Artifact: isis-subdomains-excel-testing
 Type: jar
 Folder: \subdomains\excel\testing
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-excel-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.subdomains:isis-subdomains-excel-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/subdomains/excel/testing/ExcelFixture.adoc[ExcelFixture], xref:system:generated:index/subdomains/excel/testing/ExcelFixture2.adoc[ExcelFixture2], xref:system:generated:index/subdomains/excel/testing/ExcelFixtureRowHandler.adoc[ExcelFixtureRowHandler], xref:system:generated:index/subdomains/excel/testing/ExcelFixtureWorkbookHandler.adoc[ExcelFixtureWorkbookHandler], xref:system:generated:index/subdomains/excel/testing/FixtureAwareRowHandler.adoc[FixtureAwareRow [...]
-****
+====
 
 |Apache Isis Sub - Freemarker (parent)
 [source,yaml]
@@ -3912,10 +4002,11 @@ Artifact: isis-subdomains-freemarker-applib
 Type: jar
 Folder: \subdomains\freemarker\applib
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
 
 |Apache Isis Sub - Ognl (parent)
 [source,yaml]
@@ -3935,10 +4026,11 @@ Artifact: isis-subdomains-ognl-applib
 Type: jar
 Folder: \subdomains\ognl\applib
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
 
 |Apache Isis Sub - PDF Box (parent)
 [source,yaml]
@@ -3960,10 +4052,11 @@ Folder: \subdomains\pdfbox\applib
 ----
 |Integrates PDF Box Library
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
 
 |Apache Isis Sub - Spring (parent)
 [source,yaml]
@@ -3983,21 +4076,22 @@ Artifact: isis-subdomains-spring-applib
 Type: jar
 Folder: \subdomains\spring\applib
 ----
-|.Components
-****
-o.a.i.subdomains.spring.applib.service.SpringBeansService +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.subdomains.spring.applib.service.SpringBeansService
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.adoc[IsisModuleSubdomainsSpringApplib], xref:system:generated:index/subdomains/spring/applib/service/BeanDescriptor.adoc[BeanDescriptor], xref:system:generated:index/subdomains/spring/applib/service/ContextBeans.adoc[ContextBeans], xref:system:generated:index/subdomains/spring/applib/service/SpringBeansService.adoc[SpringBeansService]
-****
+====
 
 |Apache Isis Sub - XdocReport (parent)
 [source,yaml]
@@ -4017,27 +4111,28 @@ Artifact: isis-subdomains-xdocreport-applib
 Type: jar
 Folder: \subdomains\xdocreport\applib
 ----
-|.Components
-****
-o.a.i.subdomains.xdocreport.applib.service.XDocReportService +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.subdomains.xdocreport.applib.service.XDocReportService
+====
+[%collapsible]
 .Dependencies
-****
-fr.opensagres.xdocreport:fr.opensagres.xdocreport.converter.docx.xwpf:jar:<managed> +
-fr.opensagres.xdocreport:fr.opensagres.xdocreport.document.docx:jar:<managed> +
-fr.opensagres.xdocreport:fr.opensagres.xdocreport.template.freemarker:jar:<managed> +
-fr.opensagres.xdocreport:org.apache.poi.xwpf.converter.core:jar:<managed> +
-fr.opensagres.xdocreport:org.apache.poi.xwpf.converter.pdf:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
-
+====
+* fr.opensagres.xdocreport:fr.opensagres.xdocreport.converter.docx.xwpf:jar:<managed>
+* fr.opensagres.xdocreport:fr.opensagres.xdocreport.document.docx:jar:<managed>
+* fr.opensagres.xdocreport:fr.opensagres.xdocreport.template.freemarker:jar:<managed>
+* fr.opensagres.xdocreport:org.apache.poi.xwpf.converter.core:jar:<managed>
+* fr.opensagres.xdocreport:org.apache.poi.xwpf.converter.pdf:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc[IsisModuleSubdomainsXDocReportApplib], xref:system:generated:index/subdomains/xdocreport/applib/service/OutputType.adoc[OutputType], xref:system:generated:index/subdomains/xdocreport/applib/service/XDocReportModel.adoc[XDocReportModel], xref:system:generated:index/subdomains/xdocreport/applib/service/XDocReportService.adoc[XDocReportService]
-****
+====
 
 |Apache Isis Sub - Zip (parent)
 [source,yaml]
@@ -4057,17 +4152,18 @@ Artifact: isis-subdomains-zip-applib
 Type: jar
 Folder: \subdomains\zip\applib
 ----
-|.Components
-****
-o.a.i.extensions.zip.dom.impl.ZipService +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.extensions.zip.dom.impl.ZipService
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Testing
 [source,yaml]
@@ -4098,24 +4194,25 @@ Artifact: isis-testing-fakedata-applib
 Type: jar
 Folder: \testing\fakedata\applib
 ----
-|.Components
-****
-o.a.i.testing.fakedata.applib.services.FakeDataService +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.testing.fakedata.applib.services.FakeDataService
+====
+[%collapsible]
 .Dependencies
-****
-com.github.javafaker:javafaker:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
-
+====
+* com.github.javafaker:javafaker:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/testing/fakedata/applib/IsisModuleTestingFakeDataApplib.adoc[IsisModuleTestingFakeDataApplib], xref:system:generated:index/testing/fakedata/applib/services/AbstractRandomValueGenerator.adoc[AbstractRandomValueGenerator], xref:system:generated:index/testing/fakedata/applib/services/Addresses.adoc[Addresses], xref:system:generated:index/testing/fakedata/applib/services/BigDecimals.adoc[BigDecimals], xref:system:generated:index/testing/fakedata/applib/services/Bi [...]
-****
+====
 
 |Apache Isis Tst - FakeData (fixtures)
 [source,yaml]
@@ -4125,14 +4222,15 @@ Artifact: isis-testing-fakedata-fixtures
 Type: jar
 Folder: \testing\fakedata\fixtures
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
-org.projectlombok:lombok:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed>
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Tst - FakeData (integ tests)
 [source,yaml]
@@ -4142,13 +4240,14 @@ Artifact: isis-testing-fakedata-integtests
 Type: jar
 Folder: \testing\fakedata\integtests
 ----
-|.Dependencies
-****
-org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
-org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-fakedata-fixtures:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.mavendeps:isis-mavendeps-integtests:pom:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed>
+* org.apache.isis.testing:isis-testing-fakedata-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-fakedata-fixtures:jar:<managed>
+====
 
 |Apache Isis Tst - Fixtures (parent)
 [source,yaml]
@@ -4168,23 +4267,24 @@ Artifact: isis-testing-fixtures-applib
 Type: jar
 Folder: \testing\fixtures\applib
 ----
-|.Components
-****
-o.a.i.testing.fixtures.applib.fixturescripts.ExecutionParametersService +
-o.a.i.testing.fixtures.applib.modules.ModuleWithFixturesService +
-o.a.i.testing.fixtures.applib.queryresultscache.QueryResultsCacheControlDefault +
-o.a.i.testing.fixtures.applib.services.FixturesLifecycleService +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.testing.fixtures.applib.fixturescripts.ExecutionParametersService
+* o.a.i.testing.fixtures.applib.modules.ModuleWithFixturesService
+* o.a.i.testing.fixtures.applib.queryresultscache.QueryResultsCacheControlDefault
+* o.a.i.testing.fixtures.applib.services.FixturesLifecycleService
+====
+[%collapsible]
 .Dependencies
-****
-joda-time:joda-time:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
-org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
-org.apache.isis.subdomains:isis-subdomains-spring-applib:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-****
+====
+* joda-time:joda-time:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed>
+* org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed>
+* org.apache.isis.subdomains:isis-subdomains-spring-applib:jar:<managed>
+* org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed>
+====
 
 |Apache Isis Tst - H2 Console (parent)
 [source,yaml]
@@ -4204,21 +4304,22 @@ Artifact: isis-testing-h2console-ui
 Type: jar
 Folder: \testing\h2console\ui
 ----
-|.Components
-****
-o.a.i.testing.h2console.ui.webmodule.WebModuleH2Console +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.testing.h2console.ui.webmodule.WebModuleH2Console
+====
+[%collapsible]
 .Dependencies
-****
-com.h2database:h2:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-****
-
+====
+* com.h2database:h2:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.adoc[IsisModuleTestingH2ConsoleUi], xref:system:generated:index/testing/h2console/ui/services/H2ManagerMenu.adoc[H2ManagerMenu], xref:system:generated:index/testing/h2console/ui/webmodule/WebModuleH2Console.adoc[WebModuleH2Console]
-****
+====
 
 |Apache Isis Tst - HSQLDB Manager (parent)
 [source,yaml]
@@ -4238,16 +4339,17 @@ Artifact: isis-testing-hsqldbmgr-ui
 Type: jar
 Folder: \testing\hsqldbmgr\ui
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.hsqldb:hsqldb:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.hsqldb:hsqldb:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc[IsisModuleExtHsqldbMgr], xref:system:generated:index/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc[HsqlDbManagerMenu]
-****
+====
 
 |Apache Isis Tst - Integ Test Support (parent)
 [source,yaml]
@@ -4267,29 +4369,30 @@ Artifact: isis-testing-integtestsupport-applib
 Type: jar
 Folder: \testing\integtestsupport\applib
 ----
-|.Components
-****
-o.a.i.testing.integtestsupport.applib.IsisIntegrationTestAbstract$InteractionSupport +
-****
-
-.Dependencies
-****
-com.approvaltests:approvaltests:jar:<managed> +
-com.h2database:h2:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
-org.apache.isis.security:isis-security-bypass:jar:<managed> +
-org.hamcrest:hamcrest-library:jar:<managed> +
-org.hsqldb:hsqldb:jar:<managed> +
-org.slf4j:slf4j-api:jar:${slf4j-api.version} +
-org.springframework:spring-test:jar:<managed> +
-org.springframework.boot:spring-boot-starter-test:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.testing.integtestsupport.applib.IsisIntegrationTestAbstract$InteractionSupport
+====
+[%collapsible]
+.Dependencies
+====
+* com.approvaltests:approvaltests:jar:<managed>
+* com.h2database:h2:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtimeservices:jar:<managed>
+* org.apache.isis.security:isis-security-bypass:jar:<managed>
+* org.hamcrest:hamcrest-library:jar:<managed>
+* org.hsqldb:hsqldb:jar:<managed>
+* org.slf4j:slf4j-api:jar:${slf4j-api.version}
+* org.springframework:spring-test:jar:<managed>
+* org.springframework.boot:spring-boot-starter-test:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/testing/integtestsupport/applib/ExceptionRecognizerTranslate.adoc[ExceptionRecognizerTranslate], xref:system:generated:index/testing/integtestsupport/applib/IsisIntegrationTestAbstract.adoc[IsisIntegrationTestAbstract], xref:system:generated:index/testing/integtestsupport/applib/IsisInteractionHandler.adoc[IsisInteractionHandler], xref:system:generated:index/testing/integtestsupport/applib/ThrowableMatchers.adoc[ThrowableMatchers], xref:system:generated:index/ [...]
-****
+====
 
 |Apache Isis Tst - Spec/Cucumber (parent)
 [source,yaml]
@@ -4309,19 +4412,20 @@ Artifact: isis-testing-specsupport-applib
 Type: jar
 Folder: \testing\specsupport\applib
 ----
-|.Dependencies
-****
-io.cucumber:cucumber-java:jar:<managed> +
-io.cucumber:cucumber-junit-platform-engine:jar:<managed> +
-io.cucumber:cucumber-spring:jar:<managed> +
-org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed> +
-org.junit.jupiter:junit-jupiter-api:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* io.cucumber:cucumber-java:jar:<managed>
+* io.cucumber:cucumber-junit-platform-engine:jar:<managed>
+* io.cucumber:cucumber-spring:jar:<managed>
+* org.apache.isis.testing:isis-testing-integtestsupport-applib:jar:<managed>
+* org.junit.jupiter:junit-jupiter-api:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/testing/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc[IsisModuleTestingSpecSupportApplib], xref:system:generated:index/testing/specsupport/applib/integration/ObjectFactoryForIntegration.adoc[ObjectFactoryForIntegration], xref:system:generated:index/testing/specsupport/applib/specs/V.adoc[V]
-****
+====
 
 |Apache Isis Tst - Unit Test Support (parent)
 [source,yaml]
@@ -4341,24 +4445,25 @@ Artifact: isis-testing-unittestsupport-applib
 Type: jar
 Folder: \testing\unittestsupport\applib
 ----
-|.Dependencies
-****
-com.approvaltests:approvaltests:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-codegen-bytebuddy:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-org.jmock:jmock:jar:<managed> +
-org.jmock:jmock-junit4:jar:<managed> +
-org.picocontainer:picocontainer:jar:<managed> +
-org.slf4j:slf4j-api:jar:<managed> +
-org.springframework:spring-test:jar:<managed> +
-org.springframework.boot:spring-boot-starter-test:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* com.approvaltests:approvaltests:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-codegen-bytebuddy:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+* org.jmock:jmock:jar:<managed>
+* org.jmock:jmock-junit4:jar:<managed>
+* org.picocontainer:picocontainer:jar:<managed>
+* org.slf4j:slf4j-api:jar:<managed>
+* org.springframework:spring-test:jar:<managed>
+* org.springframework.boot:spring-boot-starter-test:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/testing/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.adoc[IsisModuleTestingUnitTestSupportApplib], xref:system:generated:index/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc[AbstractBeanPropertiesTest], xref:system:generated:index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc[FixtureDatumFactoriesForAnyPojo], xref:system:generated:index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesFor [...]
-****
+====
 
 |Apache Isis - Tooling
 [source,yaml]
@@ -4372,17 +4477,18 @@ Folder: \tooling
 eg. code mining, automated documentation.
 (Targeted for JVM 11+)
 
+[%collapsible]
 .Dependencies
-****
-com.google.code.findbugs:annotations:jar:3.0.1u2 +
-org.junit.jupiter:junit-jupiter-api:jar:<managed> +
-org.junit.jupiter:junit-jupiter-engine:jar:<managed> +
-org.junit.vintage:junit-vintage-engine:jar:<managed> +
-org.mapstruct:mapstruct-processor:jar:1.4.2.Final +
-org.projectlombok:lombok:jar:<managed> +
-org.slf4j:slf4j-api:jar:<managed> +
-org.springframework.boot:spring-boot-starter-log4j2:jar:<managed> +
-****
+====
+* com.google.code.findbugs:annotations:jar:3.0.1u2
+* org.junit.jupiter:junit-jupiter-api:jar:<managed>
+* org.junit.jupiter:junit-jupiter-engine:jar:<managed>
+* org.junit.vintage:junit-vintage-engine:jar:<managed>
+* org.mapstruct:mapstruct-processor:jar:1.4.2.Final
+* org.projectlombok:lombok:jar:<managed>
+* org.slf4j:slf4j-api:jar:<managed>
+* org.springframework.boot:spring-boot-starter-log4j2:jar:<managed>
+====
 
 |Apache Isis - Tooling - C4 Modeling
 [source,yaml]
@@ -4396,12 +4502,13 @@ Folder: \tooling\c4modeling
 
 See https://c4model.com/
 
+[%collapsible]
 .Dependencies
-****
-com.structurizr:structurizr-core:jar:<managed> +
-com.structurizr:structurizr-plantuml:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-****
+====
+* com.structurizr:structurizr-core:jar:<managed>
+* com.structurizr:structurizr-plantuml:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+====
 
 |Apache Isis - Tooling - CLI (Command Line Interface)
 [source,yaml]
@@ -4413,16 +4520,17 @@ Folder: \tooling\cli
 ----
 |Command Line Interface for the _Apache Isis Tooling_ ecosystem.
 
+[%collapsible]
 .Dependencies
-****
-info.picocli:picocli:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-c4modeling:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-java2adoc:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-javamodel:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-model4adoc:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-projectmodel:jar:<managed> +
-****
+====
+* info.picocli:picocli:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-c4modeling:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-java2adoc:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-javamodel:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-model4adoc:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-projectmodel:jar:<managed>
+====
 
 |Apache Isis - Tooling - Java to Asciidoc (Code Mining)
 [source,yaml]
@@ -4434,13 +4542,14 @@ Folder: \tooling\java2adoc
 ----
 |Code mining library for Java source to Asciidoc conversion.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-javamodel:jar:<managed> +
-org.apache.isis.tooling:isis-tooling-model4adoc:jar:<managed> +
-org.jsoup:jsoup:jar:<managed> +
-****
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-javamodel:jar:<managed>
+* org.apache.isis.tooling:isis-tooling-model4adoc:jar:<managed>
+* org.jsoup:jsoup:jar:<managed>
+====
 
 |Apache Isis - Tooling - Java Model (Code Mining)
 [source,yaml]
@@ -4452,12 +4561,13 @@ Folder: \tooling\javamodel
 ----
 |Code mining library for Java bytecode introspection.
 
+[%collapsible]
 .Dependencies
-****
-com.github.andi-huber:code-assert:jar:-SNAPSHOT +
-com.github.javaparser:javaparser-core:jar:${javaparser.version} +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-****
+====
+* com.github.andi-huber:code-assert:jar:-SNAPSHOT
+* com.github.javaparser:javaparser-core:jar:${javaparser.version}
+* org.apache.isis.commons:isis-commons:jar:<managed>
+====
 
 |Apache Isis - Tooling - Model for AsciiDoc
 [source,yaml]
@@ -4476,11 +4586,12 @@ and https://accounts.eclipse.org/mailing-list/asciidoc-wg. However, we are happy
 help with transfer of source code, if any project (under the umbrella of the
 AsciiDoc Working Group) is willing to take over.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.asciidoctor:asciidoctorj:jar:<managed> +
-****
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.asciidoctor:asciidoctorj:jar:<managed>
+====
 
 |Apache Isis - Tooling - Project Model (Code mining)
 [source,yaml]
@@ -4492,12 +4603,13 @@ Folder: \tooling\projectmodel
 ----
 |Code mining library for Gradle/Maven project module tree introspection.
 
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.maven:maven-model-builder:jar:<managed> +
-org.gradle:gradle-tooling-api:jar:<managed> +
-****
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.maven:maven-model-builder:jar:<managed>
+* org.gradle:gradle-tooling-api:jar:<managed>
+====
 
 |Apache Isis Value types
 [source,yaml]
@@ -4509,10 +4621,11 @@ Folder: \valuetypes
 ----
 |Value types for use within Apache Isis applications.
 
+[%collapsible]
 .Dependencies
-****
-org.projectlombok:lombok:jar:<managed> +
-****
+====
+* org.projectlombok:lombok:jar:<managed>
+====
 
 |Apache Isis Val - Asciidoctor (parent)
 [source,yaml]
@@ -4532,17 +4645,18 @@ Artifact: isis-valuetypes-asciidoc-applib
 Type: jar
 Folder: \valuetypes\asciidoc\applib
 ----
-|.Dependencies
-****
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.asciidoctor:asciidoctorj-api:jar:${asciidoctorj.version} +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.asciidoctor:asciidoctorj-api:jar:${asciidoctorj.version}
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.adoc[IsisModuleValAsciidocApplib], xref:system:generated:index/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.adoc[AsciiDocJaxbAdapter], xref:system:generated:index/valuetypes/asciidoc/applib/value/AsciiDoc.adoc[AsciiDoc]
-****
+====
 
 |Apache Isis Val - Asciidoctor (MetaModel)
 [source,yaml]
@@ -4552,22 +4666,23 @@ Artifact: isis-valuetypes-asciidoc-metamodel
 Type: jar
 Folder: \valuetypes\asciidoc\metamodel
 ----
-|.Components
-****
-o.a.i.valuetypes.asciidoc.metamodel.AsciiDocMetaModelRefiner +
-o.a.i.valuetypes.asciidoc.metamodel.AsciiDocValueTypeProvider +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.valuetypes.asciidoc.metamodel.AsciiDocMetaModelRefiner
+* o.a.i.valuetypes.asciidoc.metamodel.AsciiDocValueTypeProvider
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc[IsisModuleValAsciidocMetaModel]
-****
+====
 
 |Apache Isis Val - Asciidoctor (Persistence)
 [source,yaml]
@@ -4577,11 +4692,12 @@ Artifact: isis-valuetypes-asciidoc-persistence
 Type: pom
 Folder: \valuetypes\asciidoc\persistence
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:<managed>
+====
 
 |Apache Isis Val - Asciidoctor (persistence jdo DN5)
 [source,yaml]
@@ -4591,15 +4707,16 @@ Artifact: isis-valuetypes-asciidoc-persistence-jdo-dn5
 Type: jar
 Folder: \valuetypes\asciidoc\persistence\jdo-dn5
 ----
-|.Dependencies
-****
-org.datanucleus:datanucleus-core:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.datanucleus:datanucleus-core:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.adoc[IsisModuleValAsciidocPersistenceJdoDn5], xref:system:generated:index/valuetypes/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.adoc[IsisAsciiDocConverter]
-****
+====
 
 |Apache Isis Val - Asciidoctor (ui)
 [source,yaml]
@@ -4609,15 +4726,16 @@ Artifact: isis-valuetypes-asciidoc-ui
 Type: pom
 Folder: \valuetypes\asciidoc\ui
 ----
-|.Dependencies
-****
-com.github.jnr:jnr-constants:jar:0.10.1 +
-com.github.jnr:jnr-enxio:jar:0.32.3 +
-com.github.jnr:jnr-posix:jar:3.1.4 +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:<managed> +
-org.asciidoctor:asciidoctorj:jar:${asciidoctorj.version} +
-****
+|[%collapsible]
+.Dependencies
+====
+* com.github.jnr:jnr-constants:jar:0.10.1
+* com.github.jnr:jnr-enxio:jar:0.32.3
+* com.github.jnr:jnr-posix:jar:3.1.4
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:<managed>
+* org.asciidoctor:asciidoctorj:jar:${asciidoctorj.version}
+====
 
 |Apache Isis Val - Asciidoctor (ui vaadin)
 [source,yaml]
@@ -4627,15 +4745,16 @@ Artifact: isis-valuetypes-asciidoc-ui-vaa
 Type: jar
 Folder: \valuetypes\asciidoc\ui\vaadin
 ----
-|.Components
-****
-o.a.i.valuetypes.asciidoc.ui.vaa.components.AsciiDocFieldFactoryVaa +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.valuetypes.asciidoc.ui.vaa.components.AsciiDocFieldFactoryVaa
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.incubator.viewer:isis-viewer-vaadin-ui:jar:${project.version} +
-****
+====
+* org.apache.isis.incubator.viewer:isis-viewer-vaadin-ui:jar:${project.version}
+====
 
 |Apache Isis Val - Asciidoctor (ui wicket)
 [source,yaml]
@@ -4645,27 +4764,28 @@ Artifact: isis-valuetypes-asciidoc-ui-wkt
 Type: jar
 Folder: \valuetypes\asciidoc\ui\wicket
 ----
-|.Components
-****
-o.a.i.valuetypes.asciidoc.ui.wkt.components.AsciiDocPanelFactoriesWkt$Parented +
-o.a.i.valuetypes.asciidoc.ui.wkt.components.AsciiDocPanelFactoriesWkt$Standalone +
-o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.chg.v2.ChangesDtoPanelFactoriesWkt$Parented +
-o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.chg.v2.ChangesDtoPanelFactoriesWkt$Standalone +
-o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.cmd.v2.CommandDtoPanelFactoriesWkt$Parented +
-o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.cmd.v2.CommandDtoPanelFactoriesWkt$Standalone +
-o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.ixn.v2.InteractionDtoPanelFactoriesWkt$Parented +
-o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.ixn.v2.InteractionDtoPanelFactoriesWkt$Standalone +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.AsciiDocPanelFactoriesWkt$Parented
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.AsciiDocPanelFactoriesWkt$Standalone
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.chg.v2.ChangesDtoPanelFactoriesWkt$Parented
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.chg.v2.ChangesDtoPanelFactoriesWkt$Standalone
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.cmd.v2.CommandDtoPanelFactoriesWkt$Parented
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.cmd.v2.CommandDtoPanelFactoriesWkt$Standalone
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.ixn.v2.InteractionDtoPanelFactoriesWkt$Parented
+* o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.ixn.v2.InteractionDtoPanelFactoriesWkt$Standalone
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
+====
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc[IsisModuleValAsciidocUiWkt]
-****
+====
 
 |Apache Isis Val - Markdown (parent)
 [source,yaml]
@@ -4685,17 +4805,18 @@ Artifact: isis-valuetypes-markdown-applib
 Type: jar
 Folder: \valuetypes\markdown\applib
 ----
-|.Dependencies
-****
-com.vladsch.flexmark:flexmark-all:jar:${flexmark.version} +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* com.vladsch.flexmark:flexmark-all:jar:${flexmark.version}
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.adoc[IsisModuleValMarkdownApplib], xref:system:generated:index/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.adoc[MarkdownJaxbAdapter], xref:system:generated:index/valuetypes/markdown/applib/value/Converter.adoc[Converter]
-****
+====
 
 |Apache Isis Val - Markdown (MetaModel)
 [source,yaml]
@@ -4705,22 +4826,23 @@ Artifact: isis-valuetypes-markdown-metamodel
 Type: jar
 Folder: \valuetypes\markdown\metamodel
 ----
-|.Components
-****
-o.a.i.valuetypes.markdown.metamodel.MarkdownMetaModelRefiner +
-o.a.i.valuetypes.markdown.metamodel.MarkdownValueTypeProvider +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.valuetypes.markdown.metamodel.MarkdownMetaModelRefiner
+* o.a.i.valuetypes.markdown.metamodel.MarkdownValueTypeProvider
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed> +
-****
-
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc[IsisModuleValMarkdownMetaModel]
-****
+====
 
 |Apache Isis Val - Markdown (Persistence)
 [source,yaml]
@@ -4730,11 +4852,12 @@ Artifact: isis-valuetypes-markdown-persistence
 Type: pom
 Folder: \valuetypes\markdown\persistence
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed>
+====
 
 |Apache Isis Val - Markdown (persistence jdo DN5)
 [source,yaml]
@@ -4744,16 +4867,17 @@ Artifact: isis-valuetypes-markdown-persistence-jdo-dn5
 Type: jar
 Folder: \valuetypes\markdown\persistence\jdo-dn5
 ----
-|.Dependencies
-****
-org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed> +
-org.datanucleus:datanucleus-core:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed>
+* org.datanucleus:datanucleus-core:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.adoc[IsisModuleValMarkdownPersistenceJdoDn5], xref:system:generated:index/valuetypes/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.adoc[IsisMarkdownConverter]
-****
+====
 
 |Apache Isis Val - Markdown (ui)
 [source,yaml]
@@ -4763,13 +4887,14 @@ Artifact: isis-valuetypes-markdown-ui
 Type: pom
 Folder: \valuetypes\markdown\ui
 ----
-|.Dependencies
-****
-com.vladsch.flexmark:flexmark-all:jar:${flexmark.version} +
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed> +
-org.jsoup:jsoup:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* com.vladsch.flexmark:flexmark-all:jar:${flexmark.version}
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed>
+* org.jsoup:jsoup:jar:<managed>
+====
 
 |Apache Isis Val - Markdown (ui wicket)
 [source,yaml]
@@ -4779,15 +4904,16 @@ Artifact: isis-valuetypes-markdown-ui-wkt
 Type: jar
 Folder: \valuetypes\markdown\ui\wicket
 ----
-|.Dependencies
-****
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc[IsisModuleValMarkdownUiWkt]
-****
+====
 
 |Apache Isis Val - Server Sent Events (parent)
 [source,yaml]
@@ -4807,17 +4933,18 @@ Artifact: isis-valuetypes-sse-applib
 Type: jar
 Folder: \valuetypes\sse\applib
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/sse/applib/IsisModuleValSseApplib.adoc[IsisModuleValSseApplib], xref:system:generated:index/valuetypes/sse/applib/annotations/ServerSentEvents.adoc[ServerSentEvents], xref:system:generated:index/valuetypes/sse/applib/annotations/SseSource.adoc[SseSource], xref:system:generated:index/valuetypes/sse/applib/service/SseChannel.adoc[SseChannel], xref:system:generated:index/valuetypes/sse/applib/service/SseService.adoc[SseService]
-****
+====
 
 |Apache Isis Val - Server Sent Events (metamodel)
 [source,yaml]
@@ -4827,16 +4954,17 @@ Artifact: isis-valuetypes-sse-metamodel
 Type: jar
 Folder: \valuetypes\sse\metamodel
 ----
-|.Components
-****
-o.a.i.valuetypes.sse.metamodel.facets.SseAnnotationFacetFactory$Register +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.valuetypes.sse.metamodel.facets.SseAnnotationFacetFactory$Register
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-sse-applib:jar:<managed> +
-****
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-sse-applib:jar:<managed>
+====
 
 |Apache Isis Val - SSE (ui)
 [source,yaml]
@@ -4846,11 +4974,12 @@ Artifact: isis-valuetypes-sse-ui
 Type: pom
 Folder: \valuetypes\sse\ui
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-metamodel:jar:<managed> +
-org.apache.isis.valuetypes:isis-valuetypes-sse-applib:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-metamodel:jar:<managed>
+* org.apache.isis.valuetypes:isis-valuetypes-sse-applib:jar:<managed>
+====
 
 |Apache Isis Val - Server Sent Events (ui wicket)
 [source,yaml]
@@ -4860,24 +4989,25 @@ Artifact: isis-valuetypes-sse-ui-wkt
 Type: jar
 Folder: \valuetypes\sse\ui\wicket
 ----
-|.Components
-****
-o.a.i.valuetypes.sse.ui.wkt.markup.ListeningMarkupPanelFactoriesForWicket$Parented +
-o.a.i.valuetypes.sse.ui.wkt.markup.ListeningMarkupPanelFactoriesForWicket$Standalone +
-o.a.i.valuetypes.sse.ui.wkt.services.SseServiceDefault +
-o.a.i.valuetypes.sse.ui.wkt.webmodule.WebModuleServerSentEvents +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.valuetypes.sse.ui.wkt.markup.ListeningMarkupPanelFactoriesForWicket$Parented
+* o.a.i.valuetypes.sse.ui.wkt.markup.ListeningMarkupPanelFactoriesForWicket$Standalone
+* o.a.i.valuetypes.sse.ui.wkt.services.SseServiceDefault
+* o.a.i.valuetypes.sse.ui.wkt.webmodule.WebModuleServerSentEvents
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.valuetypes:isis-valuetypes-sse-metamodel:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-****
-
+====
+* org.apache.isis.valuetypes:isis-valuetypes-sse-metamodel:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/valuetypes/sse/ui/wkt/IsisModuleValSseUiWkt.adoc[IsisModuleValSseUiWkt], xref:system:generated:index/valuetypes/sse/ui/wkt/services/SseServiceDefault.adoc[SseServiceDefault], xref:system:generated:index/valuetypes/sse/ui/wkt/webmodule/WebModuleServerSentEvents.adoc[WebModuleServerSentEvents]
-****
+====
 
 |Apache Isis Viewer - Common Model
 [source,yaml]
@@ -4887,20 +5017,21 @@ Artifact: isis-viewer-common
 Type: jar
 Folder: \viewers\common
 ----
-|.Components
-****
-o.a.i.viewer.common.model.branding.BrandingUiModelProvider +
-o.a.i.viewer.common.model.header.HeaderUiModelProvider +
-o.a.i.viewer.common.model.menu.MenuUiModelProvider +
-o.a.i.viewer.common.model.userprofile.UserProfileUiModelProvider +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.viewer.common.model.branding.BrandingUiModelProvider
+* o.a.i.viewer.common.model.header.HeaderUiModelProvider
+* o.a.i.viewer.common.model.menu.MenuUiModelProvider
+* o.a.i.viewer.common.model.userprofile.UserProfileUiModelProvider
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.webjars:font-awesome:jar:5.15.2 +
-****
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.webjars:font-awesome:jar:5.15.2
+====
 
 |Apache Isis Viewer - RO
 [source,yaml]
@@ -4920,18 +5051,19 @@ Artifact: isis-viewer-restfulobjects-applib
 Type: jar
 Folder: \viewers\restfulobjects\applib
 ----
-|.Dependencies
-****
-com.fasterxml.jackson.core:jackson-databind:jar:<managed> +
-org.apache.isis.commons:isis-commons:jar:<managed> +
-org.apache.isis.core:isis-applib:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* com.fasterxml.jackson.core:jackson-databind:jar:<managed>
+* org.apache.isis.commons:isis-commons:jar:<managed>
+* org.apache.isis.core:isis-applib:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc[IsisModuleViewerRestfulObjectsApplib], xref:system:generated:index/viewer/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation], xref:system:generated:index/viewer/restfulobjects/applib/LinkRepresentation.adoc[LinkRepresentation], xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel], xref:system:generated:index/viewer/restfulobjects/applib/RelDefinition.adoc[Re [...]
-****
+====
 
 |Apache Isis Viewer - RO (JAX-RS Resteasy v4)
 [source,yaml]
@@ -4943,26 +5075,27 @@ Folder: \viewers\restfulobjects\jaxrs-resteasy-4
 ----
 |JAX-RS plugin using jboss resteasy.
 
+[%collapsible]
 .Components
-****
-o.a.i.viewer.restfulobjects.jaxrsresteasy4.conneg.RestfulObjectsJaxbWriterForXml +
-o.a.i.viewer.restfulobjects.jaxrsresteasy4.webmodule.WebModuleJaxrsResteasy4 +
-****
-
+====
+* o.a.i.viewer.restfulobjects.jaxrsresteasy4.conneg.RestfulObjectsJaxbWriterForXml
+* o.a.i.viewer.restfulobjects.jaxrsresteasy4.webmodule.WebModuleJaxrsResteasy4
+====
+[%collapsible]
 .Dependencies
-****
-org.apache.isis.viewer:isis-viewer-restfulobjects-rendering:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-testing:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-viewer:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-org.jboss.resteasy:resteasy-jaxb-provider:jar:<managed> +
-org.jboss.resteasy:resteasy-spring-boot-starter:jar:<managed> +
-****
-
+====
+* org.apache.isis.viewer:isis-viewer-restfulobjects-rendering:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-testing:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-viewer:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+* org.jboss.resteasy:resteasy-jaxb-provider:jar:<managed>
+* org.jboss.resteasy:resteasy-spring-boot-starter:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/viewer/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.adoc[IsisModuleViewerRestfulObjectsJaxrsResteasy4], xref:system:generated:index/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.adoc[RestfulObjectsJaxbWriterForXml], xref:system:generated:index/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.adoc[WebModuleJaxrsResteasy4]
-****
+====
 
 |Apache Isis Viewer - RO (Rendering)
 [source,yaml]
@@ -4972,35 +5105,36 @@ Artifact: isis-viewer-restfulobjects-rendering
 Type: jar
 Folder: \viewers\restfulobjects\rendering
 ----
-|.Components
-****
-o.a.i.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder +
-o.a.i.viewer.restfulobjects.rendering.service.RepresentationServiceContentNegotiator +
-o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest +
-o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest$RequestFilter +
-o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest$ResponseFilter +
-o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceForRestfulObjectsV1_0 +
-o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheIsisV1 +
-o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheIsisV2 +
-o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceXRoDomainType +
-o.a.i.viewer.restfulobjects.rendering.service.swagger.SwaggerServiceDefault +
-o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.ClassExcluderDefault +
-o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator +
-o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault +
-o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault +
-****
-
-.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder
+* o.a.i.viewer.restfulobjects.rendering.service.RepresentationServiceContentNegotiator
+* o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest
+* o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest$RequestFilter
+* o.a.i.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest$ResponseFilter
+* o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceForRestfulObjectsV1_0
+* o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheIsisV1
+* o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheIsisV2
+* o.a.i.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceXRoDomainType
+* o.a.i.viewer.restfulobjects.rendering.service.swagger.SwaggerServiceDefault
+* o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.ClassExcluderDefault
+* o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator
+* o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault
+* o.a.i.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault
+====
+[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc[IsisModuleRestfulObjectsRendering], xref:system:generated:index/viewer/restfulobjects/rendering/service/RepresentationService.adoc[RepresentationService], xref:system:generated:index/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc[RepresentationServiceContentNegotiator], xref:system:generated:index/viewer/restfulobjects/rendering/service/acceptheader/Acce [...]
-****
+====
 
 |Apache Isis Viewer - RO (Testing)
 [source,yaml]
@@ -5010,12 +5144,13 @@ Artifact: isis-viewer-restfulobjects-testing
 Type: jar
 Folder: \viewers\restfulobjects\testing
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-viewer:jar:<managed> +
-****
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-runtime:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-viewer:jar:<managed>
+====
 
 |Apache Isis Viewer - RO (Viewer)
 [source,yaml]
@@ -5025,36 +5160,37 @@ Artifact: isis-viewer-restfulobjects-viewer
 Type: jar
 Folder: \viewers\restfulobjects\viewer
 ----
-|.Components
-****
-o.a.i.viewer.restfulobjects.viewer.mappers.ExceptionMapperForObjectNotFound +
-o.a.i.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRestfulObjectsApplication +
-o.a.i.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRuntimeException +
-o.a.i.viewer.restfulobjects.viewer.resources.DomainObjectResourceServerside +
-o.a.i.viewer.restfulobjects.viewer.resources.DomainServiceResourceServerside +
-o.a.i.viewer.restfulobjects.viewer.resources.DomainTypeResourceServerside +
-o.a.i.viewer.restfulobjects.viewer.resources.HomePageResourceServerside +
-o.a.i.viewer.restfulobjects.viewer.resources.ImageResourceServerside +
-o.a.i.viewer.restfulobjects.viewer.resources.MenuBarsResourceServerside +
-o.a.i.viewer.restfulobjects.viewer.resources.SwaggerSpecResource +
-o.a.i.viewer.restfulobjects.viewer.resources.UserResourceServerside +
-o.a.i.viewer.restfulobjects.viewer.resources.VersionResourceServerside +
-****
-
-.Dependencies
-****
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-restfulobjects-rendering:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.viewer.restfulobjects.viewer.mappers.ExceptionMapperForObjectNotFound
+* o.a.i.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRestfulObjectsApplication
+* o.a.i.viewer.restfulobjects.viewer.mappers.ExceptionMapperForRuntimeException
+* o.a.i.viewer.restfulobjects.viewer.resources.DomainObjectResourceServerside
+* o.a.i.viewer.restfulobjects.viewer.resources.DomainServiceResourceServerside
+* o.a.i.viewer.restfulobjects.viewer.resources.DomainTypeResourceServerside
+* o.a.i.viewer.restfulobjects.viewer.resources.HomePageResourceServerside
+* o.a.i.viewer.restfulobjects.viewer.resources.ImageResourceServerside
+* o.a.i.viewer.restfulobjects.viewer.resources.MenuBarsResourceServerside
+* o.a.i.viewer.restfulobjects.viewer.resources.SwaggerSpecResource
+* o.a.i.viewer.restfulobjects.viewer.resources.UserResourceServerside
+* o.a.i.viewer.restfulobjects.viewer.resources.VersionResourceServerside
+====
+[%collapsible]
+.Dependencies
+====
+* com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-common:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-restfulobjects-rendering:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/viewer/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc[IsisModuleViewerRestfulObjectsViewer]
-****
+====
 
 |Apache Isis Viewer - Wicket
 [source,yaml]
@@ -5074,19 +5210,20 @@ Artifact: isis-viewer-wicket-model
 Type: jar
 Folder: \viewers\wicket\model
 ----
-|.Dependencies
-****
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.core:isis-core-webapp:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-common:jar:<managed> +
-org.apache.wicket:wicket-core:jar:<managed> +
-org.apache.wicket:wicket-extensions:jar:<managed> +
-****
-
+|[%collapsible]
+.Dependencies
+====
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.core:isis-core-webapp:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-common:jar:<managed>
+* org.apache.wicket:wicket-core:jar:<managed>
+* org.apache.wicket:wicket-extensions:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/viewer/wicket/model/IsisModuleViewerWicketModel.adoc[IsisModuleViewerWicketModel]
-****
+====
 
 |Apache Isis Viewer - Wicket (UI Components)
 [source,yaml]
@@ -5096,38 +5233,39 @@ Artifact: isis-viewer-wicket-ui
 Type: jar
 Folder: \viewers\wicket\ui
 ----
-|.Components
-****
-o.a.i.viewer.wicket.ui.app.logout.LogoutHandlerWkt +
-o.a.i.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupportDefault +
-****
-
-.Dependencies
-****
-com.google.guava:guava:jar:<managed> +
-de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed> +
-de.agilecoders.wicket:wicket-bootstrap-extensions:jar:<managed> +
-de.agilecoders.wicket:wicket-bootstrap-themes:jar:<managed> +
-de.agilecoders.wicket.webjars:wicket-webjars:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-model:jar:<managed> +
-org.apache.wicket:wicket-auth-roles:jar:<managed> +
-org.apache.wicket:wicket-core:jar:<managed> +
-org.apache.wicket:wicket-devutils:jar:<managed> +
-org.apache.wicket:wicket-extensions:jar:<managed> +
-org.apache.wicket:wicket-spring:jar:<managed> +
-org.datanucleus:javax.jdo:jar:<managed> +
-org.slf4j:slf4j-api:jar:${slf4j-api.version} +
-org.webjars:jquery-ui:jar:<managed> +
-org.webjars:select2:jar:<managed> +
-org.webjars.bower:summernote:jar:<managed> +
-org.wicketstuff:wicketstuff-select2:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.viewer.wicket.ui.app.logout.LogoutHandlerWkt
+* o.a.i.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupportDefault
+====
+[%collapsible]
+.Dependencies
+====
+* com.google.guava:guava:jar:<managed>
+* de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed>
+* de.agilecoders.wicket:wicket-bootstrap-extensions:jar:<managed>
+* de.agilecoders.wicket:wicket-bootstrap-themes:jar:<managed>
+* de.agilecoders.wicket.webjars:wicket-webjars:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-model:jar:<managed>
+* org.apache.wicket:wicket-auth-roles:jar:<managed>
+* org.apache.wicket:wicket-core:jar:<managed>
+* org.apache.wicket:wicket-devutils:jar:<managed>
+* org.apache.wicket:wicket-extensions:jar:<managed>
+* org.apache.wicket:wicket-spring:jar:<managed>
+* org.datanucleus:javax.jdo:jar:<managed>
+* org.slf4j:slf4j-api:jar:${slf4j-api.version}
+* org.webjars:jquery-ui:jar:<managed>
+* org.webjars:select2:jar:<managed>
+* org.webjars.bower:summernote:jar:<managed>
+* org.wicketstuff:wicketstuff-select2:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/viewer/wicket/ui/IsisModuleViewerWicketUi.adoc[IsisModuleViewerWicketUi]
-****
+====
 
 |Apache Isis Viewer - Wicket (Viewer)
 [source,yaml]
@@ -5137,39 +5275,40 @@ Artifact: isis-viewer-wicket-viewer
 Type: jar
 Folder: \viewers\wicket\viewer
 ----
-|.Components
-****
-o.a.i.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault +
-o.a.i.viewer.wicket.viewer.registries.components.ComponentFactoryRegistryDefault +
-o.a.i.viewer.wicket.viewer.registries.pages.PageClassListDefault +
-o.a.i.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault +
-o.a.i.viewer.wicket.viewer.registries.pages.PageNavigationServiceDefault +
-o.a.i.viewer.wicket.viewer.services.BookmarkUiServiceWicket +
-o.a.i.viewer.wicket.viewer.services.DeepLinkServiceWicket +
-o.a.i.viewer.wicket.viewer.services.HintStoreUsingWicketSession +
-o.a.i.viewer.wicket.viewer.services.ImageResourceCacheClassPath +
-o.a.i.viewer.wicket.viewer.services.LocaleProviderWicket +
-o.a.i.viewer.wicket.viewer.services.TranslationsResolverWicket +
-o.a.i.viewer.wicket.viewer.services.WicketViewerSettingsDefault +
-o.a.i.viewer.wicket.viewer.services.mementos.ObjectMementoServiceWicket +
-o.a.i.viewer.wicket.viewer.webmodule.WebModuleWicket +
-****
-
-.Dependencies
-****
-commons-io:commons-io:jar:<managed> +
-de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed> +
-net.ftlines.wicket-source:wicket-source:jar:<managed> +
-org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
-org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
-org.apache.wicket:wicket-auth-roles:jar:<managed> +
-org.apache.wicket:wicket-spring:jar:<managed> +
-org.jmock:jmock-junit4:jar:<managed> +
-org.springframework:spring-web:jar:<managed> +
-****
-
+|[%collapsible]
+.Components
+====
+* o.a.i.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault
+* o.a.i.viewer.wicket.viewer.registries.components.ComponentFactoryRegistryDefault
+* o.a.i.viewer.wicket.viewer.registries.pages.PageClassListDefault
+* o.a.i.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault
+* o.a.i.viewer.wicket.viewer.registries.pages.PageNavigationServiceDefault
+* o.a.i.viewer.wicket.viewer.services.BookmarkUiServiceWicket
+* o.a.i.viewer.wicket.viewer.services.DeepLinkServiceWicket
+* o.a.i.viewer.wicket.viewer.services.HintStoreUsingWicketSession
+* o.a.i.viewer.wicket.viewer.services.ImageResourceCacheClassPath
+* o.a.i.viewer.wicket.viewer.services.LocaleProviderWicket
+* o.a.i.viewer.wicket.viewer.services.TranslationsResolverWicket
+* o.a.i.viewer.wicket.viewer.services.WicketViewerSettingsDefault
+* o.a.i.viewer.wicket.viewer.services.mementos.ObjectMementoServiceWicket
+* o.a.i.viewer.wicket.viewer.webmodule.WebModuleWicket
+====
+[%collapsible]
+.Dependencies
+====
+* commons-io:commons-io:jar:<managed>
+* de.agilecoders.wicket:wicket-bootstrap-core:jar:<managed>
+* net.ftlines.wicket-source:wicket-source:jar:<managed>
+* org.apache.isis.core:isis-core-internaltestsupport:jar:<managed>
+* org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed>
+* org.apache.wicket:wicket-auth-roles:jar:<managed>
+* org.apache.wicket:wicket-spring:jar:<managed>
+* org.jmock:jmock-junit4:jar:<managed>
+* org.springframework:spring-web:jar:<managed>
+====
+[%collapsible]
 .Document Index Entries
-****
+====
 xref:system:generated:index/viewer/wicket/viewer/IsisModuleViewerWicketViewer.adoc[IsisModuleViewerWicketViewer]
-****
+====
 |===
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
index 0fe9d5f..40dee42 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
@@ -9,7 +9,7 @@ Sometimes an action might perform irreversible changes.
 In such a case it's probably a good idea for the UI to require that the end-user explicitly confirms that they intended to invoke the action.
 
 
-One way to meet this requirement is using the framework's built-in xref:refguide:applib-ant:Action.adoc#semantics[`@Action#semantics`] attribute:
+One way to meet this requirement is using the framework's built-in xref:system:generated:index/applib/annotation/Action.adoc#semantics[`@Action#semantics`] attribute:
 
 [source,java]
 ----
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
index ed727cf..e771622 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
@@ -22,7 +22,7 @@ And refresh the current page when receiving a null response or invoking a void a
 But how to implement this?_
 
 One way to implement this idea is to provide a custom implementation of the xref:refguide:applib-svc:RoutingService.adoc[`RoutingService`] SPI domain service.
-The default implementation will either return the current object (if not null), else the home page (as defined by xref:refguide:applib-ant:HomePage.adoc[`@HomePage`]) if one exists.
+The default implementation will either return the current object (if not null), else the home page (as defined by xref:system:generated:index/applib/annotation/HomePage.adoc[`@HomePage`]) if one exists.
 
 The following custom implementation refines this to use the breadcrumbs (available in the Wicket viewer) to return the first non-deleted domain object found in the list of breadcrumbs:
 
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
index f7e698d..7900ff5 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
@@ -15,9 +15,9 @@ One way to implement is to use the xref:refguide:applib-svc:EventBusService.adoc
 
 * Set up a xref:refguide:applib-cm:classes/domainevent.adoc[domain event] subscriber that can veto the changes.
 
-* if the change is made through an action, you can use xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent`].
+* if the change is made through an action, you can use xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent`].
 
-if if the change is made through an edit, you can use xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent`].
+if if the change is made through an edit, you can use xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent`].
 
 You'll need some way to know which fields should be spell checked.  Two ways spring to mind:
 
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
index bf3730d..b01ed44 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
@@ -19,5 +19,5 @@ NOTE: FIXME
 
 == Persistence Concerns
 
-NOTE: FIXME -  easiest to simply store using DataNucleus' support for collections, marked as xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`] so that it is ignored by Apache Isis.  Alternatively can store as json/xml in a varchar(4000) or clob and manually unpack.
+NOTE: FIXME -  easiest to simply store using DataNucleus' support for collections, marked as xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] so that it is ignored by Apache Isis.  Alternatively can store as json/xml in a varchar(4000) or clob and manually unpack.
 
diff --git a/api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc b/api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc
index cdb2b73..a47c3d1 100644
--- a/api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc
+++ b/api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc
@@ -10,7 +10,7 @@
 By default properties cannot be edited, as specified by the
 xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.editing[`isis.applib.annotation.domain-object.editing`] configuration property.
 
-This policy can be overridden for an individual property using the xref:refguide:applib-ant:Property.adoc#editing[`@Property#editing`] annotation; this makes sense for properties where there are no business rules governing their content, for example "notes" or "comments" fields.
+This policy can be overridden for an individual property using the xref:system:generated:index/applib/annotation/Property.adoc#editing[`@Property#editing`] annotation; this makes sense for properties where there are no business rules governing their content, for example "notes" or "comments" fields.
 
 For example:
 
@@ -25,7 +25,7 @@ private String notes;
 ----
 <.> Allows the property to be enabled (even if property editing is disabled globally).
 
-It's also possible to make all properties of a domain object editable using xref:refguide:applib-ant:DomainObject.adoc[`@DomainObject`], though use cases for this are rare.
+It's also possible to make all properties of a domain object editable using xref:system:generated:index/applib/annotation/DomainObject.adoc[`@DomainObject`], though use cases for this are rare.
 
 For very simply "CRUD-y" like applications, you might wish to switch the global policy, so that all properties are enabled by default, then selectively disable them.
 
diff --git a/api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc b/api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc
index 20f3aee..50ff45b 100644
--- a/api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc
+++ b/api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc
@@ -62,7 +62,7 @@ The framework validates each argument separately; only if all are valid does it
 == For more information
 
 For more information, see the xref:refguide:applib-cm:methods.adoc#validate[`validate...()`] section in the appropriate reference guide.
-The reference guide also explains how to define validation declaratively, using the xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`] or xref:refguide:applib-ant:Property.adoc#mustSatisfy[`@Property#mustSatisfy()`] attributes.
+The reference guide also explains how to define validation declaratively, using the xref:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`] or xref:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[`@Property#mustSatisfy()`] attributes.
 
 It's also possible to return xref:userguide:btb:i18n.adoc#imperative-messages[locale-specific] strings, by returning xref:refguide:applib-cm:classes.adoc#TranslatableString[`TranslatableString`] instead of `java.lang.String`.
 
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/core-values.adoc b/api/adoc/userguide/modules/fun/pages/concepts-patterns/core-values.adoc
index f0a884d..17d0549 100644
--- a/api/adoc/userguide/modules/fun/pages/concepts-patterns/core-values.adoc
+++ b/api/adoc/userguide/modules/fun/pages/concepts-patterns/core-values.adoc
@@ -82,7 +82,7 @@ To support the business domain being split into separate modules, the framework
 
 For those cases where a module needs to interact with other modules but does not know about their implementations, the module can either define its own link:https://en.wikipedia.org/wiki/Service_provider_interface[SPI] domain services or it can define custom domain events and fire them.
 This technique is also used extensively by the framework itself.
-For example, the xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`] SPI enables custom auditing, and the xref:refguide:applib-svc:ExecutionSubscriber.adoc[`PublisherService`] SPI enables custom publishing.
+For example, the xref:refguide:applib-svc:EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] SPI enables custom auditing, and the xref:refguide:applib-svc:ExecutionSubscriber.adoc[`PublisherService`] SPI enables custom publishing.
 
 When building a modular application, it's important to consider the logical layering of the modules: we don't need every module to be completely decoupled from every other.
 The most important requirement is that there are no cyclic dependencies, because otherwise we run the risk of the application degrading into a link:https://en.wikipedia.org/wiki/Big_ball_of_mud["big ball of mud"].
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
index 22c817a..7e7c9cc 100644
--- a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
+++ b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
@@ -10,7 +10,7 @@ This may be exposed in the UI, or might be invoked programmatically.
 
 However, a service cannot have (persisted) properties, nor can it have (persisted) collections.
 
-Domain services that are visible in the UI or REST API are annotated with xref:refguide:applib-ant:DomainService.adoc[`@DomainService()`], while services that are _programmatic_ in nature should be simply annotated using Spring's xref:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Component.html[`@Component`] or one of its specializations, eg
+Domain services that are visible in the UI or REST API are annotated with xref:system:generated:index/applib/annotation/DomainService.adoc[`@DomainService()`], while services that are _programmatic_ in nature should be simply annotated using Spring's xref:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Component.html[`@Component`] or one of its specializations, eg
 xref:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Service.html[`@Service`]
 orxref:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Repository.html[`@Repository`].
 
@@ -23,12 +23,12 @@ This section looks at the programming model for writing your own domain services
 == Nature of Service
 
 Apache Isis uses Spring Boot to instantiate and manage the dependency injection of domain services.
-The vast majority of these are singleton (application) scoped; a smaller number are request scoped (using the xref:refguide:applib-ant:InteractionScope.adoc[`@IsisSessionScope`] annotation).
+The vast majority of these are singleton (application) scoped; a smaller number are request scoped (using the xref:system:generated:index/applib/annotation/InteractionScope.adoc[`@IsisSessionScope`] annotation).
 
 Accordingly, all domain services are annotated or meta-annotated using Spring's link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/stereotype/Component.html[`@Component`] annotation.
 
-For domain services to be visible in the Apache Isis UI, they must be annotated with xref:refguide:applib-ant:DomainService.adoc[`@DomainService`].
-Its xref:refguide:applib-ant:DomainService.adoc#nature[`#nature()`] attribute is either:
+For domain services to be visible in the Apache Isis UI, they must be annotated with xref:system:generated:index/applib/annotation/DomainService.adoc[`@DomainService`].
+Its xref:system:generated:index/applib/annotation/DomainService.adoc#nature[`#nature()`] attribute is either:
 
 * `VIEW` (the default if not specified)
 +
@@ -138,7 +138,7 @@ public class Customers {
 
 <.> Rendered in the UI as a "Find By Name" menu item underneath the "Customers" menu.
 
-<.> The xref:refguide:applib-ant:ParameterLayout.adoc[`@ParameterLayout`] provides metadata for the parameter itself, in this case its name.
+<.> The xref:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`] provides metadata for the parameter itself, in this case its name.
 +
 [TIP]
 ====
@@ -149,7 +149,7 @@ There's no need to name the action parameters if the code is compiled using the
 The framework can inject into not just other domain services but will also automatically into domain entities and view models.
 There is further discussion of service injection xref:userguide:fun:domain-entities-and-services.adoc#injecting-services[below].
 
-<.> xref:refguide:applib-ant:Action.adoc#restrictTo[Prototype] actions are rendered only in prototyping mode.
+<.> xref:system:generated:index/applib/annotation/Action.adoc#restrictTo[Prototype] actions are rendered only in prototyping mode.
 A "list all" action such as this can be useful when exploring the domain with a small dataset.
 
 <.> Menu services typically delegate to an underlying repository/ies specific to the domain (rather than use `RepositoryService` directly, for example).
@@ -198,7 +198,7 @@ Sometimes though a service's lifetime is applicable only to a single (http) requ
 The framework has a number of such services, including a xref:refguide:applib-svc:Scratchpad.adoc[`Scratchpad`] service (to share adhoc data between methods), and xref:refguide:applib-svc:QueryResultsCache.adoc[`QueryResultsCache`], which as its name suggests will cache query results.
 Such services _do_ hold state, but that state is scoped per (possibly concurrent) request and should be removed afterwards.
 
-The requirement for request-scoped services is supported using Apache Isis' own xref:refguide:applib-ant:InteractionScope.adoc[`@IsisSessionScope`] annotation (named because a short-lived `IsisSession` is created for each request).
+The requirement for request-scoped services is supported using Apache Isis' own xref:system:generated:index/applib/annotation/InteractionScope.adoc[`@IsisSessionScope`] annotation (named because a short-lived `IsisSession` is created for each request).
 This is used by the framework services and can also be used for user-defined services.
 
 For example:
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc
index be0cab6..ec18d7b 100644
--- a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc
+++ b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc
@@ -177,7 +177,7 @@ All other implementations available will also be called.
 
 Most domain services are application-scoped, in other words they are stateless global singletons that are shared by all concurrent requests.
 
-A small number of framework-provided services are annotated using xref:refguide:applib-ant:InteractionScope.adoc[`@IsisSessionScope`].
+A small number of framework-provided services are annotated using xref:system:generated:index/applib/annotation/InteractionScope.adoc[`@IsisSessionScope`].
 This means that they are stateful and scoped with each isis session, in other words HTTP request.
 One such service is xref:refguide:applib-svc:QueryResultsCache.adoc[`QueryResultsCache`], used for performance caching.
 
diff --git a/api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc b/api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
index f5de6d1..eaf8f61 100644
--- a/api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
+++ b/api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
@@ -121,7 +121,7 @@ For example:
 public class Product { /* ... */ }
 ----
 
-For more on this, see xref:refguide:applib-ant:DomainObject.adoc#bounding[`@DomainObject#bounding`].
+For more on this, see xref:system:generated:index/applib/annotation/DomainObject.adoc#bounding[`@DomainObject#bounding`].
 
 Or, if the data type is an enum, then a drop-down will be provided automatically.
 A payment method is a good example of this:
@@ -160,7 +160,7 @@ public class Customers {
 }
 ----
 
-For more on this, see xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`].
+For more on this, see xref:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`].
 
 [TIP]
 ====
@@ -187,7 +187,7 @@ public List<Tag> autoCompleteTag(@MinLength(1) search) {
 ----
 
 
-If the action has been associated with a collection, using xref:refguide:applib-ant:Action.adoc#associateWith[`@Action#associateWith()`], then the collection can be used to provide a list of candidate values.
+If the action has been associated with a collection, using xref:system:generated:index/applib/annotation/Action.adoc#associateWith[`@Action#associateWith()`], then the collection can be used to provide a list of candidate values.
 
 The xref:vw:ROOT:about.adoc[Wicket Viewer] handles this by rendering checkboxes against the associated collection; the user can select/deselect these checkboxes and the selected items are taken as the values for the multi-select action.
 
diff --git a/api/adoc/userguide/modules/fun/pages/meta-annotations.adoc b/api/adoc/userguide/modules/fun/pages/meta-annotations.adoc
index cc87f0a..8729e58 100644
--- a/api/adoc/userguide/modules/fun/pages/meta-annotations.adoc
+++ b/api/adoc/userguide/modules/fun/pages/meta-annotations.adoc
@@ -38,10 +38,10 @@ public @interface Name {
 ----
 <.> ORM annotation
 <.> Annotations that are inferred if annotated on a property. +
-The xref:refguide:applib-ant:Property.adoc#mustSatisfy[`@Property#mustSatisfy()`] allows arbitrary validation rules to be specified for the property.
+The xref:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[`@Property#mustSatisfy()`] allows arbitrary validation rules to be specified for the property.
 
 <.> Annotations that are inferred if annotated on a parameter +
-The xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`] allows the same validation rules to be specified for the parameter.
+The xref:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`] allows the same validation rules to be specified for the parameter.
 
 <.> Layout annotations that are inferred if annotated on a parameter
 
diff --git a/api/adoc/userguide/modules/fun/pages/mixins.adoc b/api/adoc/userguide/modules/fun/pages/mixins.adoc
index d6782b2..d1cbd33 100644
--- a/api/adoc/userguide/modules/fun/pages/mixins.adoc
+++ b/api/adoc/userguide/modules/fun/pages/mixins.adoc
@@ -15,15 +15,15 @@ Under the covers, all mixins are basically actions that use the mixee as one of
 ** if as derived state, then it will be rendered as a property (if it returns a scalar), or as a collection (if it returns a vector).
 
 
-Accordingly, a mixin can be defined using the xref:refguide:applib-ant:Action.adoc[`@Action`], xref:refguide:applib-ant:Property.adoc[`@Property`] or xref:refguide:applib-ant:Collection.adoc[`@Collection`] annotations, but defined at the domain class level rather than at the method level.
+Accordingly, a mixin can be defined using the xref:system:generated:index/applib/annotation/Action.adoc[`@Action`], xref:system:generated:index/applib/annotation/Property.adoc[`@Property`] or xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`] annotations, but defined at the domain class level rather than at the method level.
 
-Using xref:refguide:applib-ant:DomainObject.adoc#nature[`@DomainObject#nature`] attribute (specifying a nature of `Nature.MIXIN`), in combination with the above allows for more fine grained control, eg. nominating the mixin's method name.
+Using xref:system:generated:index/applib/annotation/DomainObject.adoc#nature[`@DomainObject#nature`] attribute (specifying a nature of `Nature.MIXIN`), in combination with the above allows for more fine grained control, eg. nominating the mixin's method name.
 
 When the mixin follows the naming convention `SomeType_mixinName` then the method name can be abbreviated, and the name of the member being contributed is inferred from the name of the class itself, being everything after the last '_'.
 
 == Contributed Collection
 
-The example below shows how to contribute a collection, using xref:refguide:applib-ant:Collection.adoc[`@Collection`].
+The example below shows how to contribute a collection, using xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`].
 The method is expected to be called "coll":
 
 [source,java]
@@ -52,7 +52,7 @@ The above will result in a contributed collection "documents" for all types that
 
 == Contributed Property
 
-Contributed properties can likewise be defined using xref:refguide:applib-ant:Property.adoc[`@Property`]; this implies a method called "prop":
+Contributed properties can likewise be defined using xref:system:generated:index/applib/annotation/Property.adoc[`@Property`]; this implies a method called "prop":
 
 [source,java]
 ----
@@ -80,7 +80,7 @@ This contributes a property called "mostRecentDocument".
 [#contributed-action]
 == Contributed Action
 
-Contributed actions are defined similarly, using xref:refguide:applib-ant:Action.adoc[`@Action`]; this implies a method called "act".
+Contributed actions are defined similarly, using xref:system:generated:index/applib/annotation/Action.adoc[`@Action`]; this implies a method called "act".
 For example:
 
 [source,java]
diff --git a/api/adoc/userguide/modules/fun/pages/object-members/actions.adoc b/api/adoc/userguide/modules/fun/pages/object-members/actions.adoc
index eb765b4..32c38e7 100644
--- a/api/adoc/userguide/modules/fun/pages/object-members/actions.adoc
+++ b/api/adoc/userguide/modules/fun/pages/object-members/actions.adoc
@@ -25,7 +25,7 @@ You can find further discussion on when and why you should write actions xref:ov
 If the xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.action.explicit[`isis.applib.annotation.action.explicit`] configuration property is not set (the default), then any "left-over" `public` methods will be considered to be actions.
 These are methods that do not represent properties or collections, and that are not recognised as xref:business-rules.adoc[supporting methods] (such as `hideXxx()` or `disableXxx()`).
 
-Conversely, if that xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.action.explicit[`isis.applib.annotation.action.explicit`] configuration property _is_ set, then the xref:refguide:applib-ant:Action.adoc[`@Action`] annotation must be applied for the method to be treated as an action.
+Conversely, if that xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.action.explicit[`isis.applib.annotation.action.explicit`] configuration property _is_ set, then the xref:system:generated:index/applib/annotation/Action.adoc[`@Action`] annotation must be applied for the method to be treated as an action.
 The `@Action` annotation is also used to specify additional domain semantics, for example regarding idempotency.
 
 For example:
@@ -48,7 +48,7 @@ If the code is compiled (`javac`) using the `-parameters` flag, then the name of
 
 Otherwise, the type of the parameter is used.
 For the `product` parameter this is reasonable, but not so for the `quantity` parameter (which would by default show up with a name of "int".
-In such a case the xref:refguide:applib-ant:ParameterLayout.adoc[`@ParameterLayout`] annotation can be used to provide the UI hint.
+In such a case the xref:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`] annotation can be used to provide the UI hint.
 
 
 
@@ -87,7 +87,7 @@ ProductRepository productRepository;
 The "0" in the name means that this corresponds to parameter 0 of the "addToBasket" action (ie `Product`).
 It is also required to return a Collection of that type.
 
-<.> The xref:refguide:applib-ant:MinLength.adoc[`@MinLength`] annotation defines how many characters the end-user must enter before performing a search.
+<.> The xref:system:generated:index/applib/annotation/MinLength.adoc[`@MinLength`] annotation defines how many characters the end-user must enter before performing a search.
 
 <.> The implementation delegates to an injected repository service.  This is typical.
 
@@ -110,7 +110,7 @@ public class Product ... {
 <.> Whenever an action parameter requiring a `Product` is defined, provide an autoComplete drop-down automatically
 <.> Use the "find" method of `ProductRepository` (rather than the default name of "autoComplete").
 +
-NOTE: The referenced method can be xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`] - it doesn't actually need to be an action in the metamodel.
+NOTE: The referenced method can be xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] - it doesn't actually need to be an action in the metamodel.
 
 === Removing boilerplate with choices
 
@@ -164,12 +164,12 @@ public List<Product> autoComplete0AddToBasket(              // <.>
 }
 ----
 
-As the example suggests, any collection parameter type must provide a way to select items, either by way of a "choices" or "autoComplete" supporting method or alternatively defined globally using xref:refguide:applib-ant:DomainObject.adoc[`@DomainObject`] on the referenced type (described xref:userguide:fun:object-members.adoc#reference-parameter-types[above]).
+As the example suggests, any collection parameter type must provide a way to select items, either by way of a "choices" or "autoComplete" supporting method or alternatively defined globally using xref:system:generated:index/applib/annotation/DomainObject.adoc[`@DomainObject`] on the referenced type (described xref:userguide:fun:object-members.adoc#reference-parameter-types[above]).
 
 
 == Optional Parameters
 
-Either the xref:refguide:applib-ant:Nullable.adoc[`@Nullable`] annotation or the xref:refguide:applib-ant:Parameter.adoc#optionality[`@Parameter#optionality`]  annotation/attribute can be used to indicate that a parameter can be left blank.
+Either the xref:refguide:applib-ant:Nullable.adoc[`@Nullable`] annotation or the xref:system:generated:index/applib/annotation/Parameter.adoc#optionality[`@Parameter#optionality`]  annotation/attribute can be used to indicate that a parameter can be left blank.
 
 For example:
 
@@ -205,7 +205,7 @@ See also xref:userguide:fun:meta-annotations.adoc#properties-vs-parameters[prope
 
 == ``String`` Parameters (Length)
 
-The xref:refguide:applib-ant:Parameter.adoc#maxLength[`@Parameter#maxLength`] annotation/attribute is used to specify the maximum number of characters allowed for a string parameter.
+The xref:system:generated:index/applib/annotation/Parameter.adoc#maxLength[`@Parameter#maxLength`] annotation/attribute is used to specify the maximum number of characters allowed for a string parameter.
 
 For example:
 
@@ -235,7 +235,7 @@ private String firstName;
 @Getter @Setter
 private String lastName;
 ----
-<.> Specifies the parameter length using xref:refguide:applib-ant:Parameter.adoc#maxLength[`@Parameter#maxLength`] annotation
+<.> Specifies the parameter length using xref:system:generated:index/applib/annotation/Parameter.adoc#maxLength[`@Parameter#maxLength`] annotation
 <.> Specifies the length of a corresponding property.
 +
 Note that this uses an ORM-specific annotation (in this case, xref:refguide:applib-ant:Column.adoc#length-for-strings[`@Column#length()`] annotation
diff --git a/api/adoc/userguide/modules/fun/pages/object-members/collections.adoc b/api/adoc/userguide/modules/fun/pages/object-members/collections.adoc
index d7b4894..9d13191 100644
--- a/api/adoc/userguide/modules/fun/pages/object-members/collections.adoc
+++ b/api/adoc/userguide/modules/fun/pages/object-members/collections.adoc
@@ -15,8 +15,8 @@ Formally speaking, a collection is simply a regular JavaBean getter, returning a
 Most collections (those that are modifiable) will also have a setter and, if persisted, a backing instance field.
 And collections properties will also have a number of annotations:
 
-* Apache Isis defines its own xref xref:refguide:applib-ant:Collection.adoc[`@Collection`] annotation for capturing domain semantics.
-It also provides a xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] for UI hints (though the information in this annotation may instead be provided by a supplementary xref:userguide:fun:ui.adoc#object-layout[`.layout.xml`] file)
+* Apache Isis defines its own xref xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`] annotation for capturing domain semantics.
+It also provides a xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`] for UI hints (though the information in this annotation may instead be provided by a supplementary xref:userguide:fun:ui.adoc#object-layout[`.layout.xml`] file)
 
 * the collections of domain entities are often annotated with ORM annotation(s).
 In the case of JDO/DataNucleus annotations this is most notably `javax.jdo.annotations.Persistent`.
@@ -103,14 +103,14 @@ JDO/Datanucleus does support the mapping of these other types, but RDBMS are set
 
 While ORMs support `java.util.Map` as a collection type, maps are not supported by Apache Isis.
 
-If you do wish to use this collection type, then annotate the getter with xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`] so that it is ignored by the Apache Isis framework.
+If you do wish to use this collection type, then annotate the getter with xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] so that it is ignored by the Apache Isis framework.
 
 == Value vs Reference Types
 
 While ORMs support collections/arrays of value types, such collections are not supported by Apache Isis.
 Apache Isis can (currently) only provide a UI for collections of references.
 
-If you do wish to use collections of this type, then annotate the getter with xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`] so that it is ignored by the Apache Isis framework.
+If you do wish to use collections of this type, then annotate the getter with xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] so that it is ignored by the Apache Isis framework.
 
 As a workaround, if you want to visualize an array of value types in Apache Isis, then one option is to wrap the value in a view model, as explained xref:userguide:btb:about.adoc#simulating-collections-of-values[here].
 
diff --git a/api/adoc/userguide/modules/fun/pages/object-members/properties.adoc b/api/adoc/userguide/modules/fun/pages/object-members/properties.adoc
index 03b1550..24a0375 100644
--- a/api/adoc/userguide/modules/fun/pages/object-members/properties.adoc
+++ b/api/adoc/userguide/modules/fun/pages/object-members/properties.adoc
@@ -15,8 +15,8 @@ Formally speaking, a property is simply a regular JavaBean getter, returning a s
 Most properties (those that are editable/modifiable) will also have a setter and, if persisted, a backing instance field.
 And most properties will also have a number of annotations:
 
-* Apache Isis defines its own xref:refguide:applib-ant:Property.adoc[`@Property`] annotation for capturing domain semantics.
-It also provides a xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`] for UI hints (though the information in this annotation may instead be provided by a supplementary xref:userguide:fun:ui.adoc#object-layout[`.layout.xml`] file)
+* Apache Isis defines its own xref:system:generated:index/applib/annotation/Property.adoc[`@Property`] annotation for capturing domain semantics.
+It also provides a xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`] for UI hints (though the information in this annotation may instead be provided by a supplementary xref:userguide:fun:ui.adoc#object-layout[`.layout.xml`] file)
 
 * the properties of domain entities are usually also annotated with an ORM annotation.
 +
@@ -145,7 +145,7 @@ import lombok.Setter;
 private String notes;
 ----
 
-If this is omitted then whether editing is enabled or disabled is inherited from the domain object level, xref:refguide:applib-ant:DomainObject.adoc#editing[`@DomainObject#editing()`].
+If this is omitted then whether editing is enabled or disabled is inherited from the domain object level, xref:system:generated:index/applib/annotation/DomainObject.adoc#editing[`@DomainObject#editing()`].
 
 If that isn't specified (or is set to "AS_CONFIGURED"), then the configuration is taken from the `application.properties` configuration file:
 
@@ -196,7 +196,7 @@ Excluded from the Apache Isis metamodel.
 == Ignoring Properties
 
 By default Apache Isis will automatically render all properties in the xref:vw:ROOT:about.adoc[Wicket UI] or in the xref:vro:ROOT:about.adoc[REST API].
-To get Apache Isis to ignore a property (exclude it from its metamodel), annotate the getter using xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`].
+To get Apache Isis to ignore a property (exclude it from its metamodel), annotate the getter using xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`].
 
 Similarly, for the JDO/DataNucleus ORM, ignore a property using the `@javax.jdo.annotations.NotPersistent` annotation.
 This is independent of Apache Isis; in other words that property will still be rendered in the UI (unless also annotated with `@Programmatic`).
@@ -204,7 +204,7 @@ This is independent of Apache Isis; in other words that property will still be r
 For view models, you can tell JAXB to ignore a property using the `@javax.xml.bind.annotation.XmlTransient` annotation.
 Again, this is independent of Apache Isis.
 
-You can also suppress a property from the UI using xref:refguide:applib-ant:Property.adoc#hidden[`@Property#hidden()`] or indeed xref:refguide:applib-ant:PropertyLayout.adoc#hidden[`@PropertyLayout#hidden()`].
+You can also suppress a property from the UI using xref:system:generated:index/applib/annotation/Property.adoc#hidden[`@Property#hidden()`] or indeed xref:system:generated:index/applib/annotation/PropertyLayout.adoc#hidden[`@PropertyLayout#hidden()`].
 However, this doesn't exclude the property from the metamodel.
 
 == Derived Properties
diff --git a/api/adoc/userguide/modules/fun/pages/overview/events.adoc b/api/adoc/userguide/modules/fun/pages/overview/events.adoc
index a584a91..d8fdfd1 100644
--- a/api/adoc/userguide/modules/fun/pages/overview/events.adoc
+++ b/api/adoc/userguide/modules/fun/pages/overview/events.adoc
@@ -17,7 +17,7 @@ These are explored in the sections below.
 
 Domain events are fired -- through the internal xref:refguide:applib-svc:EventBusService.adoc[event bus] -- for every user interaction with each object member (property, collection or action).
 
-By default, rendering a property causes a `PropertyDomainEvent` to be fired, though the xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent()`] attribute allows a custom subclass to be specified if necessary.
+By default, rendering a property causes a `PropertyDomainEvent` to be fired, though the xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`] attribute allows a custom subclass to be specified if necessary.
 Similarly, rendering a collection causes a `CollectionDomainEvent` to be fired, and rendering an action causes an `ActionDomainEvent` to be fired.
 
 In fact, each event can be fired up to five times, with the event's `getEventPhase()` method indicating to the subscriber the phase:
@@ -52,9 +52,9 @@ xref:userguide:fun:ui.adoc#object-titles-and-icons[Normally] the code to return
 However, UI events allow this title and icon to be provided instead by a subscriber.
 UI events have higher precedence than the other mechanisms of supplying a title.
 
-If annotated with xref:refguide:applib-ant:DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`], the appropriate (subclass of) `TitleUiEvent` will be emitted.
-Similarly for xref:refguide:applib-ant:DomainObjectLayout.adoc#iconUiEvent[`#iconUiEvent()`].
-In addition, it is possible to use events to obtain a CSS class to render with the domain object, using xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassUiEvent[`#cssClassUiEvent()`], and to select an alternate xref:userguide:fun:ui.adoc#layout-file[layout file] using xref:refguide:applib-ant:DomainObjectLayout.adoc#layoutUiEvent[`#layoutUiEvent()`].
+If annotated with xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`], the appropriate (subclass of) `TitleUiEvent` will be emitted.
+Similarly for xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#iconUiEvent[`#iconUiEvent()`].
+In addition, it is possible to use events to obtain a CSS class to render with the domain object, using xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`#cssClassUiEvent()`], and to select an alternate xref:userguide:fun:ui.adoc#layout-file[layout file] using xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#layoutUiEvent[`#layoutUiEvent()`].
 
 There are two use cases where this feature is useful:
 
@@ -105,7 +105,7 @@ The (already persistent) entity has just been flushed to the database
 +
 The (already persistent) entity is about to be deleted from the database
 
-For example, if annotated with xref:refguide:applib-ant:DomainObject.adoc#updatingLifecycleEvent[`@DomainObjectLayout#updatingLifecycleEvent`], the appropriate (subclass of) `ObjectUpdatingEvent` will be emitted.
+For example, if annotated with xref:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[`@DomainObjectLayout#updatingLifecycleEvent`], the appropriate (subclass of) `ObjectUpdatingEvent` will be emitted.
 
 There is no lifecycle event for "entity creating" because (obviously) the framework doesn't know about newly created objects until they have been created.
 Similarly, there is no lifecycle event for entities that have been removed because it is not valid to "touch" a domain entity once deleted.
diff --git a/api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc b/api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc
index b51b698..dbde5be 100644
--- a/api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc
+++ b/api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc
@@ -58,7 +58,7 @@ Some examples:
 * the information within an OID could be converted into a barcode, and stamped onto a PDF form.
 When the PDF is scanned by the mail room, the barcode could be read to attach the correspondence to the relevant domain object.
 
-* as a handle to any object in an audit record, as used by xref:refguide:applib-svc:AuditerService.adoc[`AuditerService`];
+* as a handle to any object in an audit record, as used by xref:refguide:applib-svc:EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber];
 
 * similarly within implementations of xref:refguide:applib-svc:CommandServiceInternal.adoc[`CommandService`] to persist `Command` objects
 
diff --git a/api/adoc/userguide/modules/fun/pages/overview/object-members.adoc b/api/adoc/userguide/modules/fun/pages/overview/object-members.adoc
index 548f36b..1ee0724 100644
--- a/api/adoc/userguide/modules/fun/pages/overview/object-members.adoc
+++ b/api/adoc/userguide/modules/fun/pages/overview/object-members.adoc
@@ -43,8 +43,8 @@ public class Customer
     ...
 }
 ----
-<.> The xref:refguide:applib-ant:Property.adoc[`@Property`] annotation defines additional domain-layer semantics
-<.> The xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`] annotation defines additional presentation-layer hints
+<.> The xref:system:generated:index/applib/annotation/Property.adoc[`@Property`] annotation defines additional domain-layer semantics
+<.> The xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`] annotation defines additional presentation-layer hints
 
 From this the framework infers the `Customer` domain entity, which in turn has a `firstName` string _property_.
 
@@ -76,8 +76,8 @@ public class Customer
     ...
 }
 ----
-<.> The xref:refguide:applib-ant:Collection.adoc[`@Collection`] annotation defines additional domain-layer semantics
-<.> The xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] annotation defines additional presentation-layer hints
+<.> The xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`] annotation defines additional domain-layer semantics
+<.> The xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`] annotation defines additional presentation-layer hints
 <.> The most commonly a `java.util.SortedSet` for entities obtained from an RDBMS (with set semantics).
 +
 TIP: all entities should define a natural ordering so that when rendered in the UI they will be ordered "meaningfully" to the end-user.
@@ -137,10 +137,10 @@ public class Customer {
     ...
 }
 ----
-<.> The xref:refguide:applib-ant:Action.adoc[`@Action`] annotation defines additional domain-layer semantics
-<.> The xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`] annotation defines additional presentation-layer hints
-<.> The xref:refguide:applib-ant:Parameter.adoc[`@Parameter`] annotation defines additional domain-layer semantics
-<.> The xref:refguide:applib-ant:ParameterLayout.adoc[`@ParameterLayout`] annotation defines additional presentation-layer hints
+<.> The xref:system:generated:index/applib/annotation/Action.adoc[`@Action`] annotation defines additional domain-layer semantics
+<.> The xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`] annotation defines additional presentation-layer hints
+<.> The xref:system:generated:index/applib/annotation/Parameter.adoc[`@Parameter`] annotation defines additional domain-layer semantics
+<.> The xref:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`] annotation defines additional presentation-layer hints
 
 From this the framework infers a the `placeOrder` _action_.
 
diff --git a/api/adoc/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc b/api/adoc/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc
index 5de8ce9..737c6e4 100644
--- a/api/adoc/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc
+++ b/api/adoc/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc
@@ -26,7 +26,7 @@ you can generally recognize an Apache Isis domain class because it will be proba
 The framework also recognises some annotations from the ORM layer (eg JDO/DataNucleus) and infers domain semantics from these annotations.
 Similarly, JAXB annotations are typically used for view models.
 
-The framework also defines supplementary annotations, notably xref:refguide:applib-ant:DomainObjectLayout.adoc[`@DomainObjectLayout`] and xref:refguide:applib-ant:DomainServiceLayout.adoc[`@DomainServiceLayout`].
+The framework also defines supplementary annotations, notably xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`] and xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[`@DomainServiceLayout`].
 These provide hints relating to the layout of the domain object in the user interface.
 Alternatively, these UI hints might be defined in a supplementary xref:userguide:fun:ui.adoc#object-layout[`.layout.xml`] file.
 
diff --git a/api/adoc/userguide/modules/fun/pages/ui/action-icons-and-css.adoc b/api/adoc/userguide/modules/fun/pages/ui/action-icons-and-css.adoc
index 6fb187c..704b39c 100644
--- a/api/adoc/userguide/modules/fun/pages/ui/action-icons-and-css.adoc
+++ b/api/adoc/userguide/modules/fun/pages/ui/action-icons-and-css.adoc
@@ -14,7 +14,7 @@ It is also possible to specify additional CSS for an object's members (not just
 
 Action icons can be specified in several ways.
 
-One option is to use the xref:refguide:applib-ant:ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`].
+One option is to use the xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`].
 For example:
 
 [source,java]
@@ -32,7 +32,7 @@ Alternatively, you can specify these hints dynamically in the xref:ui.adoc#objec
 <cpt:action id="renew" cssClassFa="refresh"/>
 ----
 
-Rather than annotating every action with xref:refguide:applib-ant:ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`] and xref:refguide:applib-ant:ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] you can instead specify the UI hint globally using regular expressions.
+Rather than annotating every action with xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`] and xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] you can instead specify the UI hint globally using regular expressions.
 Not only does this save a lot of boilerplate/editing, it helps ensure consistency across all actions.
 
 To declare fa classes globally, use the xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.action-layout.css-class-fa.patterns[`isis.applib.annotation.action-layout.css-class-fa.patterns`] configuration property (a comma separated list of key:value pairs).
@@ -66,11 +66,11 @@ For example, "fa-plus" is applied to all action members called "newXxx"
 
 Similarly, a CSS class can be specified for object members:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] for actions
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] for actions
 
-* xref:refguide:applib-ant:PropertyLayout.adoc#cssClass[`@PropertyLayout#cssClass`] for properties, and
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#cssClass[`@PropertyLayout#cssClass`] for properties, and
 
-* xref:refguide:applib-ant:CollectionLayout.adoc#cssClass[`@CollectionLayout#cssClass`] for collections.
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[`@CollectionLayout#cssClass`] for collections.
 
 Again, this CSS class will be attached to an appropriate containing `<div>` or `<span>` on the rendered page.
 
diff --git a/api/adoc/userguide/modules/fun/pages/ui/menubars-layout.adoc b/api/adoc/userguide/modules/fun/pages/ui/menubars-layout.adoc
index 0e08a6b..d270bf2 100644
--- a/api/adoc/userguide/modules/fun/pages/ui/menubars-layout.adoc
+++ b/api/adoc/userguide/modules/fun/pages/ui/menubars-layout.adoc
@@ -4,7 +4,7 @@
 :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 [...]
 
 
-The actions of xref:domain-entities-and-services.adoc#domain-services[domain services] (annotated using xref:refguide:applib-ant:DomainService.adoc[`@DomainService`] with a xref:refguide:applib-ant:DomainService.adoc#nature[`nature`] of `VIEW`) are made available as menu items on menus.
+The actions of xref:domain-entities-and-services.adoc#domain-services[domain services] (annotated using xref:system:generated:index/applib/annotation/DomainService.adoc[`@DomainService`] with a xref:system:generated:index/applib/annotation/DomainService.adoc#nature[`nature`] of `VIEW`) are made available as menu items on menus.
 
 For example:
 
@@ -36,7 +36,7 @@ If using annotations, services can be added to either the primary, secondary or
 
 image::application-menu/layout-menus.png[width="800px"]
 
-This is done using the xref:refguide:applib-ant:DomainServiceLayout.adoc#menuBar[`@DomainServiceLayout#menuBar()`] annotation.
+This is done using the xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#menuBar[`@DomainServiceLayout#menuBar()`] annotation.
 
 For example:
 
@@ -61,7 +61,7 @@ image::application-menu/tertiary.png[width="300px"]
 
 
 
-In addition, the xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder`] annotation can be used to group and order domain service actions:
+In addition, the xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`] annotation can be used to group and order domain service actions:
 
 * `@MemberOrder#name()` is used to define the name of the menu
 +
@@ -155,7 +155,7 @@ For example, here's a fragment of that provided by the xref:docs:starters:simple
 <.> Menu on the menu bar
 <.> References an action of a domain service
 <.> Divider is placed between each section
-<.> Identifies the service through its xref:refguide:applib-ant:DomainService.adoc#objectType[object type]
+<.> Identifies the service through its xref:system:generated:index/applib/annotation/DomainService.adoc#objectType[object type]
 <.> Optionally override the name inferred from the action
 <.> Domain service actions not specified elsewhere are displayed on the "Other" menu (with `unreferencedActions` attribute set to `true`). +
 +
diff --git a/api/adoc/userguide/modules/fun/pages/ui/names-and-descriptions.adoc b/api/adoc/userguide/modules/fun/pages/ui/names-and-descriptions.adoc
index ae2a327..778d73b 100644
--- a/api/adoc/userguide/modules/fun/pages/ui/names-and-descriptions.adoc
+++ b/api/adoc/userguide/modules/fun/pages/ui/names-and-descriptions.adoc
@@ -25,25 +25,25 @@ The table below summarizes the annotations available:
 
 
 | Class
-| xref:refguide:applib-ant:DomainObjectLayout.adoc#named[`@DomainObjectLayout#named`]
-| xref:refguide:applib-ant:DomainObjectLayout.adoc#describedAs[`@DomainObjectLayout#describedAs`]
+| xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[`@DomainObjectLayout#named`]
+| xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#describedAs[`@DomainObjectLayout#describedAs`]
 
 
 | Property
-| xref:refguide:applib-ant:PropertyLayout.adoc#named[`@PropertyLayout#named`]
-| xref:refguide:applib-ant:PropertyLayout.adoc#describedAs[`@PropertyLayout#describedAs`]
+| xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[`@PropertyLayout#named`]
+| xref:system:generated:index/applib/annotation/PropertyLayout.adoc#describedAs[`@PropertyLayout#describedAs`]
 
 | Collection
-| xref:refguide:applib-ant:CollectionLayout.adoc#named[`@CollectionLayout#named`]
-| xref:refguide:applib-ant:CollectionLayout.adoc#describedAs[`@CollectionLayout#describedAs`]
+| xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[`@CollectionLayout#named`]
+| xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[`@CollectionLayout#describedAs`]
 
 | Action
-| xref:refguide:applib-ant:ActionLayout.adoc#named[`@ActionLayout#named`]
-| xref:refguide:applib-ant:ActionLayout.adoc#describedAs[`@ActionLayout#describedAs`]
+| xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[`@ActionLayout#named`]
+| xref:system:generated:index/applib/annotation/ActionLayout.adoc#describedAs[`@ActionLayout#describedAs`]
 
 | Action Parameters
-| xref:refguide:applib-ant:ParameterLayout.adoc#named[`@ParameterLayout#named`]
-| xref:refguide:applib-ant:ParameterLayout.adoc#describedAs[`@ParameterLayout#describedAs`]
+| xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[`@ParameterLayout#named`]
+| xref:system:generated:index/applib/annotation/ParameterLayout.adoc#describedAs[`@ParameterLayout#describedAs`]
 
 |===
 
diff --git a/api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc b/api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc
index dc1b666..00d58cc 100644
--- a/api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc
+++ b/api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc
@@ -227,7 +227,7 @@ The layout XML will then be ignored.
 Rather than specify every UI semantic in the layout file, you can optionally combine with a number of annotations.
 The idea is that the layout.xml is used primarily for the coarse-grained grid layout, with annotations used for the stuff that changes less often, such as associating actions with properties or collections, or the order of properties or actions within a fieldset.
 
-The annotations most relevant here is xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder`]:
+The annotations most relevant here is xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`]:
 
 * for properties:
 
@@ -248,10 +248,10 @@ The `@Action#associateWith()` annotation can be used instead as a direct replace
 +
 The `@Action#associateWithSequence()` annotation can be used as a direct replacement.
 
-There are a number of other "layout" annotations, specifically xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] and xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`].
+There are a number of other "layout" annotations, specifically xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`], xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`] and xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`].
 All of the semantics in these layout annotations can also be specified in the `.layout.xml` files; which is used is a matter of taste.
 
-In addition, xref:refguide:applib-ant:ParameterLayout.adoc[`@ParameterLayout`] provides layout hints for action parameters.
+In addition, xref:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`] provides layout hints for action parameters.
 There is no way to specify these semantics in the `.layout.xml` file (action parameters are not enumerated in the file).
 
 === Layout file styles
diff --git a/api/adoc/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc b/api/adoc/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc
index dd5d9e4..e358614 100644
--- a/api/adoc/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc
+++ b/api/adoc/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc
@@ -29,7 +29,7 @@ For example the title of a customer object shouldn't include the literal string
 
 === Declarative style
 
-The xref:refguide:applib-ant:Title.adoc[`@Title`] annotation can be used build up the title of an object from its constituent parts.
+The xref:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation can be used build up the title of an object from its constituent parts.
 
 For example:
 
@@ -125,7 +125,7 @@ A variation on this approach also supports localized names; see xref:userguide:b
 
 A third alternative is to move the responsibility for deriving the title into a separate subscriber object.
 
-In the target object, we define an appropriate event type and use the xref:refguide:applib-ant:DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`] attribute to specify:
+In the target object, we define an appropriate event type and use the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`] attribute to specify:
 
 [source,java]
 ----
@@ -185,7 +185,7 @@ If there is no requirement to customize the icon (the normal case), then the ico
 For example, the icon for a class `org.mydomain.myapp.Customer` will be `org/mydomain/myapp/Customer.png` (if it exists).
 
 Alternatively, a font-awesome icon can be used.
-This is specified using the xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute or in the xref:userguide:fun:ui.adoc#object-layout[layout.xml] file.
+This is specified using the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute or in the xref:userguide:fun:ui.adoc#object-layout[layout.xml] file.
 
 For example:
 
@@ -221,7 +221,7 @@ Otherwise it will just use "Order.png", as normal.
 
 As for title, the determination of which image file to use for the icon can be externalized into a UI event subscriber.
 
-In the target object, we define an appropriate event type and use the xref:refguide:applib-ant:DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] attribute to specify.
+In the target object, we define an appropriate event type and use the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] attribute to specify.
 
 For example:
 
@@ -268,7 +268,7 @@ In conjunction with a viewer-specific customisation of CSS (eg for the xref:vw:R
 === Declarative style
 
 To render an object with a particular CSS, use
-xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClass[`@DomainObjectLayout#cssClass()`] or in the xref:userguide:fun:ui.adoc#object-layout[layout.xml] file.
+xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[`@DomainObjectLayout#cssClass()`] or in the xref:userguide:fun:ui.adoc#object-layout[layout.xml] file.
 
 The usage of this CSS class is viewer-specific.
 In the case of the xref:vw:ROOT:about.adoc[Wicket Viewer], when the domain object is rendered on its own page, this CSS class will appear on a top-level `<div>`.
@@ -299,7 +299,7 @@ If non-null value is returned then the CSS class will be rendered _in addition_
 
 As for title and icon, the determination of which CSS class to render can be externalized into a UI event subscriber.
 
-In the target object, we define an appropriate event type and use the xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassUiEvent[`@DomainObjectLayout#cssClassUiEvent()`] attribute to specify.
+In the target object, we define an appropriate event type and use the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`@DomainObjectLayout#cssClassUiEvent()`] attribute to specify.
 
 For example
 
@@ -371,7 +371,7 @@ public class IncomingInvoice {
 
 As for title, icon and CSS, the determination of which layout class to render can be externalized into a UI event subscriber.
 
-In the target object, we define an appropriate event type and use the xref:refguide:applib-ant:DomainObjectLayout.adoc#layoutUiEvent[`@DomainObjectLayout#layoutUiEvent()`] attribute to specify.
+In the target object, we define an appropriate event type and use the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#layoutUiEvent[`@DomainObjectLayout#layoutUiEvent()`] attribute to specify.
 
 For example
 
diff --git a/api/adoc/userguide/modules/fun/pages/view-models.adoc b/api/adoc/userguide/modules/fun/pages/view-models.adoc
index 4f643dc..4e3f655 100644
--- a/api/adoc/userguide/modules/fun/pages/view-models.adoc
+++ b/api/adoc/userguide/modules/fun/pages/view-models.adoc
@@ -240,8 +240,8 @@ public class CustomerRecordOnSAP {
     // ...
 }
 ----
-|Annotated with xref:refguide:applib-ant:DomainObject.adoc#nature[`@DomainObject#nature`] and a nature of `EXTERNAL_ENTITY`, with memento derived automatically from the properties of the domain object.
-Collections are ignored, as are any properties annotated as xref:refguide:applib-ant:Property.adoc#snapshot[snapshot=EXCLUDED].
+|Annotated with xref:system:generated:index/applib/annotation/DomainObject.adoc#nature[`@DomainObject#nature`] and a nature of `EXTERNAL_ENTITY`, with memento derived automatically from the properties of the domain object.
+Collections are ignored, as are any properties annotated as xref:system:generated:index/applib/annotation/Property.adoc#snapshot[snapshot=EXCLUDED].
 
 | In-memory entity
 | WARNING: TODO INMEMORY_ENTITY was removed, this use-case is still valid for consideration, what to do?
diff --git a/api/adoc/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc b/api/adoc/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc
index fa70eff..6ad7692 100644
--- a/api/adoc/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc
+++ b/api/adoc/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc
@@ -50,7 +50,7 @@ public class ToDoItemV1_1 implements Dto {                          // <.>
 <.> package name encodes major version; see discussion on xref:userguide:fun:view-models.adoc#versioning[versioning]
 <.> identifies this class as a view model and defines the root element for JAXB serialization
 <.> all properties in the class must be listed; (they can be ignored using `@XmlTransient`)
-<.> demonstrating use of UI events for a subscriber to provide the DTO's title; see xref:refguide:applib-ant:DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`].
+<.> demonstrating use of UI events for a subscriber to provide the DTO's title; see xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`].
 <.> class name encodes (major and) minor version; see discussion on xref:userguide:fun:view-models.adoc#versioning[versioning]
 <.> again, see discussion on xref:userguide:fun:view-models.adoc#versioning[versioning]
 <.> again, see discussion on xref:userguide:fun:view-models.adoc#versioning[versioning]
diff --git a/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc b/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc
index 637d7d9..1ddbec4 100644
--- a/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc
+++ b/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc
@@ -68,7 +68,7 @@ It is perfectly possible to deploy the RESTful API alongside an auto-generated w
 == Deploy on your own platform
 
 The programming model defined by Apache Isis deliberately minimizes the dependencies on the rest of the framework.
-In fact, the only hard dependency that the domain model classes have on Apache Isis is through the `org.apache.isis.applib` classes, mostly to pick up annotations such as xref:refguide:applib-ant:Action.adoc[`@Action`] and xref:refguide:applib-ant:Property.adoc[`@Property`].
+In fact, the only hard dependency that the domain model classes have on Apache Isis is through the `org.apache.isis.applib` classes, mostly to pick up annotations such as xref:system:generated:index/applib/annotation/Action.adoc[`@Action`] and xref:system:generated:index/applib/annotation/Property.adoc[`@Property`].
 It's therefore relatively easy to take a domain object prototyped and/or tested using Apache Isis, but to deploy on some other framework's runtime.
 
 If you are interested in taking this approach, then you will need to provide your own implementations of any framework-provided services used by your code.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/_summary.adoc
index bb19883..8f61178 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/_summary.adoc
@@ -1,6 +1,6 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:Action.adoc#associateWith[`associateWith()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#associateWith[`associateWith()`]
 //+
 //associates an action with another property or collection of the action.
 //
@@ -13,33 +13,33 @@
 //+
 //If the xref:extensions:command-replay:about.adoc[Command Replay] extension is being used (for regression testing), provides a mechanism to process the `CommandDto` before being replicated from primary to secondary system
 //
-//<.> xref:refguide:applib-ant:Action.adoc#commandPublishing[`commandPublishing()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#commandPublishing[`commandPublishing()`]
 //+
 //Whether the action invocation should be published to registered xref:refguide:applib-svc:CommandSubscriber.adoc[`CommandSubscriber`]s as a `Command` object, that captures the details of this invocation. Typically so it can be logged using the xref:extensions:command-log:about.adoc[Command Log] extension (for auditing or for regression testing using xref:extensions:command-replay:about.adoc[Command Replay]).
 //
-//<.> xref:refguide:applib-ant:Action.adoc#domainEvent[`domainEvent()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`domainEvent()`]
 //+
 //The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] to broadcast the action's business rule checking (hide, disable, validate) and its invocation (pre-execute and post-execute).
 //
-//<.> xref:refguide:applib-ant:Action.adoc#executionPublishing[`executionPublishing()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#executionPublishing[`executionPublishing()`]
 //+
 //Whether the action invocation should be published to registered xref:refguide:applib-svc:ExecutionSubscriber.adoc[`ExecutionSubscriber`]s as an `Execution` object, that captures the details of this invocation.
 //
-//<.> xref:refguide:applib-ant:Action.adoc#hidden[`hidden()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#hidden[`hidden()`]
 //+
 //Indicates where (in the UI) the action should be hidden from the user.
 //
-//<.> xref:refguide:applib-ant:Action.adoc#restrictTo[`restrictTo()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#restrictTo[`restrictTo()`]
 //+
 //Whether the action is only available in prototyping mode, or whether it is available also in production mode.
 //
-//<.> xref:refguide:applib-ant:Action.adoc#semantics[`semantics()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#semantics[`semantics()`]
 //+
 //The action's semantics (ie whether objects are modified as the result of invoking this action, and if so whether reinvoking the action would result in no further change; if not whether the results can be cached for the remainder of the request).
 //+
 //The `...ARE_YOU_SURE` variants cause a confirmation dialog to be displayed in the xref:vw:ROOT:about.adoc[Wicket viewer].
 //
-//<.> xref:refguide:applib-ant:Action.adoc#typeOf[`typeOf()`]
+//<.> xref:system:generated:index/applib/annotation/Action.adoc#typeOf[`typeOf()`]
 //+
 //If the action returns a collection, hints as to the run-time type of the objects within that collection (as a fallback)
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/commandPublishing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/commandPublishing.adoc
index 43b63e8..41569fe 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/commandPublishing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/commandPublishing.adoc
@@ -5,7 +5,7 @@
 
 CAUTION: TODO: v2 - publishing/auditing got a complete overhaul
 
-Every action invocation (and xref:Property.adoc#command[property edit] for that matter) is normally reified into a concrete `Command` object, basically a wrapper around the XML invocation xref:schema:cmd.adoc[Command] schema that also captures some timing metrics about the execution as well as the outcome.
+Every action invocation (and xref:system:generated:index/applib/annotation/Property.adoc#commandPublishing[property edit] for that matter) is normally reified into a concrete `Command` object, basically a wrapper around the XML invocation xref:schema:cmd.adoc[Command] schema that also captures some timing metrics about the execution as well as the outcome.
 
 The main uses cases are:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/domainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/domainEvent.adoc
index 8f1acd2..61bc547 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/domainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/domainEvent.adoc
@@ -180,8 +180,8 @@ However, events can be raised programmatically either by calling the xref:refgui
 
 This attribute is also supported for:
 
-* xref:refguide:applib-ant:Collection.adoc#domainEvent[collections] and
-* xref:refguide:applib-ant:Property.adoc#domainEvent[properties].
+* xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[collections] and
+* xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[properties].
 
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/executionPublishing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/executionPublishing.adoc
index 3ee2bda..6087fb0 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/executionPublishing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/executionPublishing.adoc
@@ -45,10 +45,10 @@ public class Order {
 
 This attribute is also supported for:
 
-* xref:refguide:applib-ant:DomainObject.adoc#entityChangePublishing[domain objects]
+* xref:system:generated:index/applib/annotation/DomainObject.adoc#entityChangePublishing[domain objects]
 + where it controls whether changed objects are published as events, and for
 
-* xref:refguide:applib-ant:Property.adoc#executionPublishing[properties]
+* xref:system:generated:index/applib/annotation/Property.adoc#executionPublishing[properties]
 +
 where it controls whether property edits are published as events.
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/hidden.adoc
index d88e4f9..70cc399 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/hidden.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/hidden.adoc
@@ -11,7 +11,7 @@ Actions can be hidden at the domain-level, indicating that they are not visible
 
 [TIP]
 ====
-It is also possible to use xref:refguide:applib-ant:ActionLayout.adoc#hidden[`@ActionLayout#hidden`] or xref:userguide:fun:ui.adoc#object-layout[file-based layouts] such that the action can be hidden at the view layer.
+It is also possible to use xref:system:generated:index/applib/annotation/ActionLayout.adoc#hidden[`@ActionLayout#hidden`] or xref:userguide:fun:ui.adoc#object-layout[file-based layouts] such that the action can be hidden at the view layer.
 Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
 ====
 
@@ -51,6 +51,6 @@ The other values of the `Where` enum have no meaning for a collection.
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:Property.adoc#hidden[properties]
-* xref:refguide:applib-ant:Collection.adoc#hidden[collections].
+* xref:system:generated:index/applib/annotation/Property.adoc#hidden[properties]
+* xref:system:generated:index/applib/annotation/Collection.adoc#hidden[collections].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/typeOf.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/typeOf.adoc
index 9c8efee..dd84939 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/typeOf.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Action/typeOf.adoc
@@ -28,5 +28,5 @@ In general we recommend that you use generics instead, eg `List<Customer>`.
 
 == See also
 
-This attribute can also be specified for xref:refguide:applib-ant:Collection.adoc#typeOf[collections].
+This attribute can also be specified for xref:system:generated:index/applib/annotation/Collection.adoc#typeOf[collections].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/_summary.adoc
index 8e11d0a..96f1a43 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/_summary.adoc
@@ -1,13 +1,13 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:ActionLayout.adoc#named[`named()`]
+//<.> xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[`named()`]
 //+
 //To override the name inferred from the action's name in code. +
 //A typical use case is if the desired name is a reserved Java keyword, such as `default` or `package`.
 //
-//<.> xref:refguide:applib-ant:ActionLayout.adoc#position[`position()`]
+//<.> xref:system:generated:index/applib/annotation/ActionLayout.adoc#position[`position()`]
 //+
-//For actions associated (using xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder#named`]) with properties, the positioning of the action's button with respect to the property
+//For actions associated (using xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder#named`]) with properties, the positioning of the action's button with respect to the property
 //
 //<.> `promptStyle()`
 //+
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/bookmarking.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/bookmarking.adoc
index 870897c..9324b54 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/bookmarking.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/bookmarking.adoc
@@ -6,7 +6,7 @@
 
 
 
-The `bookmarking` attribute indicates if an action (with safe xref:refguide:applib-ant:Action.adoc#semantics[action semantics]) is automatically bookmarked.
+The `bookmarking` attribute indicates if an action (with safe xref:system:generated:index/applib/annotation/Action.adoc#semantics[action semantics]) is automatically bookmarked.
 
 
 In the xref:vw:ROOT:about.adoc[Wicket viewer], a link to a bookmarked object is shown in the bookmarks panel:
@@ -44,7 +44,7 @@ indicates that the `notYetComplete()` action is bookmarkable.
 
 [NOTE]
 ====
-The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmarked xref:refguide:applib-ant:DomainObjectLayout.adoc#bookmarking[domain object]s.
+The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmarked xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#bookmarking[domain object]s.
 ====
 
 
@@ -55,4 +55,4 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 == See also
 
-This attribute is also supported for xref:refguide:applib-ant:DomainObjectLayout.adoc#bookmarking[domain objects].
+This attribute is also supported for xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#bookmarking[domain objects].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClass.adoc
index 03a263f..0d38ca4 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClass.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClass.adoc
@@ -22,7 +22,7 @@ public class ToDoItem {
 
 [NOTE]
 ====
-The similar xref:refguide:applib-ant:ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`] annotation attribute is also used as a hint to apply CSS, specifically to add http://fortawesome.github.io/Font-Awesome/icons/[Font Awesome icons] on action menu items or buttons.
+The similar xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`] annotation attribute is also used as a hint to apply CSS, specifically to add http://fortawesome.github.io/Font-Awesome/icons/[Font Awesome icons] on action menu items or buttons.
 ====
 
 == Alternatives
@@ -33,8 +33,8 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClass[domain objects]
-* xref:refguide:applib-ant:PropertyLayout.adoc#cssClass[properties]
-* xref:refguide:applib-ant:CollectionLayout.adoc#cssClass[collections]
-* xref:refguide:applib-ant:ParameterLayout.adoc#cssClass[parameters].
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[domain objects]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#cssClass[properties]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[collections]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#cssClass[parameters].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClassFa.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClassFa.adoc
index dab4ec5..c96bcef 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClassFa.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/cssClassFa.adoc
@@ -8,7 +8,7 @@
 The `cssClassFa` attribute is used to specify the name of a link:http://fortawesome.github.io/Font-Awesome/icons/[Font Awesome icon] name, to be rendered on the action's representation as a button or menu item.
 The related `cssClassFaPosition` attribute specifies the positioning of the icon, to the left or the right of the text.
 
-These attributes can also be applied to xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[domain objects] to specify the object's icon.
+These attributes can also be applied to xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[domain objects] to specify the object's icon.
 
 For example:
 
@@ -43,6 +43,6 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 [NOTE]
 ====
-The similar xref:refguide:applib-ant:ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] annotation attribute is also used as a hint to apply CSS, but for wrapping the representation of an object or object member so that it can be styled in an application-specific way.
+The similar xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] annotation attribute is also used as a hint to apply CSS, but for wrapping the representation of an object or object member so that it can be styled in an application-specific way.
 ====
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/describedAs.adoc
index 56ee6c3..50bd58b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/describedAs.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/describedAs.adoc
@@ -28,8 +28,8 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:CollectionLayout.adoc#describedAs[collections]
-* xref:refguide:applib-ant:PropertyLayout.adoc#describedAs[properties]
-* xref:refguide:applib-ant:ParameterLayout.adoc#describedAs[parameters]
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#describedAs[domain objects]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[collections]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#describedAs[properties]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#describedAs[parameters]
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#describedAs[domain objects]
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/hidden.adoc
index 2e5752a..370d973 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/hidden.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/hidden.adoc
@@ -9,7 +9,7 @@ The `hidden` attribute indicates where (in the UI) the action should be hidden f
 
 [TIP]
 ====
-It is also possible to use xref:refguide:applib-ant:Action.adoc#hidden[`@Action#hidden`] to hide an action at the domain layer.
+It is also possible to use xref:system:generated:index/applib/annotation/Action.adoc#hidden[`@Action#hidden`] to hide an action at the domain layer.
 ====
 
 For example:
@@ -46,5 +46,5 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 == See also
 
 This attribute can also be applied to:
-* xref:refguide:applib-ant:PropertyLayout.adoc#hidden[properties]
-* xref:refguide:applib-ant:CollectionLayout.adoc#hidden[collections].
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#hidden[properties]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#hidden[collections].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/named.adoc
index bbcd17f..1b956a6 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/named.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/named.adoc
@@ -37,8 +37,8 @@ The framework also provides a separate, powerful mechanism for xref:userguide:bt
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:CollectionLayout.adoc#named[collections]
-* xref:refguide:applib-ant:PropertyLayout.adoc#named[properties]
-* xref:refguide:applib-ant:ParameterLayout.adoc#named[parameters]
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#named[domain objects]
-* xref:refguide:applib-ant:DomainServiceLayout.adoc#named[domain services].
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[collections]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[properties]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[parameters]
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[domain objects]
+* xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#named[domain services].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/position.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/position.adoc
index 2e39afe..e8da1b8 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/position.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/position.adoc
@@ -6,7 +6,7 @@
 
 
 
-The `position` attribute pertains only to actions that have been associated with properties using xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder#named`].
+The `position` attribute pertains only to actions that have been associated with properties using xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder#named`].
 For these actions, it specifies the positioning of the action's button with respect to the field representing the object property.
 
 The attribute can take one of four values: `BELOW`, `RIGHT`, `PANEL` or `PANEL_DROPDOWN`.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/redirect.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/redirect.adoc
index b90d2d4..1b639e5 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/redirect.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ActionLayout/redirect.adoc
@@ -16,7 +16,7 @@ This makes for a smoother UI.
 +
 [NOTE]
 ====
-Any properties with xref:refguide:applib-ant:PropertyLayout.adoc#repainting[`@PropertyLayout#repainting`] set to `NO_REPAINT` are then _not_ updated.
+Any properties with xref:system:generated:index/applib/annotation/PropertyLayout.adoc#repainting[`@PropertyLayout#repainting`] set to `NO_REPAINT` are then _not_ updated.
 ====
 
 * if set to `EVEN_IF_SAME`, then a redirect occurs and a new web page is rendered.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/_summary.adoc
index f96c232..850af4d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/_summary.adoc
@@ -1,13 +1,13 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:Collection.adoc#domainEvent[`domainEvent()`]
+//<.> xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`domainEvent()`]
 //+
 //The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] to broadcast the collection's business rule checking (hide, disable, validate) and its modification (before and after).
 //
-//<.> xref:refguide:applib-ant:Collection.adoc#hidden[`hidden()`]
+//<.> xref:system:generated:index/applib/annotation/Collection.adoc#hidden[`hidden()`]
 //+
 //Indicates where (in the UI) the collection should be hidden from the user.
 //
-//<.> xref:refguide:applib-ant:Collection.adoc#typeOf[`typeOf()`]
+//<.> xref:system:generated:index/applib/annotation/Collection.adoc#typeOf[`typeOf()`]
 //+
 //Hints as to the run-time type of the objects within that collection (as a fallback)
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/domainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/domainEvent.adoc
index cca7ae0..c684fb1 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/domainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/domainEvent.adoc
@@ -21,7 +21,7 @@ Subscribers (which must be domain services) subscribe to events posted through t
 The xref:vw:ROOT:about.adoc[Wicket viewer] does _not_ currently support the modification of collections; they are rendered read-only.
 However, domain events are still relevant to determine if such collections should be hidden.
 
-The workaround is to create add/remove actions and use xref:refguide:applib-ant:MemberOrder.adoc[UI hints] to render them close to the collection.
+The workaround is to create add/remove actions and use xref:system:generated:index/applib/annotation/MemberOrder.adoc[UI hints] to render them close to the collection.
 ====
 
 By default the event raised is `CollectionDomainEvent.Default`.
@@ -177,8 +177,8 @@ However, events can be raised programmatically either by calling the xref:refgui
 
 This attribute is also supported for:
 
-* xref:refguide:applib-ant:Action.adoc#domainEvent[actions] and
-* xref:refguide:applib-ant:Property.adoc#domainEvent[properties].
+* xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[actions] and
+* xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[properties].
 
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/hidden.adoc
index 100a7b7..2a2f482 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/hidden.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/hidden.adoc
@@ -10,7 +10,7 @@ Collections can be hidden at the domain-level, indicating that they are not visi
 
 [TIP]
 ====
-It is also possible to use xref:refguide:applib-ant:CollectionLayout.adoc#hidden[`@CollectionLayout#hidden`] or using xref:userguide:fun:ui.adoc#object-layout[file-based layout] such that the collection can be hidden at the view layer.
+It is also possible to use xref:system:generated:index/applib/annotation/CollectionLayout.adoc#hidden[`@CollectionLayout#hidden`] or using xref:userguide:fun:ui.adoc#object-layout[file-based layout] such that the collection can be hidden at the view layer.
 ====
 
 For example:
@@ -57,5 +57,5 @@ The other values of the `Where` enum have no meaning for a collection.
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:Action.adoc#hidden[actions]
-* xref:refguide:applib-ant:Property.adoc#hidden[properties].
+* xref:system:generated:index/applib/annotation/Action.adoc#hidden[actions]
+* xref:system:generated:index/applib/annotation/Property.adoc#hidden[properties].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/typeOf.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/typeOf.adoc
index c6ccf9c..0c6260f 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/typeOf.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Collection/typeOf.adoc
@@ -29,4 +29,4 @@ In general we recommend that you use generics instead, eg `SortedSet<Order>`.
 
 == See also
 
-This attribute can also be specified for xref:refguide:applib-ant:Action.adoc#typeOf[actions].
+This attribute can also be specified for xref:system:generated:index/applib/annotation/Action.adoc#typeOf[actions].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/_summary.adoc
index 935c2d9..35a9c13 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/_summary.adoc
@@ -1,22 +1,22 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:CollectionLayout.adoc#cssClass[`cssClass()`]
+//<.> xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[`cssClass()`]
 //+
 //The css class that a collection should have, to allow more targetted styling in xref:refguide:config:application-specific/application-css.adoc[`application.css`]
 //
-//<.> xref:refguide:applib-ant:CollectionLayout.adoc#defaultView[`defaultView()`]
+//<.> xref:system:generated:index/applib/annotation/CollectionLayout.adoc#defaultView[`defaultView()`]
 //+
 //Which view is selected by default, if multiple views are available.
 //
-//<.> xref:refguide:applib-ant:CollectionLayout.adoc#describedAs[`describedAs()`]
+//<.> xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[`describedAs()`]
 //+
 //Description of this collection, eg to be rendered in a tooltip.
 //
-//<.> xref:refguide:applib-ant:CollectionLayout.adoc#hidden[`hidden()`]
+//<.> xref:system:generated:index/applib/annotation/CollectionLayout.adoc#hidden[`hidden()`]
 //+
 //Indicates where (in the UI) the collection should be hidden from the user.
 //
-//<.> xref:refguide:applib-ant:CollectionLayout.adoc#named[`named()`]
+//<.> xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[`named()`]
 //+
 //To override the name inferred from the collection's name in code. +
 //A typical use case is if the desired name is a reserved Java keyword, such as `default` or `package`.
@@ -25,10 +25,10 @@
 //+
 //Whether to HTML escape the name of this property.
 //
-//<.> xref:refguide:applib-ant:CollectionLayout.adoc#paged[`paged()`]
+//<.> xref:system:generated:index/applib/annotation/CollectionLayout.adoc#paged[`paged()`]
 //+
 //The page size for instances of this class when rendered within a table.
 //
-//<.> xref:refguide:applib-ant:CollectionLayout.adoc#sortedBy[`sortedBy()`]
+//<.> xref:system:generated:index/applib/annotation/CollectionLayout.adoc#sortedBy[`sortedBy()`]
 //+
 //Indicates that the elements in the `java.util.SortedSet` collection should be sorted according to a specified `Comparator` rather than their natural sort order.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/cssClass.adoc
index 1b45b16..dd10065 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/cssClass.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/cssClass.adoc
@@ -33,7 +33,7 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClass[domain objects]
-* xref:refguide:applib-ant:ActionLayout.adoc#cssClass[actions]
-* xref:refguide:applib-ant:PropertyLayout.adoc#cssClass[properties]
-* xref:refguide:applib-ant:ParameterLayout.adoc#cssClass[parameters].
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[domain objects]
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[actions]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#cssClass[properties]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#cssClass[parameters].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/describedAs.adoc
index 14bfe29..62ac0ce 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/describedAs.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/describedAs.adoc
@@ -8,7 +8,7 @@
 The `describedAs` attribute is used to provide a short description of the collection to the user.
 In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
 
-The `describedAs` attribute can also be specified for xref:refguide:applib-ant:PropertyLayout.adoc#describedAs[properties], xref:refguide:applib-ant:ActionLayout.adoc#describedAs[actions], xref:refguide:applib-ant:ParameterLayout.adoc#describedAs[parameters] and xref:refguide:applib-ant:DomainObjectLayout.adoc#describedAs[domain objects].
+The `describedAs` attribute can also be specified for xref:system:generated:index/applib/annotation/PropertyLayout.adoc#describedAs[properties], xref:system:generated:index/applib/annotation/ActionLayout.adoc#describedAs[actions], xref:system:generated:index/applib/annotation/ParameterLayout.adoc#describedAs[parameters] and xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#describedAs[domain objects].
 
 For example:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/hidden.adoc
index f744d38..3c724e7 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/hidden.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/hidden.adoc
@@ -9,7 +9,7 @@ The `hidden` attribute indicates where (in the UI) the collection should be hidd
 
 [TIP]
 ====
-It is also possible to use xref:refguide:applib-ant:Collection.adoc#hidden[`@Collection#hidden`] to hide an action at the domain layer.
+It is also possible to use xref:system:generated:index/applib/annotation/Collection.adoc#hidden[`@Collection#hidden`] to hide an action at the domain layer.
 ====
 
 For example:
@@ -58,5 +58,5 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#hidden[actions]
-* xref:refguide:applib-ant:PropertyLayout.adoc#hidden[properties].
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#hidden[actions]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#hidden[properties].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/named.adoc
index 9a456a7..7a198b4 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/named.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/named.adoc
@@ -45,8 +45,8 @@ The framework also provides a separate, powerful mechanism for xref:userguide:bt
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#named[actions]
-* xref:refguide:applib-ant:PropertyLayout.adoc#named[properties]
-* xref:refguide:applib-ant:ParameterLayout.adoc#named[parameters]
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#named[domain objects]
-* xref:refguide:applib-ant:DomainServiceLayout.adoc#named[domain services].
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[actions]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[properties]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[parameters]
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[domain objects]
+* xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#named[domain services].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/paged.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/paged.adoc
index 6544f41..96f25ed 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/paged.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/CollectionLayout/paged.adoc
@@ -41,4 +41,4 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#paged[domain objects]
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#paged[domain objects]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/actionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/actionDomainEvent.adoc
index 3653d79..35a551a 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/actionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/actionDomainEvent.adoc
@@ -7,7 +7,7 @@
 
 Whenever an action of a domain object is interacted with then a domain event will be fired, for each of the various phases (hidden, disabled, validated, executing, executed).
 The `@DomainObject#actionDomainEvent` attribute allows a common event domain class to be fired for all of the actions of the domain object.
-This can be overridden for any given action using xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent`].
+This can be overridden for any given action using xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent`].
 
 For example:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/autoCompleteRepository.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/autoCompleteRepository.adoc
index 8656c7d..aeee59d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/autoCompleteRepository.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/autoCompleteRepository.adoc
@@ -76,7 +76,7 @@ public class Customers {
 ----
 <.> end-user must enter minimum number of characters to trigger the query
 
-The autocomplete "action" can also be a regular method, annotated using xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`].
+The autocomplete "action" can also be a regular method, annotated using xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`].
 That is, it does not need to be part of the metamodel:
 
 [source,java]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/bounding.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/bounding.adoc
index 5251437..f16e04d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/bounding.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/bounding.adoc
@@ -30,7 +30,7 @@ public class Currency {
 [TIP]
 ====
 There is nothing to prevent you from using this attribute for regular mutable entities, and indeed this is sometimes worth doing during early prototyping.
-However, if there is no realistic upper bound to the number of instances of an entity that might be created, generally you should use xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] supporting method or the xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`] attribute instead.
+However, if there is no realistic upper bound to the number of instances of an entity that might be created, generally you should use xref:refguide:applib-methods:prefixes.adoc#autoComplete[`autoComplete...()`] supporting method or the xref:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`] attribute instead.
 ====
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/collectionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/collectionDomainEvent.adoc
index 7b5f342..46b89b9 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/collectionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/collectionDomainEvent.adoc
@@ -7,7 +7,7 @@
 
 Whenever a collection of a domain object is interacted with then a domain event will be fired, for each of the various phases (hidden, disabled, validated, executing, executed).
 the `@DomainObject#collectionDomainEvent` attribute allows a common event domain class to be fired for all of the collections of the domain object.
-This can be overridden for any given collection using xref:refguide:applib-ant:Collection.adoc#domainEvent[`@Collection#domainEvent()`].
+This can be overridden for any given collection using xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`@Collection#domainEvent()`].
 
 For example:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/mixinMethod.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/mixinMethod.adoc
index 1722d29..1250e5b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/mixinMethod.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/mixinMethod.adoc
@@ -35,10 +35,10 @@ public class Customer {
 )
 ----
 <.> This is a mixin. +
-Alternatively, could have used xref:refguide:applib-ant:Action.adoc[`@Action`].
+Alternatively, could have used xref:system:generated:index/applib/annotation/Action.adoc[`@Action`].
 <.> This mixin is using a non-standard method. +
 <.> Same name as the specified mixinMethod.
-Alternatively, when using xref:refguide:applib-ant:Action.adoc[`@Action`] then method's name defaults to `act`.
+Alternatively, when using xref:system:generated:index/applib/annotation/Action.adoc[`@Action`] then method's name defaults to `act`.
 
 This allows all mixins to follow a similar convention, with the name of the mixin inferred entirely from its type ("placeOrder").
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/nature.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/nature.adoc
index 39d8933..de88336 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/nature.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/nature.adoc
@@ -68,7 +68,7 @@ The benefit of `nature()` is that it allows the developer to properly characteri
 
 [NOTE]
 ====
-On the other hand, view models defined in this way do have some limitations; see xref:refguide:applib-ant:DomainObject.adoc#view-models[View Models] for further discussion.
+On the other hand, view models defined in this way do have some limitations; see xref:system:generated:index/applib/annotation/DomainObject.adoc#view-models[View Models] for further discussion.
 
 These limitations do _not_ apply to xref:userguide:fun:view-models.adoc#jaxb[JAXB] view models.
 If you are using view models heavily, you may wish to restrict yourself to just the JAXB flavour.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/propertyDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/propertyDomainEvent.adoc
index c0fefe0..92ebbe2 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/propertyDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObject/propertyDomainEvent.adoc
@@ -7,7 +7,7 @@
 
 Whenever a property of a domain object is interacted with then a domain event will be fired, for each of the various phases (hidden, disabled, validated, executing, executed).
 The `@DomainObject#propertyDomainEvent` attribute allows a common event domain class to be fired for all of the properties of the domain object.
-This can be overridden for any given property using xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent()`].
+This can be overridden for any given property using xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`].
 
 For example:
 
@@ -37,10 +37,10 @@ For example:
 public class ToDoItem_priority {
     private final ToDoItem todoItem;
     // constructor omitted
-    
+
     public static class PropertyDomainEventDefault
         extends org.apache.isis.applib.events.domain.PropertyDomainEvent<Object> { }
-    
+
     public Integer prop() { /* ... */ }
 }
 ----
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/bookmarking.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/bookmarking.adoc
index f4dfc04..b84ee5c 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/bookmarking.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/bookmarking.adoc
@@ -7,7 +7,7 @@
 
 
 The `bookmarking` attribute indicates that an entity is automatically bookmarked.
-This attribute is also supported for  xref:refguide:applib-ant:ActionLayout.adoc#bookmarking[domain objects].
+This attribute is also supported for  xref:system:generated:index/applib/annotation/ActionLayout.adoc#bookmarking[domain objects].
 
 In the xref:vw:ROOT:about.adoc[Wicket Viewer], a link to a bookmarked object is shown in the bookmarks panel:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClass.adoc
index 36a37d7..a5b1f9e 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClass.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClass.adoc
@@ -22,15 +22,15 @@ public class ToDoItem { /* ... */ }
 
 [NOTE]
 ====
-The similar xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] annotation attribute is also used as a hint to apply CSS, but in particular to allow http://fortawesome.github.io/Font-Awesome/icons/[Font Awesome icons] to be rendered as the icon for classes.
+The similar xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] annotation attribute is also used as a hint to apply CSS, but in particular to allow http://fortawesome.github.io/Font-Awesome/icons/[Font Awesome icons] to be rendered as the icon for classes.
 ====
 
 == See also
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#cssClass[actions]
-* xref:refguide:applib-ant:PropertyLayout.adoc#cssClass[properties],
-* xref:refguide:applib-ant:CollectionLayout.adoc#cssClass[collections]
-* xref:refguide:applib-ant:ParameterLayout.adoc#cssClass[parameters].
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[actions]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#cssClass[properties],
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[collections]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#cssClass[parameters].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClassFa.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClassFa.adoc
index 4bf8e6b..f5430f9 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClassFa.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/cssClassFa.adoc
@@ -30,12 +30,12 @@ The related `cssClassFaPosition` attribute is currently unused for domain object
 
 [TIP]
 ====
-The similar xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClass[`@DomainObjectLayout#cssClass()`] annotation attribute is also used as a hint to apply CSS, but for wrapping the representation of an object or object member so that it can be styled in an application-specific way.
+The similar xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[`@DomainObjectLayout#cssClass()`] annotation attribute is also used as a hint to apply CSS, but for wrapping the representation of an object or object member so that it can be styled in an application-specific way.
 ====
 
 == See also
 
 These attributes can also be applied to:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#cssClassFa[actions] to specify an icon for the action's representation as a button or menu item.
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClassFa[actions] to specify an icon for the action's representation as a button or menu item.
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/describedAs.adoc
index 3ee9a5e..a5fd0f9 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/describedAs.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/describedAs.adoc
@@ -28,8 +28,8 @@ public class ProspectiveSale {
 
 The attribute can also be specified for:
 
-* xref:refguide:applib-ant:CollectionLayout.adoc#describedAs[collections]
-* xref:refguide:applib-ant:PropertyLayout.adoc#describedAs[properties]
-* xref:refguide:applib-ant:ActionLayout.adoc#describedAs[actions]
-* xref:refguide:applib-ant:ParameterLayout.adoc#describedAs[parameters] and
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[collections]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#describedAs[properties]
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#describedAs[actions]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#describedAs[parameters] and
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/named.adoc
index afa75ec..f496fe2 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/named.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/named.adoc
@@ -25,7 +25,7 @@ public class CustomerImpl implements Customer{
 }
 ----
 
-It's also possible to specify a xref:refguide:applib-ant:DomainObjectLayout.adoc#plural[plural form] of the name, used by the framework when rendering a standalone collection of the domain object.
+It's also possible to specify a xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#plural[plural form] of the name, used by the framework when rendering a standalone collection of the domain object.
 
 [TIP]
 ====
@@ -36,8 +36,8 @@ The framework also provides a separate, powerful mechanism for xref:userguide:bt
 
 The attribute can also be specified for:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#named[actions]
-* xref:refguide:applib-ant:CollectionLayout.adoc#named[collections]
-* xref:refguide:applib-ant:PropertyLayout.adoc#named[properties]
-* xref:refguide:applib-ant:ParameterLayout.adoc#named[parameters]
-* xref:refguide:applib-ant:DomainServiceLayout.adoc#named[domain services].
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[actions]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[collections]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[properties]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[parameters]
+* xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#named[domain services].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/paged.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/paged.adoc
index 35cc730..f8bec55 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/paged.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/paged.adoc
@@ -32,4 +32,4 @@ It is also possible to specify a global default for the page size of standalone
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:CollectionLayout.adoc#paged[collections]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#paged[collections]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/titleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/titleUiEvent.adoc
index d936457..fbfc0df 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/titleUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainObjectLayout/titleUiEvent.adoc
@@ -6,7 +6,7 @@
 
 
 Whenever a domain object is to be rendered, the framework fires off a title UI event to obtain a title for the object.
-This is as an alternative to implementing xref:refguide:applib-methods:reserved.adoc#title[`title()`] reserved method, or using the xref:refguide:applib-ant:Title.adoc[`@Title`] annotation, within the class itself.
+This is as an alternative to implementing xref:refguide:applib-methods:reserved.adoc#title[`title()`] reserved method, or using the xref:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation, within the class itself.
 (If either `title()` or `@Title` are present, then they will take precedence).
 
 Subscribers subscribe through the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] and can use obtain a reference to the domain object from the event.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainService/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainService/_summary.adoc
index 013d5e6..ee8a91d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainService/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainService/_summary.adoc
@@ -1,11 +1,11 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:DomainService.adoc#nature[`nature()`]
+//<.> xref:system:generated:index/applib/annotation/DomainService.adoc#nature[`nature()`]
 //+
 //Whether the actions of this domain service should be rendered in UI menus only, or the xref:vro:ROOT:about.adoc[RestfulObjects] REST API only, or both
 //
-//<.> xref:refguide:applib-ant:DomainService.adoc#objectType[`objectType()`]
+//<.> xref:system:generated:index/applib/annotation/DomainService.adoc#objectType[`objectType()`]
 //+
-//Equivalent to xref:refguide:applib-ant:DomainObject.adoc#objectType[`@DomainObject#objectType()`], specifies the objectType of the service.
+//Equivalent to xref:system:generated:index/applib/annotation/DomainObject.adoc#objectType[`@DomainObject#objectType()`], specifies the objectType of the service.
 //+
 //The instanceId for services is always "1".
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/_summary.adoc
index 6a5b65d..3fc5424 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/_summary.adoc
@@ -1,6 +1,6 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:DomainServiceLayout.adoc#menuBar[`menuBar()`]
+//<.> xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#menuBar[`menuBar()`]
 //+
 //The menubar in which the menu that holds this service's actions should reside:
 //+
@@ -9,6 +9,6 @@
 //include::refguide:applib-ant:example$annotation/DomainServiceLayout.java[tags="refguide-menu-bar",indent=0]
 //----
 //
-//<.> xref:refguide:applib-ant:DomainServiceLayout.adoc#named[`named()`]
+//<.> xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#named[`named()`]
 //+
 //Name of this class (overriding the name derived from its name in code)
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/named.adoc
index 45356ee..77d2e31 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/named.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/DomainServiceLayout/named.adoc
@@ -26,8 +26,8 @@ public class CustomerRepository {
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#named[actions]
-* xref:refguide:applib-ant:CollectionLayout.adoc#named[collections]
-* xref:refguide:applib-ant:PropertyLayout.adoc#named[properties]
-* xref:refguide:applib-ant:ParameterLayout.adoc#named[parameters]
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#named[domain objects]
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[actions]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[collections]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[properties]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[parameters]
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[domain objects]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/_summary.adoc
index 6a6c511..f8d6600 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/_summary.adoc
@@ -1,10 +1,10 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:MemberOrder.adoc#name[`name()`]
+//<.> xref:system:generated:index/applib/annotation/MemberOrder.adoc#name[`name()`]
 //+
 //Names a group of (property) members.
 //All properties with this name will be grouped together.
 //
-//<.> xref:refguide:applib-ant:MemberOrder.adoc#sequence[`sequence()`]
+//<.> xref:system:generated:index/applib/annotation/MemberOrder.adoc#sequence[`sequence()`]
 //+
 //Defines an ordering for members, within their container.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/name.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/name.adoc
index fd9d817..4dbd0c2 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/name.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/MemberOrder/name.adoc
@@ -52,7 +52,7 @@ Use the layout file to define the positioning of the fieldsets, and use `@Member
 
 For actions, the `name` attribute indicates the name of a property to associate the action with.
 
-TIP: For actions, `@Member#name()` and xref:refguide:applib-ant:Action.adoc#associateWith()` are the same.
+TIP: For actions, `@Member#name()` and xref:system:generated:index/applib/annotation/Action.adoc#associateWith()` are the same.
 
 For example:
 
@@ -77,7 +77,7 @@ public class Customer {
 }
 ----
 
-TIP: the xref:refguide:applib-ant:ActionLayout.adoc#position[`@ActionLayout#position()`] to indicate whether the action should be rendered beneath the property, or on its fieldset panel's header.
+TIP: the xref:system:generated:index/applib/annotation/ActionLayout.adoc#position[`@ActionLayout#position()`] to indicate whether the action should be rendered beneath the property, or on its fieldset panel's header.
 
 == Collections
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/_summary.adoc
index ae4994b..c02691c 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/_summary.adoc
@@ -1,25 +1,25 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:Parameter.adoc#fileAccept[`fileAccept()`]
+//<.> xref:system:generated:index/applib/annotation/Parameter.adoc#fileAccept[`fileAccept()`]
 //+
 //Hints the file type (media type or file extension) to be uploaded for xref:applib-classes:value-types.adoc#Blob[`Blob`]
 //or xref:applib-classes:value-types.adoc#Clob[`Clob`]. +
 // +
 //Note that this does not prevent the user from uploading some other file type; rather it merely defaults the file type in the file open dialog.
 //
-//<.> xref:refguide:applib-ant:Parameter.adoc#maxLength[`maxLength()`]
+//<.> xref:system:generated:index/applib/annotation/Parameter.adoc#maxLength[`maxLength()`]
 //+
 //Maximum number of characters for string parameters; ignored otherwise
 //
-//<.> xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[`mustSatisfy()`]
+//<.> xref:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`mustSatisfy()`]
 //+
 //Implementation of `o.a.i.applib.spec.Specification`, allowing arbitrary validation to be applied.
 //
-//<.> xref:refguide:applib-ant:Parameter.adoc#optionality[`optionality()`]
+//<.> xref:system:generated:index/applib/annotation/Parameter.adoc#optionality[`optionality()`]
 //+
 //Specifies a parameter is optional rather than mandatory
 //
-//<.> xref:refguide:applib-ant:Parameter.adoc#regexPattern[regexPattern()]
+//<.> xref:system:generated:index/applib/annotation/Parameter.adoc#regexPattern[regexPattern()]
 //+
 //Validates the contents of a string parameter against the regular expression pattern
 //
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/fileAccept.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/fileAccept.adoc
index 677dee5..8af06ac 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/fileAccept.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/fileAccept.adoc
@@ -8,7 +8,7 @@
 
 The `fileAccept` attribute applies only to xref:applib-classes:value-types.adoc#Blob[`Blob`]
 or xref:applib-classes:value-types.adoc#Clob[`Clob`] parameters, indicating the type of file to accept when uploading a new value.
-The attribute is also supported on xref:refguide:applib-ant:Property.adoc#fileAccept[properties].
+The attribute is also supported on xref:system:generated:index/applib/annotation/Property.adoc#fileAccept[properties].
 
 For example:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/maxLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/maxLength.adoc
index 703c215..807600f 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/maxLength.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/maxLength.adoc
@@ -26,4 +26,4 @@ public class CustomerRepository {
 
 == See also
 
-This attribute can also be applied to xref:refguide:applib-ant:Property.adoc#maxLength[properties].
+This attribute can also be applied to xref:system:generated:index/applib/annotation/Property.adoc#maxLength[properties].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/mustSatisfy.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/mustSatisfy.adoc
index 69ad273..bef4f56 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/mustSatisfy.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/mustSatisfy.adoc
@@ -7,11 +7,11 @@
 
 
 The `mustSatisfy` attribute allows arbitrary validation to be applied to parameters using an (implementation of a) `org.apache.isis.applib.spec.Specification` object.
-The attribute is also supported on xref:refguide:applib-ant:Property.adoc#mustSatisfy[properties].
+The attribute is also supported on xref:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[properties].
 
 [TIP]
 ====
-The specification implementations can (of course) be reused between parameters and xref:refguide:applib-ant:Property.adoc#mustSatisfy[properties].
+The specification implementations can (of course) be reused between parameters and xref:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[properties].
 ====
 
 The `Specification` is consulted during validation, being passed the proposed value.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/optionality.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/optionality.adoc
index e3596dd..dbced40 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/optionality.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/optionality.adoc
@@ -9,7 +9,7 @@
 
 By default, Apache Isis assumes that all parameters of an action are required (mandatory).
 The `optionality` attribute allows this to be relaxed.
-The attribute is also supported for xref:refguide:applib-ant:Property.adoc#optionality[properties].
+The attribute is also supported for xref:system:generated:index/applib/annotation/Property.adoc#optionality[properties].
 
 [TIP]
 ====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/regexPattern.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/regexPattern.adoc
index 6d85481..25481f7 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/regexPattern.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Parameter/regexPattern.adoc
@@ -37,4 +37,4 @@ public class Customer {
 
 == See also
 
-This attribute can also be specified for xref:refguide:applib-ant:Property.adoc#regexPattern[properties].
+This attribute can also be specified for xref:system:generated:index/applib/annotation/Property.adoc#regexPattern[properties].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/_summary.adoc
index 5dc9370..27267aa 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/_summary.adoc
@@ -1,26 +1,26 @@
 // TODO - v2 (reconcile/move into javadoc).
 
 
-//<.> xref:refguide:applib-ant:ParameterLayout.adoc#cssClass[`cssClass()`]
+//<.> xref:system:generated:index/applib/annotation/ParameterLayout.adoc#cssClass[`cssClass()`]
 //+The css class that a parameter should have, to allow more targetted styling in xref:refguide:config:application-specific/application-css.adoc[`application.css`]
 //
-//<.> xref:refguide:applib-ant:ParameterLayout.adoc#describedAs[`describedAs()`]
+//<.> xref:system:generated:index/applib/annotation/ParameterLayout.adoc#describedAs[`describedAs()`]
 //+
 //Description of this parameter, eg to be rendered in a tooltip.
 //
-//<.> xref:refguide:applib-ant:ParameterLayout.adoc#labelPosition[`labelPosition()`]
+//<.> xref:system:generated:index/applib/annotation/ParameterLayout.adoc#labelPosition[`labelPosition()`]
 //In forms, the positioning of the label relative to the property value. +
 //=
-//Default is `LEFT`, unless xref:refguide:applib-ant:ParameterLayout.adoc#multiLine[`multiLine`] in which case `TOP`.
+//Default is `LEFT`, unless xref:system:generated:index/applib/annotation/ParameterLayout.adoc#multiLine[`multiLine`] in which case `TOP`.
 //The value `RIGHT` is only supported for boolean parameters.
 //
-//<.> xref:refguide:applib-ant:ParameterLayout.adoc#multiLine[`multiLine()`]
+//<.> xref:system:generated:index/applib/annotation/ParameterLayout.adoc#multiLine[`multiLine()`]
 //+
 //For string parameters, render as a text area over specified number of lines.
 //+
-//If set > 1, then then xref:refguide:applib-ant:ParameterLayout.adoc#labelPosition[`labelPosition`] defaults to `TOP`.
+//If set > 1, then then xref:system:generated:index/applib/annotation/ParameterLayout.adoc#labelPosition[`labelPosition`] defaults to `TOP`.
 //
-//<.> xref:refguide:applib-ant:ParameterLayout.adoc#named[`named()`]
+//<.> xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[`named()`]
 //+
 //The name of this parameter.
 //+
@@ -35,11 +35,11 @@
 //+
 //Whether to HTML escape the name of this parameter.
 //
-//<.> xref:refguide:applib-ant:ParameterLayout.adoc#renderDay[`renderDay()`]
+//<.> xref:system:generated:index/applib/annotation/ParameterLayout.adoc#renderDay[`renderDay()`]
 //+
 //For date parameters only, render the date as one day prior to the actually stored date (eg the end date of an open interval into a closed interval)
 //
-//<.> xref:refguide:applib-ant:ParameterLayout.adoc#typicalLength[`typicalLength()`]
+//<.> xref:system:generated:index/applib/annotation/ParameterLayout.adoc#typicalLength[`typicalLength()`]
 //+
 //The typical entry length of a field, use to determine the optimum width for display
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/cssClass.adoc
index 396568b..2a0a9a0 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/cssClass.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/cssClass.adoc
@@ -29,8 +29,8 @@ public class ToDoItem {
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClass[domain objects]
-* xref:refguide:applib-ant:ActionLayout.adoc#cssClass[actions]
-* xref:refguide:applib-ant:PropertyLayout.adoc#cssClass[properties],
-* xref:refguide:applib-ant:CollectionLayout.adoc#cssClass[collections]
-* xref:refguide:applib-ant:ParameterLayout.adoc#cssClass[parameters].
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[domain objects]
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[actions]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#cssClass[properties],
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[collections]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#cssClass[parameters].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/describedAs.adoc
index 3893dd3..59f6725 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/describedAs.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/describedAs.adoc
@@ -5,7 +5,7 @@
 :page-partial:
 
 
-The `describedAs` attribute is used to provide a short description of the action parameter to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.  The `describedAs` attribute can also be specified for xref:refguide:applib-ant:CollectionLayout.adoc#describedAs[collections],  xref:refguide:applib-ant:PropertyLayout.adoc#describedAs[properties], xref:refguide:applib-ant:ActionLayout.adoc#describedAs[actions] and xref:refguide:applib-ant:DomainObjectLayo [...]
+The `describedAs` attribute is used to provide a short description of the action parameter to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.  The `describedAs` attribute can also be specified for xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[collections],  xref:system:generated:index/applib/annotation/PropertyLayout.adoc#describedAs[properties], xref:system:generated:index/applib/annotation/ActionLayout.adoc#des [...]
 
 Descriptions may be provided for objects, members (properties, collections and actions), and for individual parameters within an action method.
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/labelPosition.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/labelPosition.adoc
index dc18c6a..1740dbe 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/labelPosition.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/labelPosition.adoc
@@ -9,7 +9,7 @@
 The `labelPosition` attribute determines the positioning of labels for parameters.
 
 The positioning of labels is typically `LEFT`, but can be positioned to the `TOP`.
-The one exception is xref:refguide:applib-ant:ParameterLayout.adoc#multiLine[`multiLine()`] string parameters, where the label defaults to `TOP` automatically (to provide as much real-estate for the multiline text field as possible).
+The one exception is xref:system:generated:index/applib/annotation/ParameterLayout.adoc#multiLine[`multiLine()`] string parameters, where the label defaults to `TOP` automatically (to provide as much real-estate for the multiline text field as possible).
 
 For boolean parameters a positioning of `RIGHT` is also allowed; this is ignored for all other types.
 
@@ -35,9 +35,9 @@ public class Order {
 }
 ----
 
-To get an idea of how these are rendered (in the xref:vw:ROOT:about.adoc[Wicket viewer]), see xref:refguide:applib-ant:PropertyLayout.adoc#labelPosition[PropertyLayout#labelPosition].
+To get an idea of how these are rendered (in the xref:vw:ROOT:about.adoc[Wicket viewer]), see xref:system:generated:index/applib/annotation/PropertyLayout.adoc#labelPosition[PropertyLayout#labelPosition].
 
 == See also
 
-This attribute can also be specified for xref:refguide:applib-ant:PropertyLayout.adoc#labelPosition[properties].
+This attribute can also be specified for xref:system:generated:index/applib/annotation/PropertyLayout.adoc#labelPosition[properties].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/multiLine.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/multiLine.adoc
index d8da321..7be67ad 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/multiLine.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/multiLine.adoc
@@ -8,7 +8,7 @@
 
 The `multiLine` attribute specifies that the text field for a string parameter should span multiple lines.
 It is ignored for other parameter types.
-The attribute is also supported for xref:refguide:applib-ant:PropertyLayout.adoc#multiLine[properties].
+The attribute is also supported for xref:system:generated:index/applib/annotation/PropertyLayout.adoc#multiLine[properties].
 
 For example:
 
@@ -30,6 +30,6 @@ public class BugReport {
 
 [NOTE]
 ====
-If set > 1 (as would normally be the case), then the default xref:refguide:applib-ant:ParameterLayout.adoc#labelPosition[`labelPosition`] defaults to `TOP` (rather than `LEFT`, as would normally be the case).
+If set > 1 (as would normally be the case), then the default xref:system:generated:index/applib/annotation/ParameterLayout.adoc#labelPosition[`labelPosition`] defaults to `TOP` (rather than `LEFT`, as would normally be the case).
 ====
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/named.adoc
index 001e543..78b11e0 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/named.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/named.adoc
@@ -45,9 +45,9 @@ The framework also provides a separate, powerful mechanism for xref:userguide:bt
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#named[actions]
-* xref:refguide:applib-ant:CollectionLayout.adoc#named[collections]
-* xref:refguide:applib-ant:PropertyLayout.adoc#named[properties]
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#named[domain objects]
-* xref:refguide:applib-ant:DomainServiceLayout.adoc#named[domain services].
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[actions]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[collections]
+* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[properties]
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[domain objects]
+* xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#named[domain services].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/renderDay.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/renderDay.adoc
index 037977e..5ee8aa1 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/renderDay.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/renderDay.adoc
@@ -37,5 +37,5 @@ public class Tenancy {
 
 == See also
 
-This attribute is also supported for xref:refguide:applib-ant:PropertyLayout.adoc#renderDay[properties].
+This attribute is also supported for xref:system:generated:index/applib/annotation/PropertyLayout.adoc#renderDay[properties].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/typicalLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/typicalLength.adoc
index ead0db3..9121d6a 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/typicalLength.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/ParameterLayout/typicalLength.adoc
@@ -8,7 +8,7 @@
 
 The `typicalLength` attribute indicates the typical length of a string parameter.
 It is ignored for parameters of other types.
-The attribute is also supported for xref:refguide:applib-ant:PropertyLayout.adoc#typicalLength[properties].
+The attribute is also supported for xref:system:generated:index/applib/annotation/PropertyLayout.adoc#typicalLength[properties].
 
 The information is intended as a hint to the UI to determine the space that should be given to render a particular string parameter.
 That said, note that the xref:vw:ROOT:about.adoc[Wicket viewer] uses the maximum space available for all fields, so in effect ignores this attribute.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/_summary.adoc
index efecf22..292fb10 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/_summary.adoc
@@ -4,15 +4,15 @@
 //+
 //If the xref:extensions:command-replay:about.adoc[Command Replay] extension is being used (for regression testing), provides a mechanism to process the `CommandDto` before being replicated from primary to secondary system
 //
-//<.> xref:refguide:applib-ant:Property.adoc#commandPublishing[`commandPublishing()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#commandPublishing[`commandPublishing()`]
 //+
 //Whether the editing of a property should be published to registered xref:refguide:applib-svc:CommandSubscriber.adoc[`CommandSubscriber`]s as a `Command` object, that captures the details of this edit. Typically so it can be logged using the xref:extensions:command-log:about.adoc[Command Log] extension (for auditing or for regression testing using xref:extensions:command-replay:about.adoc[Command Replay]).
 //
-//<.> xref:refguide:applib-ant:Property.adoc#domainEvent[`domainEvent()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`domainEvent()`]
 //+
 //The event type to be posted to the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`] to broadcast the property's business rule checking (hide, disable, validate) and its modification (before and after).
 //
-//<.> xref:refguide:applib-ant:Property.adoc#editing[`editing()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#editing[`editing()`]
 //+
 //Whether a property can be modified or cleared from within the UI
 //
@@ -20,46 +20,46 @@
 //+
 //The reason that this property cannot be modified.
 //
-//<.> xref:refguide:applib-ant:Property.adoc#executionPublishing[`executionPublishing()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#executionPublishing[`executionPublishing()`]
 //+
 //Whether the editing of a property should be published to registered xref:refguide:applib-svc:ExecutionSubscriber.adoc[`ExecutionSubscriber`]s as an `Execution` object, that captures the details of this edit.
 //
-//<.> xref:refguide:applib-ant:Property.adoc#fileAccept[`fileAccept()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#fileAccept[`fileAccept()`]
 //+
 //Hints the file type (media type or file extension) to be uploaded to a xref:applib-classes:value-types.adoc#Blob[`Blob`]
 // or xref:applib-classes:value-types.adoc#Clob[`Clob`]. +
 //+
 //Note that this does not prevent the user from uploading some other file type; rather it merely defaults the file type in the file open dialog.
 //
-//<.> xref:refguide:applib-ant:Property.adoc#hidden[`hidden()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#hidden[`hidden()`]
 //+
 //Indicates where (in the UI) the property should be hidden from the user.
 //
-//<.> xref:refguide:applib-ant:Property.adoc#maxLength[`maxLength()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#maxLength[`maxLength()`]
 //+
 //Maximum number of characters for string parameters; ignored otherwise +
 //+
 //TIP: In many/most cases you should however use xref:refguide:applib-ant:Column.adoc[`@Column#length()`]
 //
-//<.> xref:refguide:applib-ant:Property.adoc#snapshot[`snapshot()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#snapshot[`snapshot()`]
 //+
 //Whether to exclude from snapshots. +
 //
-//<.> xref:refguide:applib-ant:Property.adoc#mustSatisfy[`mustSatisfy()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[`mustSatisfy()`]
 //+
 //Implementation of `o.a.i.applib.spec.Specification` that allows arbitrary validation to be applied.
 //
-//<.> xref:refguide:applib-ant:Property.adoc#optionality[`optionality()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#optionality[`optionality()`]
 //+
 //Specifies a property is optional rather than mandatory
 //+
 //TIP: In many/most cases you should however use xref:refguide:applib-ant:Column.adoc[`@Column#allowsNull()`]
 //
-//<.> xref:refguide:applib-ant:Property.adoc#projecting[`projecting()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#projecting[`projecting()`]
 //+
 //Indicates that owning object is a view model that is acting as a projection of the underlying entity referenced by this property.
 //
-//<.> xref:refguide:applib-ant:Property.adoc#regexPattern[`regexPattern()`]
+//<.> xref:system:generated:index/applib/annotation/Property.adoc#regexPattern[`regexPattern()`]
 //+
 //Validates the contents of a string parameter against the regular expression pattern
 //
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/commandPublishing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/commandPublishing.adoc
index 8662212..c43ba8d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/commandPublishing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/commandPublishing.adoc
@@ -6,7 +6,7 @@
 
 CAUTION: TODO: v2 - publishing/auditing got a complete overhaul
 
-Every property edit (and xref:Action.adoc#commandPublishing[action invocation] for that matter) is normally reified into a concrete `Command` object, basically a wrapper around the XML invocation xref:schema:cmd.adoc[Command] schema that also captures some timing metrics about the execution as well as the outcome.
+Every property edit (and xref:system:generated:index/applib/annotation/Action.adoc#commandPublishing[action invocation] for that matter) is normally reified into a concrete `Command` object, basically a wrapper around the XML invocation xref:schema:cmd.adoc[Command] schema that also captures some timing metrics about the execution as well as the outcome.
 
 The main uses cases are:
 
@@ -75,6 +75,6 @@ If `commandDtoProcessor()` is specified, then `commandPublishing()` is assumed t
 
 
 
-For an example application, see xref:refguide:applib-ant:Action.adoc#command[`Action#command()`].
+For an example application, see xref:system:generated:index/applib/annotation/Action.adoc#command[`Action#command()`].
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/domainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/domainEvent.adoc
index 191dce7..1477092 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/domainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/domainEvent.adoc
@@ -168,6 +168,6 @@ However, events can be raised programmatically by wrapping the target object usi
 
 This attribute is also supported for:
 
-* xref:refguide:applib-ant:Action.adoc#domainEvent[actions] and
-* xref:refguide:applib-ant:Property.adoc#domainEvent[properties].
+* xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[actions] and
+* xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[properties].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/editing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/editing.adoc
index b949914..7c8189e 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/editing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/editing.adoc
@@ -11,7 +11,7 @@ The related `editingDisabledReason` attribute specifies the a hard-coded reason
 
 Whether a property is enabled or disabled depends upon these factors:
 
-* whether the domain object has been configured as immutable through the xref:refguide:applib-ant:DomainObject.adoc#editing[`@DomainObject#editing()`] attribute
+* whether the domain object has been configured as immutable through the xref:system:generated:index/applib/annotation/DomainObject.adoc#editing[`@DomainObject#editing()`] attribute
 
 * else (that is, if the domain object's editability is specified as being `AS_CONFIGURED`), then the value of the xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.editing['isis.applib.annotation.domain-object.editing'] configuration property.
 If set to `false`, then the object's properties (and collections) are __not__ editable
@@ -44,4 +44,4 @@ public class Customer {
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:DomainObject.adoc#editing[domain object].
+* xref:system:generated:index/applib/annotation/DomainObject.adoc#editing[domain object].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/executionPublishing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/executionPublishing.adoc
index 1cb899a..9fd8f59 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/executionPublishing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/executionPublishing.adoc
@@ -45,10 +45,10 @@ public class Order {
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:DomainObject.adoc#publishing[domain objects]
+* xref:system:generated:index/applib/annotation/DomainObject.adoc#publishing[domain objects]
 +
 where it controls whether changed objects are published as events, and for
 
-* xref:refguide:applib-ant:Action.adoc#publishing[actions]
+* xref:system:generated:index/applib/annotation/Action.adoc#executionPublishing[actions]
 +
 where it controls whether action invocations are published as events.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/fileAccept.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/fileAccept.adoc
index 0ede56b..359f533 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/fileAccept.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/fileAccept.adoc
@@ -6,7 +6,7 @@
 
 
 The `fileAccept` attribute applies only to xref:applib-classes:value-types.adoc#Blob[`Blob`] or xref:applib-classes:value-types.adoc#Clob[`Clob`] parameters, indicating the type of file to accept when uploading a new value.
-The attribute is also supported on xref:refguide:applib-ant:Parameter.adoc#fileAccept[parameters].
+The attribute is also supported on xref:system:generated:index/applib/annotation/Parameter.adoc#fileAccept[parameters].
 
 For example:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/hidden.adoc
index b1142f1..6ff816d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/hidden.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/hidden.adoc
@@ -10,7 +10,7 @@ Properties can be hidden at the domain-level, indicating that they are not visib
 
 [TIP]
 ====
-It is also possible to use xref:refguide:applib-ant:Property.adoc#hidden[`@Property#hidden()`] to hide an action at the domain layer.
+It is also possible to use xref:system:generated:index/applib/annotation/Property.adoc#hidden[`@Property#hidden()`] to hide an action at the domain layer.
 ====
 
 For example:
@@ -60,7 +60,7 @@ This combines `PARENTED_TABLES` and `STANDALONE_TABLES`.
 * `Where.NOWHERE` +
 + The property should not be hidden, overriding any other metadata/conventions that would normally cause the property to be hidden. +
 
-For example, if a property is annotated with xref:refguide:applib-ant:Title.adoc[`@Title`], then normally this should be hidden from all tables.
+For example, if a property is annotated with xref:system:generated:index/applib/annotation/Title.adoc[`@Title`], then normally this should be hidden from all tables.
 Annotating with `@Property(where=Where.NOWHERE)` overrides this.
 
 [NOTE]
@@ -72,5 +72,5 @@ The xref:vro:ROOT:about.adoc[RestfulObjects viewer] has only partial support for
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#hidden[actions]
-* xref:refguide:applib-ant:CollectionLayout.adoc#hidden[collections].
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#hidden[actions]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#hidden[collections].
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/maxLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/maxLength.adoc
index bba6e00..506538c 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/maxLength.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/maxLength.adoc
@@ -55,5 +55,5 @@ public class Customer {
 
 == See also
 
-This attribute can also be applied to xref:refguide:applib-ant:Parameter.adoc#maxLength[parameters].
+This attribute can also be applied to xref:system:generated:index/applib/annotation/Parameter.adoc#maxLength[parameters].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/mustSatisfy.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/mustSatisfy.adoc
index a407199..a44bda0 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/mustSatisfy.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/mustSatisfy.adoc
@@ -7,11 +7,11 @@
 
 
 The `mustSatisfy` attribute allows arbitrary validation to be applied to properties using an (implementation of a) `org.apache.isis.applib.spec.Specification` object.
-The attribute is also supported on xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[parameters].
+The attribute is also supported on xref:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[parameters].
 
 [TIP]
 ====
-The specification implementations can (of course) be reused between properties and xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[parameters].
+The specification implementations can (of course) be reused between properties and xref:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[parameters].
 ====
 
 The `Specification` is consulted during validation, being passed the proposed value.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/optionality.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/optionality.adoc
index 01dd9f7..64895c9 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/optionality.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/optionality.adoc
@@ -7,7 +7,7 @@
 
 By default, Apache Isis assumes that all properties of an domain object or view model are required (mandatory).
 The `optionality` attribute allows this to be relaxed.
-The attribute is also supported for xref:refguide:applib-ant:Parameter.adoc#optionality[parameters].
+The attribute is also supported for xref:system:generated:index/applib/annotation/Parameter.adoc#optionality[parameters].
 
 That said, properties are most commonly defined on persistent domain objects (entities), in which case the JDO xref:refguide:applib-ant:Column.adoc[`@Column`] should be specified.
 Apache Isis can infer the maxLength directly from the equivalent @Column#length() annotation.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/regexPattern.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/regexPattern.adoc
index d989da9..d51afaf 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/regexPattern.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/Property/regexPattern.adoc
@@ -39,5 +39,5 @@ public class Customer {
 
 == See also
 
-This attribute can also be specified for xref:refguide:applib-ant:Parameter.adoc#regexPattern[parameters].
+This attribute can also be specified for xref:system:generated:index/applib/annotation/Parameter.adoc#regexPattern[parameters].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/_summary.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/_summary.adoc
index fa8e29e..52fe736 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/_summary.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/_summary.adoc
@@ -1,33 +1,33 @@
 // TODO - v2 (reconcile/move into javadoc).
 
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#cssClass[`cssClass()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#cssClass[`cssClass()`]
 //+
 //The css class that a property should have, to allow more targetted styling in xref:refguide:config:application-specific/application-css.adoc[`application.css`]
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#describedAs[`describedAs()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#describedAs[`describedAs()`]
 //+
 //Description of this property, eg to be rendered in a tooltip.
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#hidden[`hidden()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#hidden[`hidden()`]
 //+
 //Indicates where (in the UI) the property should be hidden from the user.
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#labelPosition[`labelPosition()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#labelPosition[`labelPosition()`]
 //+
 //In forms, the positioning of the label relative to the property value. +
 //+
-//Defaults is `LEFT`, unless xref:refguide:applib-ant:PropertyLayout.adoc#multiLine[`multiLine`] in which case `TOP`.
+//Defaults is `LEFT`, unless xref:system:generated:index/applib/annotation/PropertyLayout.adoc#multiLine[`multiLine`] in which case `TOP`.
 //The value `RIGHT` is only supported for boolean properties.
 //+
 //It is also possible to change the default through a xref:refguide:config:configuring-core.adoc#isis-viewers-propertyLayout-labelPosition[configuration property]
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#multiLine[`multiLine()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#multiLine[`multiLine()`]
 //+
 //For string properties, render as a text area over multiple lines.  +
 //+
-//If set > 1, then xref:refguide:applib-ant:PropertyLayout.adoc#labelPosition[`labelPosition`] defaults to TOP.
+//If set > 1, then xref:system:generated:index/applib/annotation/PropertyLayout.adoc#labelPosition[`labelPosition`] defaults to TOP.
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#named[`named()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[`named()`]
 //+
 //To override the name inferred from the collection's name in code. +
 //+
@@ -37,24 +37,24 @@
 //+
 //Whether to HTML escape the name of this property.
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#navigable[`navigable()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#navigable[`navigable()`]
 //+
 //Whether a property should be used as the navigable parent (parent breadcrumb) of this object
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#promptStyle[`promptStyle()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#promptStyle[`promptStyle()`]
 //+
 //How a property prompt should be displayed within the UI
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#renderDay[`renderDay()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#renderDay[`renderDay()`]
 //+
 //For date properties only, render the date as one day prior to the actually stored date.
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#repainting[`repainting()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#repainting[`repainting()`]
 //+
 //Indicates that the value held by the property never changes over time (even if other properties of the object do change).
 //+
 //Used as a hint to the viewer not to redraw the property if possible after an AJAX update.
 //
-//<.> xref:refguide:applib-ant:PropertyLayout.adoc#typicalLength[`typicalLength()`]
+//<.> xref:system:generated:index/applib/annotation/PropertyLayout.adoc#typicalLength[`typicalLength()`]
 //+
 //The typical entry length of a field, use to determine the optimum width for display
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/cssClass.adoc
index da63b87..a1fabe8 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/cssClass.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/cssClass.adoc
@@ -33,9 +33,9 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClass[domain objects]
-* xref:refguide:applib-ant:ActionLayout.adoc#cssClass[actions]
-* xref:refguide:applib-ant:CollectionLayout.adoc#cssClass[collections]
-* xref:refguide:applib-ant:ParameterLayout.adoc#cssClass[parameters].
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[domain objects]
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[actions]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[collections]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#cssClass[parameters].
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/describedAs.adoc
index fa65fae..9a91602 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/describedAs.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/describedAs.adoc
@@ -6,7 +6,7 @@
 
 
 
-The `describedAs` attribute is used to provide a short description of the property to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'. The attribute can also be specified for xref:refguide:applib-ant:CollectionLayout.adoc#describedAs[collections],  xref:refguide:applib-ant:ActionLayout.adoc#describedAs[actions], xref:refguide:applib-ant:ParameterLayout.adoc#describedAs[parameters] and xref:refguide:applib-ant:DomainObjectLayout.adoc#describedAs[do [...]
+The `describedAs` attribute is used to provide a short description of the property to the user.  In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'. The attribute can also be specified for xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[collections],  xref:system:generated:index/applib/annotation/ActionLayout.adoc#describedAs[actions], xref:system:generated:index/applib/annotation/ParameterLayout.adoc#describedAs[parameters] and  [...]
 
 For example:
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/hidden.adoc
index 3151c79..e8c3b1b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/hidden.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/hidden.adoc
@@ -9,7 +9,7 @@ The `hidden` attribute indicates where (in the UI) the property should be hidden
 
 [TIP]
 ====
-It is also possible to use xref:refguide:applib-ant:PropertyLayout.adoc#hidden[`@PropertyLayout#hidden`] or a xref:userguide:fun:ui.adoc#object-layout[file-based layout] such that the property can be hidden at the view layer.
+It is also possible to use xref:system:generated:index/applib/annotation/PropertyLayout.adoc#hidden[`@PropertyLayout#hidden`] or a xref:userguide:fun:ui.adoc#object-layout[file-based layout] such that the property can be hidden at the view layer.
 Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
 ====
 
@@ -63,7 +63,7 @@ This combines `PARENTED_TABLES` and `STANDALONE_TABLES`.
 +
 The property should not be hidden, overriding any other metadata/conventions that would normally cause the property to be hidden.
 
-For example, if a property is annotated with xref:refguide:applib-ant:Title.adoc[`@Title`], then normally this should be hidden from all tables.
+For example, if a property is annotated with xref:system:generated:index/applib/annotation/Title.adoc[`@Title`], then normally this should be hidden from all tables.
 Annotating with `@Property(where=Where.NOWHERE)` overrides this.
 
 [NOTE]
@@ -79,6 +79,6 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 This attribute can also be applied to:
 
-* xref:refguide:applib-ant:Action.adoc#hidden[actions]
-* xref:refguide:applib-ant:Collection.adoc#hidden[collections].
+* xref:system:generated:index/applib/annotation/Action.adoc#hidden[actions]
+* xref:system:generated:index/applib/annotation/Collection.adoc#hidden[collections].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/labelPosition.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/labelPosition.adoc
index 0d6c3b7..c000fc3 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/labelPosition.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/labelPosition.adoc
@@ -9,7 +9,7 @@
 The `labelPosition` attribute determines the positioning of labels for properties.
 
 The positioning of labels is typically `LEFT`, but can be positioned to the `TOP`.
-The one exception is xref:refguide:applib-ant:ParameterLayout.adoc#multiLine[`multiLine`] string properties, where the label defaults to `TOP` automatically (to provide as much real-estate for the multiline text field as possible).
+The one exception is xref:system:generated:index/applib/annotation/ParameterLayout.adoc#multiLine[`multiLine`] string properties, where the label defaults to `TOP` automatically (to provide as much real-estate for the multiline text field as possible).
 
 For boolean properties a positioning of `RIGHT` is also allowed; this is ignored for all other types.
 
@@ -89,5 +89,5 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 == See also
 
-This attribute can also be specified for xref:refguide:applib-ant:ParameterLayout.adoc#labelPosition[parameters].
+This attribute can also be specified for xref:system:generated:index/applib/annotation/ParameterLayout.adoc#labelPosition[parameters].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/multiLine.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/multiLine.adoc
index ff68e54..ccde020 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/multiLine.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/multiLine.adoc
@@ -7,7 +7,7 @@
 
 The `multiLine` attribute specifies that the text field for a string property should span multiple lines.
 It is ignored for other property types.
-The attribute is also supported for xref:refguide:applib-ant:ParameterLayout.adoc#multiLine[parameters].
+The attribute is also supported for xref:system:generated:index/applib/annotation/ParameterLayout.adoc#multiLine[parameters].
 
 For example:
 
@@ -32,7 +32,7 @@ Here the `stepsToReproduce` will be displayed in a text area of 10 rows.
 
 [NOTE]
 ====
-If set > 1 (as would normally be the case), then the default xref:refguide:applib-ant:PropertyLayout.adoc#labelPosition[`labelPosition`] defaults to `TOP` (rather than `LEFT`, as would normally be the case).
+If set > 1 (as would normally be the case), then the default xref:system:generated:index/applib/annotation/PropertyLayout.adoc#labelPosition[`labelPosition`] defaults to `TOP` (rather than `LEFT`, as would normally be the case).
 ====
 
 == Alternatives
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/named.adoc
index 8d0c9e4..9dbe10a 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/named.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/named.adoc
@@ -46,9 +46,9 @@ The framework also provides a separate, powerful mechanism for xref:userguide:bt
 
 This attribute can also be specified for:
 
-* xref:refguide:applib-ant:ActionLayout.adoc#named[actions]
-* xref:refguide:applib-ant:CollectionLayout.adoc#named[collections]
-* xref:refguide:applib-ant:ParameterLayout.adoc#named[parameters]
-* xref:refguide:applib-ant:DomainObjectLayout.adoc#named[domain objects]
-* xref:refguide:applib-ant:DomainServiceLayout.adoc#named[domain services].
+* xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[actions]
+* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[collections]
+* xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[parameters]
+* xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[domain objects]
+* xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc#named[domain services].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/renderDay.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/renderDay.adoc
index 9af9512..9e12443 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/renderDay.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/renderDay.adoc
@@ -43,5 +43,5 @@ As an alternative to using the annotation, the dynamic xref:userguide:fun:ui.ado
 
 == See also
 
-This attribute is also supported for xref:refguide:applib-ant:ParameterLayout.adoc#renderDay[parameters].
+This attribute is also supported for xref:system:generated:index/applib/annotation/ParameterLayout.adoc#renderDay[parameters].
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/repainting.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/repainting.adoc
index 1f3d92d..b5979d7 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/repainting.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/repainting.adoc
@@ -14,7 +14,7 @@ Note that for this to work, the viewer will also ensure that none of the propert
 
 [NOTE]
 ====
-Design note: we considered implementing this an "immutable" flag on the xref:refguide:applib-ant:Property.adoc[`@Property`] annotation (because this flag is typically appropriate for immutable/unchanging properties of a domain object).
+Design note: we considered implementing this an "immutable" flag on the xref:system:generated:index/applib/annotation/Property.adoc[`@Property`] annotation (because this flag is typically appropriate for immutable/unchanging properties of a domain object).
 However, we decided not to do that, on the basis that it might be interpreted as having a deeper impact within the framework than simply a hint for rendering.
 ====
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/typicalLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/typicalLength.adoc
index 97e7228..7ff6b1b 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/typicalLength.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages-no-longer-referenced-since-projdoc-tooling/PropertyLayout/typicalLength.adoc
@@ -8,7 +8,7 @@
 
 The `typicalLength` attribute indicates the typical length of a string property.
 It is ignored for properties of other types.
-The attribute is also supported for xref:refguide:applib-ant:ParameterLayout.adoc#typicalLength[parameters].
+The attribute is also supported for xref:system:generated:index/applib/annotation/ParameterLayout.adoc#typicalLength[parameters].
 
 The information is intended as a hint to the UI to determine the space that should be given to render a particular string property.
 That said, note that the xref:vw:ROOT:about.adoc[Wicket viewer] uses the maximum space available for all fields, so in effect ignores this attribute.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Action.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action.adoc
deleted file mode 100644
index f92f078..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Action.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-[#Action]
-= @Action
-
-: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::system:generated:page$index/applib/annotation/Action.adoc[]
-
-
-include::Action/hooks/examples-and-usage.adoc[]
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout.adoc
deleted file mode 100644
index 68c6dbd..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout.adoc
+++ /dev/null
@@ -1,17 +0,0 @@
-[#ActionLayout]
-= @ActionLayout
-
-: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::system:generated:page$index/applib/annotation/ActionLayout.adoc[]
-
-
-
-
-
-
-include::ActionLayout/hooks/examples-and-usage.adoc[]
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Collection.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection.adoc
deleted file mode 100644
index 6361f69..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Collection.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[#Collection]
-= @Collection
-
-: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::system:generated:page$index/applib/annotation/Collection.adoc[]
-
-
-
-
-include::Collection/hooks/examples-and-usage.adoc[]
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout.adoc
deleted file mode 100644
index 307e628..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-[#CollectionLayout]
-= @CollectionLayout
-
-
-: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::system:generated:page$index/applib/annotation/CollectionLayout.adoc[]
-
-
-include::CollectionLayout/hooks/examples-and-usage.adoc[]
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
index 87085c4..facf8a7 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
@@ -34,7 +34,7 @@ public class Customer {
     public void setMiddleInitial(String middleInitial) { /* ... */ }
 ----
 
-Isis also provides xref:refguide:applib-ant:Property.adoc#optionality[`@Property#optionality`] attribute.
+Isis also provides xref:system:generated:index/applib/annotation/Property.adoc#optionality[`@Property#optionality`] attribute.
 If both are specified, Apache Isis will check when it initializes for any contradictions, and will fail-fast with an appropriate error message in the log if there are.
 
 You should also be aware that in the lack of either the `@Column#allowsNull` or the `@Property#optionality` attributes, that the JDO and Apache Isis defaults differ.
@@ -43,7 +43,7 @@ JDO on the other hand specifies that only primitive types are mandatory; everyth
 Therefore a lack of either annotation can also trigger the fail-fast validation check.
 
 In the vast majority of cases you should be fine just to add the `@Column#allowsNull` attribute to the getter.
-But see the documentation for xref:refguide:applib-ant:Property.adoc#optionality[`@Property#optionality`] attribute for discussion on one or two minor edge cases.
+But see the documentation for xref:system:generated:index/applib/annotation/Property.adoc#optionality[`@Property#optionality`] attribute for discussion on one or two minor edge cases.
 
 [#length-for-strings]
 == Length for ``String``s
@@ -66,7 +66,7 @@ public class Customer {
     public void setLastName(String lastName) { /* ... */ }
 ----
 
-Apache Isis also provides xref:refguide:applib-ant:Property.adoc#maxLength[`@Property#maxLength`] attribute.
+Apache Isis also provides xref:system:generated:index/applib/annotation/Property.adoc#maxLength[`@Property#maxLength`] attribute.
 If both are specified, Apache Isis will check when it initializes for any contradictions, and will fail-fast with an appropriate error message in the log if there are.
 
 [#lengthscale-for-bigdecimals]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Column/hooks/examples-and-usage.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Column/hooks/examples-and-usage.adoc
deleted file mode 100644
index e69de29..0000000
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject.adoc
deleted file mode 100644
index ab559ee..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-[#DomainObject]
-= @DomainObject
-
-: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::system:generated:page$index/applib/annotation/DomainObject.adoc[]
-
-
-include::DomainObject/hooks/examples-and-usage.adoc[]
-
-
-
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout.adoc
deleted file mode 100644
index 9d6ace3..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-[#DomainObjectLayout]
-= @DomainObjectLayout
-
-: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::system:generated:page$index/applib/annotation/DomainObjectLayout.adoc[]
-
-
-include::DomainObjectLayout/hooks/examples-and-usage.adoc[]
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService.adoc
deleted file mode 100644
index df9a86a..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-= @DomainService
-
-: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::system:generated:page$index/applib/annotation/DomainService.adoc[]
-
-
-
-
-For example:
-
-[source,java]
-----
-@DomainService(
-    nature=NatureOfService.DOMAIN,
-    repositoryFor=Loan.class
-)
-public class LoanRepository {
-    @Programmatic
-    public List<Loan> findLoansFor(Borrower borrower) { /* ... */ }
-}
-----
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout.adoc
deleted file mode 100644
index f7cb005..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout.adoc
+++ /dev/null
@@ -1,31 +0,0 @@
-[#DomainServiceLayout]
-= @DomainServiceLayout
-
-: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::system:generated:page$index/applib/annotation/DomainServiceLayout.adoc[]
-
-
-
-
-For example:
-
-[source,java]
-----
-@DomainService
-@DomainServiceLayout(
-    menuBar=MenuBar.PRIMARY,
-    named="ToDos"
-)
-public class ToDoItems {
-    ...
-}
-----
-
-
-[TIP]
-====
-You will also find some additional material in the xref:userguide:fun:ui.adoc#menu-bars-layout[user guide].
-====
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Facets.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Facets.adoc
deleted file mode 100644
index 2dcc9c2..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Facets.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[#Facets]
-= @Facets
-
-: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::system:generated:page$index/applib/annotation/Facets.adoc[]
-
-
-include::Facets/hooks/examples-and-usage.adoc[]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/HomePage.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/HomePage.adoc
deleted file mode 100644
index e371fae..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/HomePage.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-[#HomePage]
-= @HomePage
-
-: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::system:generated:page$index/applib/annotation/HomePage.adoc[]
-
-
-include::HomePage/hooks/examples-and-usage.adoc[]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/InteractionScope.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/InteractionScope.adoc
deleted file mode 100644
index 5c67d32..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/InteractionScope.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-[#InteractionScope]
-= @InteractionScope
-
-: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::system:generated:page$index/applib/annotation/InteractionScope.adoc[]
-
-include::InteractionScope/hooks/examples-and-usage.adoc[]
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder.adoc
deleted file mode 100644
index 5487bdf..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[#MemberOrder]
-= @MemberOrder
-
-: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::system:generated:page$index/applib/annotation/MemberOrder.adoc[]
-
-
-include::MemberOrder/hooks/examples-and-usage.adoc[]
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder/hooks/examples-and-usage.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder/hooks/examples-and-usage.adoc
deleted file mode 100644
index f7e5e86..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder/hooks/examples-and-usage.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-== Notes
-
-As this is an important topic, there is xref:userguide:fun:ui.adoc#object-layout[chapter] in the user guide that discusses object layout in full.
-
-
-[TIP]
-====
-The annotation is one of a handful (others including xref:refguide:applib-ant:Collection.adoc[`@Collection`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`], xref:refguide:applib-ant:Property.adoc[`@Property`]) and xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`] that can also be applied to the field, rather than the getter method.
-This is specifically so that boilerplate-busting tools such as link:https://projectlombok.org/[Project Lombok] can be used.
-====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc
deleted file mode 100644
index e587d44..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc
+++ /dev/null
@@ -1,29 +0,0 @@
-[#MinLength]
-= @MinLength
-
-: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::system:generated:page$index/applib/annotation/MinLength.adoc[]
-
-
-For example:
-
-[source,java]
-----
-public ToDoItem add(
-    final ToDoItem toDoItem) {
-    getDependencies().add(toDoItem);
-    return this;
-}
-public List<ToDoItem> autoComplete0Add(
-        final @MinLength(2)
-        String search) {
-    final List<ToDoItem> list = toDoItems.autoComplete(search);
-    list.removeAll(getDependencies());
-    list.remove(this);
-    return list;
-}
-----
-
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Nullable.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Nullable.adoc
index 24fce9a..dfac251 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Nullable.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Nullable.adoc
@@ -31,14 +31,14 @@ public Customer updateName(@javax.annotation.Nullable final String name) {
 ----
 
 Apache Isis does provide several other ways to specify optionality: using the
-xref:refguide:applib-ant:Property.adoc#optionality[`@Property#optionality()`] /
-xref:refguide:applib-ant:Parameter.adoc#optionality[`@Parameter#optionality()`] annotation.
+xref:system:generated:index/applib/annotation/Property.adoc#optionality[`@Property#optionality()`] /
+xref:system:generated:index/applib/annotation/Parameter.adoc#optionality[`@Parameter#optionality()`] annotation.
 For properties, the optionality can also be inferred from the xref:refguide:applib-ant:Column.adoc#nullability[`@Column#allowsNull()`] attribute.
 
 [TIP]
 ====
 See the
-xref:refguide:applib-ant:Property.adoc#optionality[`@Property#optionality()`] documentation for a much fuller discussion on the relationship between using the Apache Isis annotations vs
+xref:system:generated:index/applib/annotation/Property.adoc#optionality[`@Property#optionality()`] documentation for a much fuller discussion on the relationship between using the Apache Isis annotations vs
 xref:refguide:applib-ant:Column.adoc#nullability[`@Column#allowsNull()`].
 ====
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc
deleted file mode 100644
index 8d6c538..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[#Parameter]
-= @Parameter
-
-: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::system:generated:page$index/applib/annotation/Parameter.adoc[]
-
-
-
-include::Parameter/hooks/examples-and-usage.adoc[]
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout.adoc
deleted file mode 100644
index f0907e7..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[#ParameterLayout]
-= @ParameterLayout
-
-: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::system:generated:page$index/applib/annotation/ParameterLayout.adoc[]
-
-
-
-include::ParameterLayout/hooks/examples-and-usage.adoc[]
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Programmatic.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Programmatic.adoc
deleted file mode 100644
index 7afa419..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Programmatic.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[#Programmatic]
-= `@Programmatic`
-
-: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::system:generated:page$index/applib/annotation/Programmatic.adoc[]
-
-
-include::Programmatic/hooks/examples-and-usage.adoc[]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc
deleted file mode 100644
index 9b0f685..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-[#Property]
-= @Property
-
-: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::system:generated:page$index/applib/annotation/Property.adoc[]
-
-
-include::Property/hooks/examples-and-usage.adoc[]
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout.adoc
deleted file mode 100644
index cb7aa76..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-[#PropertyLayout]
-= @PropertyLayout
-
-: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::system:generated:page$index/applib/annotation/PropertyLayout.adoc[]
-
-
-include::PropertyLayout/hooks/examples-and-usage.adoc[]
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc
deleted file mode 100644
index 0b31d34..0000000
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc
+++ /dev/null
@@ -1,12 +0,0 @@
-[#Title]
-= @Title
-
-: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::system:generated:page$index/applib/annotation/Title.adoc[]
-
-
-include::Title/hooks/examples-and-usage.adoc[]
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
index 02bfa44..32addea 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
@@ -11,8 +11,8 @@ In the case of a JAXB-annotated object this memento is its XML representation.
 JAXB generally requires that the root element of the XML representation is annotated with `@XmlRootElement`.
 Apache Isis makes this a mandatory requirement.
 
-In comparison to using either the xref:applib-classes:ViewModel.adoc[`ViewModel`] interface or the 
-xref:refguide:applib-ant:ViewModel.adoc[`@DomainObject(nature=VIEW_MODEL)`] annotation, 
+In comparison to using either the xref:applib-classes:ViewModel.adoc[`ViewModel`] interface or the
+xref:refguide:applib-ant:ViewModel.adoc[`@DomainObject(nature=VIEW_MODEL)`] annotation,
 using `@XmlRootElement` has a couple of significant advantages:
 
 * the view model can be used as a "canonical" DTO, for example when accessing data using the xref:vro:ROOT:about.adoc[RestfulObjects viewer] in combination with the
@@ -59,7 +59,7 @@ public class ToDoItemDto implements Dto {
 
 Although (like any other viewmodel) a JAXB-annotated can have behaviour (actions) and UI hints, you may wish to keep the DTO "clean", just focused on specifying the data contract.
 
-Behaviour can therefore be provided using xref:userguide:fun:overview.adoc#mixins[mixins] (annotated with xref:refguide:applib-ant:DomainObject.adoc[`@DomainObject(nature=MIXIN)`]), while xref:applib-classes:classes/uievent.adoc[UI events] can be used to obtain title, icons and so on.
+Behaviour can therefore be provided using xref:userguide:fun:overview.adoc#mixins[mixins] (annotated with xref:system:generated:index/applib/annotation/DomainObject.adoc[`@DomainObject(nature=MIXIN)`]), while xref:applib-classes:classes/uievent.adoc[UI events] can be used to obtain title, icons and so on.
 
 For a more complete discussion of writing JAXB view models/DTOs, see xref:userguide:fun:overview.adoc#view-models[this topic] in the user guide.
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/about/main.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/main.adoc
index 05ee813..fbd8340 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/about/main.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/about/main.adoc
@@ -25,62 +25,62 @@ The table below summarizes these most commonly used annotations in Apache Isis.
 |Layer
 |xref:userguide:fun:ui.adoc#object-layout[File-based layout]?
 
-|xref:refguide:applib-ant:Action.adoc[`@Action`]
+|xref:system:generated:index/applib/annotation/Action.adoc[`@Action`]
 |Domain semantics for actions
 |Domain
 |
 
-|xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`]
+|xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`]
 |User interface hints for actions
 |UI
 |Yes
 
-|xref:refguide:applib-ant:Collection.adoc[`@Collection`]
+|xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`]
 |Domain semantics for collections
 |Domain
 |
 
-|xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`]
+|xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`]
 |User interface hints for collections
 |UI
 |Yes
 
-|xref:refguide:applib-ant:DomainObject.adoc[`@DomainObject`]
+|xref:system:generated:index/applib/annotation/DomainObject.adoc[`@DomainObject`]
 |Domain semantics for domain object (entities and optionally view models)
 |Domain
 |
 
-|xref:refguide:applib-ant:DomainObjectLayout.adoc[`@DomainObjectLayout`]
+|xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`]
 |User interface hints for domain object (entities and optionally view models)
 |UI
 |Yes
 
-|xref:refguide:applib-ant:DomainService.adoc[`@DomainService`]
+|xref:system:generated:index/applib/annotation/DomainService.adoc[`@DomainService`]
 |Class is a domain service (rather than an entity or view model)
 |Domain
 |
 
-|xref:refguide:applib-ant:DomainServiceLayout.adoc[`@DomainServiceLayout`]
+|xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[`@DomainServiceLayout`]
 |User interface hints for domain services
 |UI
 |
 
-|xref:refguide:applib-ant:Parameter.adoc[`@Parameter`]
+|xref:system:generated:index/applib/annotation/Parameter.adoc[`@Parameter`]
 |Domain semantics for action parameters
 |Domain
 |
 
-|xref:refguide:applib-ant:ParameterLayout.adoc[`@ParameterLayout`]
+|xref:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`]
 |Layout hints for an action parameter (currently: its label position either to top or the left).
 |UI
 |Yes
 
-|xref:refguide:applib-ant:Property.adoc[`@Property`]
+|xref:system:generated:index/applib/annotation/Property.adoc[`@Property`]
 |Domain semantics for properties
 |Domain
 |
 
-|xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`]
+|xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`]
 |Layout hints for a property
 |UI
 |Yes
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/about/other.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/other.adoc
index 2ec4b8d..f1bdb8d 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/about/other.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/about/other.adoc
@@ -14,34 +14,34 @@ These annotations are also commonly used, but relate _not_ to objects or object
 |Layer
 |xref:userguide:fun:ui.adoc#object-layout[File-based layout]?
 
-|xref:refguide:applib-ant:Facets.adoc[`@Facets`]
+|xref:system:generated:index/applib/annotation/Facets.adoc[`@Facets`]
 |Install arbitrary facets within the Apache Isis metamodel.
 |(any)
 |
 
-|xref:refguide:applib-ant:HomePage.adoc[`@HomePage`]
+|xref:system:generated:index/applib/annotation/HomePage.adoc[`@HomePage`]
 |Query-only action (on domain service) to be invoked, result of which is rendered as the user's home page.
 |UI
 |
 
-|xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder`]
+|xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`]
 |Ordering of properties, collections and actions, and also associating actions with either a property or a collection.
 |UI
 |Yes
 
 
-|xref:refguide:applib-ant:MinLength.adoc[`@MinLength`]
+|xref:system:generated:index/applib/annotation/MinLength.adoc[`@MinLength`]
 |Minimum number of characters required for an auto-complete search argument.
 |UI
 |
 
 
-|xref:refguide:applib-ant:Programmatic.adoc[`@Programmatic`]
+|xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`]
 |Ignore a public method, excluded from the Apache Isis metamodel.
 |Domain
 |
 
-|xref:refguide:applib-ant:Title.adoc[`@Title`]
+|xref:system:generated:index/applib/annotation/Title.adoc[`@Title`]
 |Indicates which of the object's properties should be used to build up a title for the object.
 |UI
 
diff --git a/api/applib/src/main/adoc/modules/applib-ant/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-ant/partials/module-nav.adoc
index 733154e..5072158 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/partials/module-nav.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/partials/module-nav.adoc
@@ -3,34 +3,33 @@
 
 * xref:refguide:applib-ant:about.adoc[Annotations]
 
-** xref:refguide:applib-ant:Action.adoc[Action]
-** xref:refguide:applib-ant:ActionLayout.adoc[ActionLayout]
-** xref:refguide:applib-ant:Collection.adoc[Collection]
-** xref:refguide:applib-ant:CollectionLayout.adoc[CollectionLayout]
+** xref:system:generated:index/applib/annotation/Action.adoc[Action]
+** xref:system:generated:index/applib/annotation/ActionLayout.adoc[ActionLayout]
+** xref:system:generated:index/applib/annotation/Collection.adoc[Collection]
+** xref:system:generated:index/applib/annotation/CollectionLayout.adoc[CollectionLayout]
 ** xref:refguide:applib-ant:Column.adoc[Column]
 ** xref:refguide:applib-ant:Digits.adoc[Digits]
 ** xref:refguide:applib-ant:Discriminator.adoc[Discriminator]
-** xref:refguide:applib-ant:DomainObject.adoc[DomainObject]
-** xref:refguide:applib-ant:DomainObjectLayout.adoc[DomainObjectLayout]
-** xref:refguide:applib-ant:DomainService.adoc[DomainService]
-** xref:refguide:applib-ant:DomainServiceLayout.adoc[DomainServiceLayout]
-** xref:refguide:applib-ant:Facets.adoc[Facets]
-** xref:refguide:applib-ant:HomePage.adoc[HomePage]
-** xref:refguide:applib-ant:MemberOrder.adoc[MemberOrder]
-** xref:refguide:applib-ant:Mixin.adoc[Mixin]
+** xref:system:generated:index/applib/annotation/DomainObject.adoc[DomainObject]
+** xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[DomainObjectLayout]
+** xref:system:generated:index/applib/annotation/DomainService.adoc[DomainService]
+** xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[DomainServiceLayout]
+** xref:system:generated:index/applib/annotation/Facets.adoc[Facets]
+** xref:system:generated:index/applib/annotation/HomePage.adoc[HomePage]
+** xref:system:generated:index/applib/annotation/MemberOrder.adoc[MemberOrder]
 ** xref:refguide:applib-ant:NotPersistent.adoc[NotPersistent.]
 ** xref:refguide:applib-ant:Nullable.adoc[Nullable]
-** xref:refguide:applib-ant:MinLength.adoc[MinLength]
-** xref:refguide:applib-ant:Parameter.adoc[Parameter]
-** xref:refguide:applib-ant:ParameterLayout.adoc[ParameterLayout]
+** xref:system:generated:index/applib/annotation/MinLength.adoc[MinLength]
+** xref:system:generated:index/applib/annotation/Parameter.adoc[Parameter]
+** xref:system:generated:index/applib/annotation/ParameterLayout.adoc[ParameterLayout]
 ** xref:refguide:applib-ant:Pattern.adoc[Pattern]
 ** xref:refguide:applib-ant:PersistenceCapable.adoc[PersistenceCapable]
 ** xref:refguide:applib-ant:PrimaryKey.adoc[PrimaryKey]
-** xref:refguide:applib-ant:Programmatic.adoc[Programmatic]
-** xref:refguide:applib-ant:Property.adoc[Property]
-** xref:refguide:applib-ant:PropertyLayout.adoc[PropertyLayout]
-** xref:refguide:applib-ant:InteractionScope.adoc[RequestScoped]
-** xref:refguide:applib-ant:Title.adoc[Title]
+** xref:system:generated:index/applib/annotation/Programmatic.adoc[Programmatic]
+** xref:system:generated:index/applib/annotation/Property.adoc[Property]
+** xref:system:generated:index/applib/annotation/PropertyLayout.adoc[PropertyLayout]
+** xref:system:generated:index/applib/annotation/InteractionScope.adoc[RequestScoped]
+** xref:system:generated:index/applib/annotation/Title.adoc[Title]
 ** xref:refguide:applib-ant:ViewModel.adoc[ViewModel]
 ** xref:refguide:applib-ant:XmlJavaTypeAdapter.adoc[XmlJavaTypeAdapter]
 ** xref:refguide:applib-ant:XmlRootElement.adoc[XmlRootElement]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent.adoc
index 6cde0ee..639856c 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent.adoc
@@ -7,7 +7,7 @@
 This section catalogues the various domain event classes defined by Apache Isis.
 
 These events are broadcast on the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`].
-The domain events are broadcast as a result of being specified in the xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent()`],  xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent()`] or xref:refguide:applib-ant:Collection.adoc#domainEvent[`@Collection#domainEvent()`] attributes.
+The domain events are broadcast as a result of being specified in the xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`],  xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`] or xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`@Collection#domainEvent()`] attributes.
 
 They are listed in the table below.
 
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/ActionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/ActionDomainEvent.adoc
index ab3c168..95f2f9c 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/ActionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/ActionDomainEvent.adoc
@@ -39,7 +39,7 @@ public abstract class ActionDomainEvent<S> extends AbstractDomainEvent<S> {
     public void setReturnValue();                                       // <.>
 }
 ----
-<.> The `Default` nested static class is the default for the xref:refguide:applib-ant:Action.adoc#domainEvent[`@Action#domainEvent()`]
+<.> The `Default` nested static class is the default for the xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`]
 annotation attribute.
 Whether this raises an event or not depends upon the `isis.reflector.facet.actionAnnotation.domainEvent.postForDefault` configuration property.
 <.> The `Noop` class is provided as a convenience to indicate that an event should _not_ be posted (irrespective of the configuration property setting).
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/CollectionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/CollectionDomainEvent.adoc
index d6fa5d8..fe23535 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/CollectionDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/CollectionDomainEvent.adoc
@@ -39,7 +39,7 @@ public abstract class CollectionDomainEvent<S,T> extends AbstractDomainEvent<S>
     public Of getOf();                                          // <.>
 }
 ----
-<1> The `Default` nested static class is the default for the xref:refguide:applib-ant:Collection.adoc#domainEvent[`@Collection#domainEvent()`] annotation attribute.
+<1> The `Default` nested static class is the default for the xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`@Collection#domainEvent()`] annotation attribute.
 Whether this raises an event or not depends upon the
 `isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault` configuration property.
 <2> The `Noop` class is provided as a convenience to indicate that an event should _not_ be posted (irrespective of the configuration property setting).
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/PropertyDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/PropertyDomainEvent.adoc
index 537b298..6e9e037 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/PropertyDomainEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/domainevent/PropertyDomainEvent.adoc
@@ -37,7 +37,7 @@ public abstract class PropertyDomainEvent<S,T> extends AbstractDomainEvent<S> {
     public T getNewValue();                                     // <.>
 }
 ----
-<1> The `Default` nested static class is the default for the xref:refguide:applib-ant:Property.adoc#domainEvent[`@Property#domainEvent()`] annotation attribute.
+<1> The `Default` nested static class is the default for the xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`] annotation attribute.
 Whether this raises an event or not depends upon the
 `isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault` configuration property.
 <2> The `Noop` class is provided as a convenience to indicate that an event should _not_ be posted (irrespective of the configuration property setting).
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectCreatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectCreatedEvent.adoc
index 0f958e0..4b7f8e6 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectCreatedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectCreatedEvent.adoc
@@ -8,7 +8,7 @@
 
 Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first instantiated using the xref:refguide:applib-svc:FactoryService.adoc[`FactoryServuce`]'s `#instantiate(...)` method.
 
-`ObjectCreatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#createdLifecycleEvent[`@DomainObject#createdLifecycleEvent`].
+`ObjectCreatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:system:generated:index/applib/annotation/DomainObject.adoc#createdLifecycleEvent[`@DomainObject#createdLifecycleEvent`].
 
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistedEvent.adoc
index 393be91..ef0c0c8 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistedEvent.adoc
@@ -8,4 +8,4 @@
 Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
 
 
-`ObjectPersistedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#persistedLifecycleEvent[`@DomainObject#persistedLifecycleEvent`].
+`ObjectPersistedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:system:generated:index/applib/annotation/DomainObject.adoc#persistedLifecycleEvent[`@DomainObject#persistedLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistingEvent.adoc
index 051e105..bc0a143 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectPersistingEvent.adoc
@@ -8,5 +8,5 @@
 Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be saved (inserted) into the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
 
 
-`ObjectPersistingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#persistingLifecycleEvent[`@DomainObject#persistingLifecycleEvent`].
+`ObjectPersistingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:system:generated:index/applib/annotation/DomainObject.adoc#persistingLifecycleEvent[`@DomainObject#persistingLifecycleEvent`].
 
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectRemovingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectRemovingEvent.adoc
index 07b7dcd..42204c6 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectRemovingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectRemovingEvent.adoc
@@ -8,5 +8,5 @@
 Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be deleted from the database using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#remove(...)` method.
 
 
-`ObjectRemovingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#removingLifecycleEvent[`@DomainObject#removingLifecycleEvent`].
+`ObjectRemovingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:system:generated:index/applib/annotation/DomainObject.adoc#removingLifecycleEvent[`@DomainObject#removingLifecycleEvent`].
 
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatedEvent.adoc
index 45d2819..33ef831 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatedEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatedEvent.adoc
@@ -9,5 +9,5 @@
 Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object has just been updated in the database.
 This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
 
-`ObjectUpdatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent`].
+`ObjectUpdatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:system:generated:index/applib/annotation/DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent`].
 
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatingEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatingEvent.adoc
index bb19f14..d5f0e66 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatingEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent/ObjectUpdatingEvent.adoc
@@ -10,4 +10,4 @@ Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLife
 This is done either explicitly when the current transaction is flushed using the xref:refguide:applib-svc:RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
 
 
-`ObjectUpdatingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib-ant:DomainObject.adoc#updatingLifecycleEvent[`@DomainObject#updatingLifecycleEvent`].
+`ObjectUpdatingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[`@DomainObject#updatingLifecycleEvent`].
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent.adoc
index 9e8549b..06267c7 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent.adoc
@@ -7,7 +7,7 @@
 This section catalogues the various UI event classes defined by Apache Isis.
 
 These events are broadcast on the xref:refguide:applib-svc:EventBusService.adoc[`EventBusService`].  The domain
-events are broadcast as a result of being specified in the xref:refguide:applib-ant:DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`],  xref:refguide:applib-ant:DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] or xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassUiEvent[`@DomainObjectLayout#cssClassUiEvent()`] attributes.
+events are broadcast as a result of being specified in the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`],  xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] or xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`@DomainObjectLayout#cssClassUiEvent()`] attributes.
 
 They are listed in the table below.
 
@@ -25,14 +25,14 @@ They are listed in the table below.
 |(abstract class). +
 `TitleUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#titleUiEvent` attribute is specified
 |Broadcast whenever there is a requirement to obtain a title for a domain object.
-Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
+Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
 
 |xref:applib-classes:events.adoc#IconUiEvent[`o.a.i.applib.` +
 `IconUiEvent`]
 |(abstract class). +
 `IconUiEvent.Default` is the concrete implementation used if no `@DomainObjectLayout#iconUiEvent` attribute is specified
 |Broadcast whenever there is a requirement to obtain an icon (or rather, the name of an icon) for a domain object.
-Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] supporting method, or if it has the xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
+Note that if the domain object defines its own xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] supporting method, or if it has the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
 
 |xref:applib-classes:events.adoc#CssClassUiEvent[`o.a.i.applib.` +
 `CssClassUiEvent`]
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/IconUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/IconUiEvent.adoc
index 0b60ade..018ee3e 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/IconUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/IconUiEvent.adoc
@@ -15,5 +15,5 @@ The class has a number of responsibilities:
 The class itself is instantiated automatically by the framework whenever interacting with a rendered object's action.
 
 If the domain object defines its own xref:refguide:applib-methods:reserved.adoc#iconName[`iconName()`] supporting method, or if it has the
-xref:refguide:applib-ant:DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
+xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
 r
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/TitleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/TitleUiEvent.adoc
index 68bc5ad..36d82c6 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/TitleUiEvent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/uievent/TitleUiEvent.adoc
@@ -14,4 +14,4 @@ The class has a number of responsibilities:
 
 The class itself is instantiated automatically by the framework whenever interacting with a rendered object's action.
 
-If the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:refguide:applib-ant:Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
+If the domain object defines its own xref:refguide:applib-methods:reserved.adoc#title[`title()`] supporting method, or has xref:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation(s) on its properties, then these will take precedence.
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
index 99cd82f..cf4f667 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/menubars.adoc
@@ -10,7 +10,7 @@ The `org.apache.isis.applib.layout.menubars` package and subpackages define a nu
 The classes define a hierarchical structure of menu bars, menus and menu sections.
 Similar to the xref:applib-classes:layout.adoc[object layout] classes, the concrete menu classes support bootstrap3; support for other layout systems is possible.
 
-The component class `ServiceActionLayoutData` defines action metadata, being broadly equivalent to the "layout" annotations for actions, ie xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`].
+The component class `ServiceActionLayoutData` defines action metadata, being broadly equivalent to the "layout" annotations for actions, ie xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`].
 This is similar to the `ActionLayoutData` component class used for object layouts, but also captures the identity of the "owning" domain service.
 Service actions are grouped into menu sections.
 
@@ -57,7 +57,7 @@ The service action class reside in the `org.apache.isis.applib.layout.component`
 * `ServiceActionLayoutData` class
 
 +
-which correspond to the xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`] annotation.
+which correspond to the xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`] annotation.
 
 This is similar to `ActionLayoutData` (of the xref:applib-classes:layout.adoc[object layout] classes), however it also identifies the domain service to which it belongs.
 (This isn't required for the object layouts because the owner in that case is implicit).
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/layout/object-layout.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/object-layout.adoc
index e0e9a0d..a34cd13 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/layout/object-layout.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/layout/object-layout.adoc
@@ -17,7 +17,7 @@ The framework provides an implementation of the grid classes modelled closely on
 In principle it is also possible to extend the layout architecture for other grid systems.
 The component classes, though, are intended to be reusable across all grid systems.
 
-The component classes, meanwhile, are broadly equivalent to the "layout" annotations (xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`], xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`] and xref:refguide:applib-ant:DomainObjectLayout.adoc[`@DomainObjectLayout`]
+The component classes, meanwhile, are broadly equivalent to the "layout" annotations (xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`], xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`], xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`] and xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`]
 
 All of the classes in this package are JAXB-annotated, meaning that they can be serialized to/from XML (the `component` classes in the `http://isis.apache.org/applib/layout/component` XSD namespace, the bootstrap 3 grid classes in the `http://isis.apache.org/applib/layout/grid/bootstrap3` XSD namespace).
 This ability to serialize to/from XML is used by the xref:refguide:applib-svc:GridLoaderService.adoc[`GridLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
@@ -39,13 +39,13 @@ A fieldset (sometimes also called a property group or member group) of a number
 
 * layout data classes, which correspond to the similarly named annotations:
 
-** `PropertyLayoutData`, corresponding to the xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`] annotation;
+** `PropertyLayoutData`, corresponding to the xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`] annotation;
 
-** `CollectionLayoutData`, corresponding to the xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] annotation;
+** `CollectionLayoutData`, corresponding to the xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`] annotation;
 
-** `ActionLayoutData`, corresponding to the xref:refguide:applib-ant:ActionLayout.adoc[`@ActionLayout`] annotation;
+** `ActionLayoutData`, corresponding to the xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`] annotation;
 
-** `DomainObjectLayoutData`, corresponding to the xref:refguide:applib-ant:DomainObjectLayout.adoc[`@DomainObjectLayout`] annotation.
+** `DomainObjectLayoutData`, corresponding to the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`] annotation.
 
 In addition, the component package includes `Grid`, representing the top level container for a custom layout for a domain object.
 `Grid` itself is merely an interface, but it also defines the visitor pattern to make it easy for validate and normalize the grid layouts.
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
index d593843..fb199d1 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/spec.adoc
@@ -7,7 +7,7 @@
 
 The interfaces and classes listed in this chapter provide support for the  `Specification` pattern, as described in Eric Evans' book _Domain Driven Design_, p224.
 
-Apache Isis will automatically apply such specifications as validation rules on properties (as per xref:refguide:applib-ant:Property.adoc#mustSatisfy[`@Property#mustSatisfy()`]) and on action parameters (as per xref:refguide:applib-ant:Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]).
+Apache Isis will automatically apply such specifications as validation rules on properties (as per xref:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[`@Property#mustSatisfy()`]) and on action parameters (as per xref:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]).
 
 [#specification]
 == `Specification`
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/created.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/created.adoc
index 0f477b3..4b3db67 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/created.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/created.adoc
@@ -7,7 +7,7 @@
 
 The `created()` lifecycle callback method is called when a  domain object has just been instantiated using xref:refguide:applib-svc:FactoryService.adoc[`FactoryService`]
 
-An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:applib-ant:DomainObject.adoc#createdLifecycleEvent[`@DomainObject#createdLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:system:generated:index/applib/annotation/DomainObject.adoc#createdLifecycleEvent[`@DomainObject#createdLifecycleEvent()`] event.
 
 [WARNING]
 ====
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/loaded.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/loaded.adoc
index ca1b333..c55d4a6 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/loaded.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/loaded.adoc
@@ -8,5 +8,5 @@
 The `loaded()` lifecycle callback method is called when a (persistent) object has just been loaded from the object store.
 
 
-An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:applib-ant:DomainObject.adoc#loadedLifecycleEvent[`@DomainObject#loadedLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:system:generated:index/applib/annotation/DomainObject.adoc#loadedLifecycleEvent[`@DomainObject#loadedLifecycleEvent()`] event.
 
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisted.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisted.adoc
index 6276de1..3187867 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisted.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisted.adoc
@@ -7,7 +7,7 @@
 
 The `persisted()` lifecycle callback method is called when object has just been persisted from the object store.
 
-An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:applib-ant:DomainObject.adoc#persistedLifecycleEvent[`@DomainObject#persistedLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:system:generated:index/applib/annotation/DomainObject.adoc#persistedLifecycleEvent[`@DomainObject#persistedLifecycleEvent()`] event.
 
 See also the xref:refguide:applib-methods:lifecycle.adoc#persisting[`persisting()`] callback.
 
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisting.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisting.adoc
index fd0eacf..8baddf5 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisting.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/persisting.adoc
@@ -7,7 +7,7 @@
 
 The `persisting()` lifecycle callback method is called when a (not-yet-persistent) object is just about to be persisted from the object store
 
-An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:applib-ant:DomainObject.adoc#persistingLifecycleEvent[`@DomainObject#persistingLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:system:generated:index/applib/annotation/DomainObject.adoc#persistingLifecycleEvent[`@DomainObject#persistingLifecycleEvent()`] event.
 
 
 See also xref:refguide:applib-methods:lifecycle.adoc#persisted[`persisted()`] callback.
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/removing.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/removing.adoc
index a20bdb4..8255e53 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/removing.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/removing.adoc
@@ -7,7 +7,7 @@
 
 The `removing()` lifecycle callback method is called when a (persistent) object is just about to be deleted from the object store
 
-An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:applib-ant:DomainObject.adoc#removingLifecycleEvent[`@DomainObject#removingLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:system:generated:index/applib/annotation/DomainObject.adoc#removingLifecycleEvent[`@DomainObject#removingLifecycleEvent()`] event.
 
 NOTE: Unlike the xref:refguide:applib-methods:lifecycle.adoc#persisting[`persisting()`] /xref:refguide:applib-methods:lifecycle.adoc#persisted[`persisted()`] andxref:refguide:applib-methods:lifecycle.adoc#updating[`updating()`] /xref:refguide:applib-methods:lifecycle.adoc#updated[`updated()`] callbacks,
 there is no `removed()` callback.
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updated.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updated.adoc
index 91acda7..503c230 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updated.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updated.adoc
@@ -6,7 +6,7 @@
 
 The `updated()` lifecycle callback method is called when a (persistent) object has just been updated in the object store
 
-An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:applib-ant:DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:system:generated:index/applib/annotation/DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent()`] event.
 
 See also xref:refguide:applib-methods:lifecycle.adoc#updating[`updating()`].
 
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updating.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updating.adoc
index e66bc09..feec9f6 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updating.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle/updating.adoc
@@ -7,6 +7,6 @@
 The `updating()` lifecycle callback method is called when a (persistent) object is just about to be updated in the object store
 
 
-An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:applib-ant:DomainObject.adoc#updatingLifecycleEvent[`@DomainObject#updatingLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[`@DomainObject#updatingLifecycleEvent()`] event.
 
 See also xref:refguide:applib-methods:lifecycle.adoc#updated[`updated()`].
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc
index 786b151..cdfb549 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes.adoc
@@ -47,7 +47,7 @@ Param
 |Y
 |Return a list of matching elements for a property or an action parameter. +
 
-Alternatively, can specify for a class using xref:refguide:applib-ant:DomainObject.adoc#autoCompleteRepository[`@DomainObject` +
+Alternatively, can specify for a class using xref:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteRepository[`@DomainObject` +
 `#autoCompleteRepository`] +
 
 See also xref:refguide:applib-methods:prefixes.adoc#choices[`choices...()`]
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/autoComplete.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/autoComplete.adoc
index f22083c..bb7ecff 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/autoComplete.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/autoComplete.adoc
@@ -62,7 +62,7 @@ public class ShoppingCartItem {
 
 <.> `product` is the 0th argument of the action.
 
-<.> the xref:refguide:applib-ant:MinLength.adoc[`@MinLength`] annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects
+<.> the xref:system:generated:index/applib/annotation/MinLength.adoc[`@MinLength`] annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects
 
 
 == Properties
@@ -95,6 +95,6 @@ public class ShoppingCartItem {
     ...
 }
 ----
-<1> the xref:refguide:applib-ant:MinLength.adoc[`@MinLength`] annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects
+<1> the xref:system:generated:index/applib/annotation/MinLength.adoc[`@MinLength`] annotation specifies the minimum number of characters that must be entered before a search is performed for matching objects
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/getId.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/getId.adoc
index 6403ae4..8bef8c5 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/getId.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/deprecated/getId.adoc
@@ -36,7 +36,7 @@ public class OrderMenu {
 
 The rules of precedence are:
 
-1. xref:refguide:applib-ant:DomainService.adoc#objectType[`@DomainService#objectType()`]
+1. xref:system:generated:index/applib/annotation/DomainService.adoc#objectType[`@DomainService#objectType()`]
 2. xref:refguide:applib-methods:reserved.adoc#getId[`getId()`]
 3. The fully qualified class name.
 
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/layout.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/layout.adoc
index 758692d..1f94b72 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/layout.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/layout.adoc
@@ -5,7 +5,7 @@
 
 
 Every object has a xref:userguide:fun:ui.adoc#object-layout[layout] .
-This may be specified using annotations such as xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder`], xref:refguide:applib-ant:DomainObjectLayout.adoc[`@DomainObjectLayout`] and the like,  but it much more commonly specified using an xref:userguide:fun:ui.adoc#object-layout [XML layout file].
+This may be specified using annotations such as xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`], xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`] and the like,  but it much more commonly specified using an xref:userguide:fun:ui.adoc#object-layout [XML layout file].
 
 The `layout` method allows the domain object to specify an alternate layout to its usual layout.
 
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/title.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/title.adoc
index e3814de..0e11438 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/title.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/reserved/title.adoc
@@ -46,7 +46,7 @@ public String title() {
 
 As the example above shows, the implementation can be as complex as you like.
 
-In many cases, though, you may be able to use the xref:refguide:applib-ant:Title.adoc[`@Title`] annotation.
+In many cases, though, you may be able to use the xref:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation.
 
 r
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages-removed-services/AuditerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages-removed-services/AuditerService.adoc
deleted file mode 100644
index bf6c78e..0000000
--- a/api/applib/src/main/adoc/modules/applib-svc/pages-removed-services/AuditerService.adoc
+++ /dev/null
@@ -1,83 +0,0 @@
-= `AuditerService`
-
-: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 [...]
-:page-partial:
-
-
-
-
-The `AuditerService` auditing service provides a simple mechanism to capture changes to data.
-It is called for each property that has changed on any domain object, as a set of pre- and post-values.
-
-== API
-
-include::system:generated:page$index/AuditerService.adoc[leveloffset=+2]
-
-TODO example migration
-
-.Deprecated Docs
-[WARNING]
-================================
-
-== SPI
-
-The SPI for the service is:
-
-[source,java]
-----
-include::refguide:applib-svc:example$services/audit/AuditerService.java[tag=refguide]
-----
-<1> whether this implementation is enabled.
-If all configured implementations are disabled, then auditing is suppressed (a minor performance optimization).
-<2> together the `transactionId` (misnamed; really is the request/interaction Id) and the `sequence` uniquely identify the transaction in which the object was changed.
-<3> identifies the object that has changed
-<4> the property of the object that has changed.
-The combination of the `transactionId`, `sequence`, `target` and `propertyName` is unique.
-<5> the before and after values of the property (in string format).
-If the object was created then "[NEW]" is used as the pre-value; if the object was deleted then "[DELETED]" is used as the post-value.
-<6> the user that changed the object, and the date/time that this occurred.
-
-The framework will call this for each and every domain object property that is modified within a transaction.
-
-
-================================
-
-== Implementations
-
-The framework allows multiple implementations of this service to be registered; all will be called.
-
-There are two implementations provided by the framework:
-
-* The core framework provides a fallback implementation, `o.a.i.applib.services.audit.AuditerServiceLogging`.
-This simply logs the messages using a link:https://logging.apache.org/log4j/log4j-2.2/manual/configuration.html[Log4j2] logger.
-+
-[source,xml]
-.log4j2-spring.xml
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-  <Properties> ... </Properties>
-  <Appenders> ... </Appenders>
-  <Loggers>
-    ...
-    <logger
-      name="org.apache.isis.applib.services.audit.AuditerServiceLogging"
-      level="debug"/>
-    ...
-  </Loggers>
-</Configuration>
-----
-+
-See the `log4j2-spring.xml` file in xref:docs:starters:simpleapp.adoc[simpleapp] for the omitted detail.
-
-* the xref:security:audit-trail:about.adoc[Audit Trail] extension persists each audit record in a relational table.
-As its name implies, it uses xref:pjdo:ROOT:about.adoc[JDO/DataNucleus] to do this.
-
-
-== Related Services
-
-The services provided by this module combines very well with the xref:refguide:applib-svc:CommandSubscriber.adoc[`CommandServiceListener`].
-``Command``s captures the __cause__ of an interaction (an action was invoked, a property was edited), while the `AuditerService` captures the __effect__ of that interaction in terms of changed state.
-You may also want to configure the xref:refguide:applib-svc:ExecutionSubscriber.adoc[`PublisherService`], which also captures the effect of the interaction but as an event.
-All three of these services collaborate implicitly by way of the xref:applib-classes:roles-mixins-contributees/contributee.adoc#HasUniqueId[`HasUniqueId`] interface.
-
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/ApplicationFeatureRepository/hooks/_summary.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/ApplicationFeatureRepository/hooks/_summary.adoc
deleted file mode 100644
index bc5e758..0000000
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/ApplicationFeatureRepository/hooks/_summary.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-// TODO - v2 (reconcile/move into javadoc).
... 572 lines suppressed ...