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/22 09:33:39 UTC

[isis] branch ISIS-2444 updated (5412da3 -> b6edfb3)

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

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


 discard 5412da3  ISIS-2444: fixes xref's for new structure
 discard a0ddcd8  ISIS-2444: changes also to system-overview location
 discard 596d928  ISIS-2444: manually moves generated index files to their new locations
 discard 994a1b6  ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component
 discard 2d47931  ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component
     add 72c7a0c  Bump maven-invoker-plugin from 3.2.1 to 3.2.2
     add 2c07516  Merge pull request #394 from apache/dependabot/maven/org.apache.maven.plugins-maven-invoker-plugin-3.2.2
     add 3cde522  ISIS-2480: SecMan(JDO): revert default schema to isisSecman
     new 5217669  ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component
     new cfb832b  ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component
     new f808dd4  ISIS-2444: manually moves generated index files to their new locations
     new 68685fa  ISIS-2444: changes also to system-overview location
     new b6edfb3  ISIS-2444: fixes xref's for new structure

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5412da3)
            \
             N -- N -- N   refs/heads/ISIS-2444 (b6edfb3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../extensions/secman/jdo/dom/permission/ApplicationPermission.java     | 2 +-
 .../org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java | 2 +-
 .../isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java      | 2 +-
 .../org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java | 2 +-
 isis-parent/pom.xml                                                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


[isis] 04/05: ISIS-2444: changes also to system-overview location

Posted by da...@apache.org.
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 68685fa5453584fb5538cf6e57bb2da9aadf230d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 22 09:02:19 2021 +0000

    ISIS-2444: changes also to system-overview location
---
 antora/components/refguide/modules/{generated => _overview}/nav.adoc  | 0
 .../pages/system-overview.adoc => _overview/pages/about.adoc}         | 0
 tooling/cli/src/main/java/org/apache/isis/tooling/cli/CliConfig.java  | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/antora/components/refguide/modules/generated/nav.adoc b/antora/components/refguide/modules/_overview/nav.adoc
similarity index 100%
rename from antora/components/refguide/modules/generated/nav.adoc
rename to antora/components/refguide/modules/_overview/nav.adoc
diff --git a/antora/components/refguide/modules/generated/pages/system-overview.adoc b/antora/components/refguide/modules/_overview/pages/about.adoc
similarity index 100%
rename from antora/components/refguide/modules/generated/pages/system-overview.adoc
rename to antora/components/refguide/modules/_overview/pages/about.adoc
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/CliConfig.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/CliConfig.java
index e5827ab..08b8d37 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/CliConfig.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/CliConfig.java
@@ -55,7 +55,7 @@ public class CliConfig {
                         + "or implied. See the License for the specific language governing permissions and limitations under "
                         + "the License.";
 
-        private String documentPagesPath = "pages";
+        private String documentPagesPath = "modules/_overview/pages";
 
         // when 3 eg. skips first three parts of the package names 'org.apache.isis'
         private int namespacePartsSkipCount = 0;
@@ -82,7 +82,7 @@ public class CliConfig {
 
         @Data
         public static class Overview {
-            private String systemOverviewFilename = "system-overview.adoc";
+            private String systemOverviewFilename = "about.adoc";
 
             private String description = "These tables summarize all Maven artifacts available with this project.";
         }


[isis] 01/05: ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component

Posted by da...@apache.org.
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 52176691e3663a344d670eb57d7951158e936006
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 22 07:02:38 2021 +0000

    ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component
---
 .run/isis-tooling-cli (overview).run.xml             |  6 +++---
 scripts/ci/_adoc-gen-projdoc.sh                      |  2 +-
 .../isis/tooling/cli/projdoc/ProjectDocWriter.java   | 20 ++++++++++++++++++--
 .../cli/test/adocfix/IncludeStatementFixerTest.java  | 19 ++++++++++---------
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.run/isis-tooling-cli (overview).run.xml b/.run/isis-tooling-cli (overview).run.xml
index 4dafc48..11c8124 100644
--- a/.run/isis-tooling-cli (overview).run.xml	
+++ b/.run/isis-tooling-cli (overview).run.xml	
@@ -4,7 +4,7 @@
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.apache.isis.tooling.cli.Cli" />
     <module name="isis-tooling-cli" />
-    <option name="PROGRAM_PARAMETERS" value="-p . -o antora/components/system/modules/generated overview" />
+    <option name="PROGRAM_PARAMETERS" value="-p . -o antora/components/refguide overview" />
     <extension name="net.ashald.envfile">
       <option name="IS_ENABLED" value="false" />
       <option name="IS_SUBST" value="false" />
@@ -24,7 +24,7 @@
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.apache.isis.tooling.cli.Cli" />
     <module name="isis-tooling-cli" />
-    <option name="PROGRAM_PARAMETERS" value="-p . -o antora/components/system/modules/generated overview" />
+    <option name="PROGRAM_PARAMETERS" value="-p . -o antora/components/refguide overview" />
     <extension name="net.ashald.envfile">
       <option name="IS_ENABLED" value="false" />
       <option name="IS_SUBST" value="false" />
@@ -39,4 +39,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/scripts/ci/_adoc-gen-projdoc.sh b/scripts/ci/_adoc-gen-projdoc.sh
index 266511a..2c7f57b 100644
--- a/scripts/ci/_adoc-gen-projdoc.sh
+++ b/scripts/ci/_adoc-gen-projdoc.sh
@@ -35,7 +35,7 @@ fi
 
 
 MODE=projdoc
-GENERATED_PATH="${PROJECT_ROOT_PATH}/antora/components/system/modules/generated"
+GENERATED_PATH="${PROJECT_ROOT_PATH}/antora/components/refguide"
 
 ##
 ## run java
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
index 3ef42f4..7cb3bb4 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
@@ -127,13 +127,29 @@ final class ProjectDocWriter {
             final @NonNull CliConfig.Commands.Index index
             ) {
 
-        val indexFolder = index.getDocumentIndexFolder(global.getOutputRootFolder());
+        // eg: was: antora/components/system/modules/generated
+        // eg: now: antora/components/refguide
+        final File outputRootFolder = global.getOutputRootFolder();
+        val indexFolder = index.getDocumentIndexFolder(outputRootFolder);
 
         val destFolderBuilder = _Refs.<File>objectRef(indexFolder);
 
+        // eg org/apache/isis/applib/annotation
         unit.getNamespace().stream()
+        // eg applib/annotation
         .skip(global.getNamespacePartsSkipCount())
-        .forEach(subDir->destFolderBuilder.update(currentDir->new File(currentDir, subDir)));
+        .peek(subDir-> {
+            // applib
+            // ... so updates to antora/components/refguide/modules/applib
+            destFolderBuilder.update(currentDir -> new File(currentDir, "modules"));
+            destFolderBuilder.update(currentDir -> new File(currentDir, subDir));
+        })
+        // annotation
+        .skip(1)
+        .forEach(subDir-> {
+            // annotation
+            destFolderBuilder.update(currentDir -> new File(currentDir, subDir));
+        });
 
         val destFolder = destFolderBuilder.getValueElseDefault(indexFolder);
         destFolder.mkdirs();
diff --git a/tooling/cli/src/test/java/org/apache/isis/tooling/cli/test/adocfix/IncludeStatementFixerTest.java b/tooling/cli/src/test/java/org/apache/isis/tooling/cli/test/adocfix/IncludeStatementFixerTest.java
index 33935ae..31f0753 100644
--- a/tooling/cli/src/test/java/org/apache/isis/tooling/cli/test/adocfix/IncludeStatementFixerTest.java
+++ b/tooling/cli/src/test/java/org/apache/isis/tooling/cli/test/adocfix/IncludeStatementFixerTest.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Consumer;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.apache.isis.commons.collections.Can;
@@ -35,28 +36,28 @@ import lombok.val;
 
 class IncludeStatementFixerTest {
 
-    @Test// @Disabled
+    @Test @Disabled("to reinstate after changing to refguide format")
     void adocDocMining() throws IOException {
-        
+
         val adocFiles = ProjectSampler.adocFiles(ProjectSampler.apacheIsisRoot());
-     
+
         val names = _Sets.<String>newTreeSet();
-        
+
         Can.ofCollection(adocFiles)
         .stream()
         .filter(source->
             !source.toString().contains("\\system\\generated\\")
             && !source.toString().contains("/system/generated/"))
-        
+
         //.filter(source->source.toString().contains("XmlSnapshotService"))
         .forEach(file->parseAdoc(file, names::add));
-        
+
         names.forEach(System.out::println);
     }
-    
+
     private void parseAdoc(final @NonNull File file, Consumer<String> onName) {
         val lines = _Text.readLinesFromFile(file, StandardCharsets.UTF_8);
-        
+
         IncludeStatements.find(lines)
         .filter(include->!include.isLocal()
                 && "system".equals(include.getComponent())
@@ -65,5 +66,5 @@ class IncludeStatementFixerTest {
             onName.accept(include.toString());
         });
     }
-    
+
 }


[isis] 03/05: ISIS-2444: manually moves generated index files to their new locations

Posted by da...@apache.org.
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 f808dd4729a023d68c2273a52e3c0f04e9ff4561
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 22 07:13:21 2021 +0000

    ISIS-2444: manually moves generated index files to their new locations
---
 antora/components/{system => refguide}/antora.yml                         | 0
 .../applib => refguide/modules/applib/pages/index}/AbstractViewModel.adoc | 0
 .../index/applib => refguide/modules/applib/pages/index}/Identifier.adoc  | 0
 .../applib => refguide/modules/applib/pages/index}/IsisModuleApplib.adoc  | 0
 .../modules/applib/pages/index}/RecreatableDomainObject.adoc              | 0
 .../index/applib => refguide/modules/applib/pages/index}/ViewModel.adoc   | 0
 .../applib/pages/index}/adapters/AbstractValueSemanticsProvider.adoc      | 0
 .../modules/applib/pages/index}/adapters/DefaultsProvider.adoc            | 0
 .../modules/applib/pages/index}/adapters/EncoderDecoder.adoc              | 0
 .../modules/applib/pages/index}/adapters/EncodingException.adoc           | 0
 .../applib => refguide/modules/applib/pages/index}/adapters/Parser.adoc   | 0
 .../modules/applib/pages/index}/adapters/ParsingException.adoc            | 0
 .../modules/applib/pages/index}/adapters/ValueSemanticsProvider.adoc      | 0
 .../applib => refguide/modules/applib/pages/index}/annotation/Action.adoc | 0
 .../modules/applib/pages/index}/annotation/ActionLayout.adoc              | 0
 .../modules/applib/pages/index}/annotation/BookmarkPolicy.adoc            | 0
 .../modules/applib/pages/index}/annotation/Bounding.adoc                  | 0
 .../modules/applib/pages/index}/annotation/Collection.adoc                | 0
 .../modules/applib/pages/index}/annotation/CollectionLayout.adoc          | 0
 .../modules/applib/pages/index}/annotation/Defaulted.adoc                 | 0
 .../modules/applib/pages/index}/annotation/DomainObject.adoc              | 0
 .../modules/applib/pages/index}/annotation/DomainObjectLayout.adoc        | 0
 .../modules/applib/pages/index}/annotation/DomainService.adoc             | 0
 .../modules/applib/pages/index}/annotation/DomainServiceLayout.adoc       | 0
 .../applib/pages/index}/annotation/DomainServiceLayout~MenuBar.adoc       | 0
 .../modules/applib/pages/index}/annotation/Editing.adoc                   | 0
 .../modules/applib/pages/index}/annotation/EntityChangeKind.adoc          | 0
 .../modules/applib/pages/index}/annotation/EqualByContent.adoc            | 0
 .../applib => refguide/modules/applib/pages/index}/annotation/Facets.adoc | 0
 .../modules/applib/pages/index}/annotation/HomePage.adoc                  | 0
 .../modules/applib/pages/index}/annotation/InteractionScope.adoc          | 0
 .../modules/applib/pages/index}/annotation/LabelPosition.adoc             | 0
 .../modules/applib/pages/index}/annotation/MemberOrder.adoc               | 0
 .../modules/applib/pages/index}/annotation/MinLength.adoc                 | 0
 .../applib => refguide/modules/applib/pages/index}/annotation/Module.adoc | 0
 .../applib => refguide/modules/applib/pages/index}/annotation/Nature.adoc | 0
 .../modules/applib/pages/index}/annotation/NatureOfService.adoc           | 0
 .../modules/applib/pages/index}/annotation/Navigable.adoc                 | 0
 .../modules/applib/pages/index}/annotation/Optionality.adoc               | 0
 .../modules/applib/pages/index}/annotation/OrderPrecedence.adoc           | 0
 .../modules/applib/pages/index}/annotation/Parameter.adoc                 | 0
 .../modules/applib/pages/index}/annotation/ParameterLayout.adoc           | 0
 .../modules/applib/pages/index}/annotation/Programmatic.adoc              | 0
 .../modules/applib/pages/index}/annotation/Projecting.adoc                | 0
 .../modules/applib/pages/index}/annotation/PromptStyle.adoc               | 0
 .../modules/applib/pages/index}/annotation/Property.adoc                  | 0
 .../modules/applib/pages/index}/annotation/PropertyLayout.adoc            | 0
 .../modules/applib/pages/index}/annotation/Publishing.adoc                | 0
 .../modules/applib/pages/index}/annotation/Redirect.adoc                  | 0
 .../modules/applib/pages/index}/annotation/RenderDay.adoc                 | 0
 .../modules/applib/pages/index}/annotation/Repainting.adoc                | 0
 .../modules/applib/pages/index}/annotation/RestrictTo.adoc                | 0
 .../modules/applib/pages/index}/annotation/SemanticsOf.adoc               | 0
 .../modules/applib/pages/index}/annotation/Snapshot.adoc                  | 0
 .../applib => refguide/modules/applib/pages/index}/annotation/Title.adoc  | 0
 .../applib => refguide/modules/applib/pages/index}/annotation/Value.adoc  | 0
 .../applib => refguide/modules/applib/pages/index}/annotation/Where.adoc  | 0
 .../index}/annotation/hooks/ActionLayout_010-examples-and-usage.adoc      | 0
 .../pages/index}/annotation/hooks/ActionLayout_011-bookmarking.adoc       | 0
 .../applib/pages/index}/annotation/hooks/ActionLayout_012-cssClass.adoc   | 0
 .../applib/pages/index}/annotation/hooks/ActionLayout_013-cssClassFa.adoc | 0
 .../pages/index}/annotation/hooks/ActionLayout_014-describedAs.adoc       | 0
 .../applib/pages/index}/annotation/hooks/ActionLayout_015-hidden.adoc     | 0
 .../applib/pages/index}/annotation/hooks/ActionLayout_016-named.adoc      | 0
 .../applib/pages/index}/annotation/hooks/ActionLayout_017-position.adoc   | 0
 .../pages/index}/annotation/hooks/ActionLayout_018-promptStyle.adoc       | 0
 .../applib/pages/index}/annotation/hooks/ActionLayout_019-redirect.adoc   | 0
 .../pages/index}/annotation/hooks/Action_010-examples-and-usage.adoc      | 0
 .../index}/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc  | 0
 .../pages/index}/annotation/hooks/CollectionLayout_011-cssClass.adoc      | 0
 .../pages/index}/annotation/hooks/CollectionLayout_012-defaultView.adoc   | 0
 .../pages/index}/annotation/hooks/CollectionLayout_013-describedAs.adoc   | 0
 .../applib/pages/index}/annotation/hooks/CollectionLayout_014-hidden.adoc | 0
 .../applib/pages/index}/annotation/hooks/CollectionLayout_015-named.adoc  | 0
 .../applib/pages/index}/annotation/hooks/CollectionLayout_016-paged.adoc  | 0
 .../pages/index}/annotation/hooks/CollectionLayout_017-sortedBy.adoc      | 0
 .../pages/index}/annotation/hooks/Collection_010-examples-and-usage.adoc  | 0
 .../applib/pages/index}/annotation/hooks/Collection_011_domainEvent.adoc  | 0
 .../applib/pages/index}/annotation/hooks/Collection_012_hidden.adoc       | 0
 .../applib/pages/index}/annotation/hooks/Collection_013_typeOf.adoc       | 0
 .../annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc       | 0
 .../index}/annotation/hooks/DomainObject_010-examples-and-usage.adoc      | 0
 .../pages/index}/annotation/hooks/DomainObject_011-domain-events.adoc     | 0
 .../pages/index}/annotation/hooks/DomainObject_012-_lifecycle-events.adoc | 0
 .../index}/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc  | 0
 .../applib/pages/index}/annotation/hooks/DomainObject_014-bounding.adoc   | 0
 .../applib/pages/index}/annotation/hooks/DomainObject_015-editing.adoc    | 0
 .../index}/annotation/hooks/DomainObject_016-entityChangePublishing.adoc  | 0
 .../pages/index}/annotation/hooks/DomainObject_017-mixinMethod.adoc       | 0
 .../applib/pages/index}/annotation/hooks/DomainObject_018-nature.adoc     | 0
 .../applib/pages/index}/annotation/hooks/DomainObject_019-objectType.adoc | 0
 .../applib/pages/index}/annotation/hooks/DomainObject_030-see-also.adoc   | 0
 .../annotation/hooks/DomainServiceLayout_010-examples-and-usage.adoc      | 0
 .../index}/annotation/hooks/DomainService_010-examples-and-usage.adoc     | 0
 .../pages/index}/annotation/hooks/Facets_010-examples-and-usage.adoc      | 0
 .../pages/index}/annotation/hooks/HomePage_010-examples-and-usage.adoc    | 0
 .../index}/annotation/hooks/InteractionScope_010-examples-and-usage.adoc  | 0
 .../pages/index}/annotation/hooks/MemberOrder_010-examples-and-usage.adoc | 0
 .../pages/index}/annotation/hooks/MinLength_010-examples-and-usage.adoc   | 0
 .../index}/annotation/hooks/ParameterLayout_010-examples-and-usage.adoc   | 0
 .../pages/index}/annotation/hooks/Parameter_010-examples-and-usage.adoc   | 0
 .../index}/annotation/hooks/Programmatic_010-examples-and-usage.adoc      | 0
 .../index}/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc    | 0
 .../pages/index}/annotation/hooks/Property_010-examples-and-usage.adoc    | 0
 .../pages/index}/annotation/hooks/Title_010-examples-and-usage.adoc       | 0
 .../applib/pages/index}/client/RepresentationTypeSimplifiedV2.adoc        | 0
 .../modules/applib/pages/index}/client/SuppressionType.adoc               | 0
 .../modules/applib/pages/index}/clock/VirtualClock.adoc                   | 0
 .../modules/applib/pages/index}/domain/DomainObjectList.adoc              | 0
 .../modules/applib/pages/index}/events/EventObjectBase.adoc               | 0
 .../modules/applib/pages/index}/events/domain/AbstractDomainEvent.adoc    | 0
 .../modules/applib/pages/index}/events/domain/ActionDomainEvent.adoc      | 0
 .../modules/applib/pages/index}/events/domain/CollectionDomainEvent.adoc  | 0
 .../modules/applib/pages/index}/events/domain/PropertyDomainEvent.adoc    | 0
 .../applib/pages/index}/events/lifecycle/AbstractLifecycleEvent.adoc      | 0
 .../modules/applib/pages/index}/events/lifecycle/ObjectCreatedEvent.adoc  | 0
 .../modules/applib/pages/index}/events/lifecycle/ObjectLoadedEvent.adoc   | 0
 .../applib/pages/index}/events/lifecycle/ObjectPersistedEvent.adoc        | 0
 .../applib/pages/index}/events/lifecycle/ObjectPersistingEvent.adoc       | 0
 .../modules/applib/pages/index}/events/lifecycle/ObjectRemovingEvent.adoc | 0
 .../modules/applib/pages/index}/events/lifecycle/ObjectUpdatedEvent.adoc  | 0
 .../modules/applib/pages/index}/events/lifecycle/ObjectUpdatingEvent.adoc | 0
 .../modules/applib/pages/index}/events/ui/AbstractUiEvent.adoc            | 0
 .../modules/applib/pages/index}/events/ui/CssClassUiEvent.adoc            | 0
 .../modules/applib/pages/index}/events/ui/IconUiEvent.adoc                | 0
 .../modules/applib/pages/index}/events/ui/LayoutUiEvent.adoc              | 0
 .../modules/applib/pages/index}/events/ui/TitleUiEvent.adoc               | 0
 .../modules/applib/pages/index}/exceptions/RecoverableException.adoc      | 0
 .../modules/applib/pages/index}/exceptions/TranslatableException.adoc     | 0
 .../modules/applib/pages/index}/exceptions/UnrecoverableException.adoc    | 0
 .../pages/index}/exceptions/unrecoverable/DomainModelException.adoc       | 0
 .../applib/pages/index}/exceptions/unrecoverable/MetaModelException.adoc  | 0
 .../pages/index}/exceptions/unrecoverable/NoAuthenticatorException.adoc   | 0
 .../pages/index}/exceptions/unrecoverable/ObjectNotFoundException.adoc    | 0
 .../pages/index}/exceptions/unrecoverable/ObjectPersistenceException.adoc | 0
 .../pages/index}/exceptions/unrecoverable/PersistFailedException.adoc     | 0
 .../pages/index}/exceptions/unrecoverable/ReflectiveActionException.adoc  | 0
 .../applib/pages/index}/exceptions/unrecoverable/RepositoryException.adoc | 0
 .../pages/index}/exceptions/unrecoverable/UnexpectedCallException.adoc    | 0
 .../pages/index}/exceptions/unrecoverable/UnknownTypeException.adoc       | 0
 .../index/applib => refguide/modules/applib/pages/index}/graph/Edge.adoc  | 0
 .../applib => refguide/modules/applib/pages/index}/graph/SimpleEdge.adoc  | 0
 .../applib => refguide/modules/applib/pages/index}/graph/Vertex.adoc      | 0
 .../modules/applib/pages/index}/graph/tree/LazyTreeNode.adoc              | 0
 .../modules/applib/pages/index}/graph/tree/TreeAdapter.adoc               | 0
 .../modules/applib/pages/index}/graph/tree/TreeNode.adoc                  | 0
 .../modules/applib/pages/index}/graph/tree/TreePath.adoc                  | 0
 .../modules/applib/pages/index}/graph/tree/TreeState.adoc                 | 0
 .../modules/applib/pages/index}/jaxb/DataTypeFactory.adoc                 | 0
 .../modules/applib/pages/index}/jaxb/JavaSqlJaxbAdapters.adoc             | 0
 .../applib/pages/index}/jaxb/JavaSqlXMLGregorianCalendarMarshalling.adoc  | 0
 .../modules/applib/pages/index}/jaxb/JavaTimeJaxbAdapters.adoc            | 0
 .../applib/pages/index}/jaxb/JavaTimeXMLGregorianCalendarMarshalling.adoc | 0
 .../modules/applib/pages/index}/jaxb/JavaUtilJaxbAdapters.adoc            | 0
 .../modules/applib/pages/index}/jaxb/JodaTimeJaxbAdapters.adoc            | 0
 .../applib/pages/index}/jaxb/JodaTimeXMLGregorianCalendarMarshalling.adoc | 0
 .../modules/applib/pages/index}/jaxb/PersistentEntitiesAdapter.adoc       | 0
 .../modules/applib/pages/index}/jaxb/PersistentEntityAdapter.adoc         | 0
 .../modules/applib/pages/index}/jaxb/PrimitiveJaxbAdapters.adoc           | 0
 .../modules/applib/pages/index}/layout/component/ActionLayoutData.adoc    | 0
 .../applib/pages/index}/layout/component/ActionLayoutDataOwner.adoc       | 0
 .../applib/pages/index}/layout/component/CollectionLayoutData.adoc        | 0
 .../applib/pages/index}/layout/component/CollectionLayoutDataOwner.adoc   | 0
 .../modules/applib/pages/index}/layout/component/CssClassFaPosition.adoc  | 0
 .../applib/pages/index}/layout/component/DomainObjectLayoutData.adoc      | 0
 .../applib/pages/index}/layout/component/DomainObjectLayoutDataOwner.adoc | 0
 .../modules/applib/pages/index}/layout/component/FieldSet.adoc            | 0
 .../modules/applib/pages/index}/layout/component/FieldSetOwner.adoc       | 0
 .../modules/applib/pages/index}/layout/component/HasBookmarking.adoc      | 0
 .../modules/applib/pages/index}/layout/component/HasCssClass.adoc         | 0
 .../modules/applib/pages/index}/layout/component/HasCssClassFa.adoc       | 0
 .../modules/applib/pages/index}/layout/component/HasDescribedAs.adoc      | 0
 .../modules/applib/pages/index}/layout/component/HasHidden.adoc           | 0
 .../modules/applib/pages/index}/layout/component/HasNamed.adoc            | 0
 .../modules/applib/pages/index}/layout/component/MemberRegion.adoc        | 0
 .../modules/applib/pages/index}/layout/component/MemberRegionOwner.adoc   | 0
 .../modules/applib/pages/index}/layout/component/Owned.adoc               | 0
 .../modules/applib/pages/index}/layout/component/Owner.adoc               | 0
 .../modules/applib/pages/index}/layout/component/PropertyLayoutData.adoc  | 0
 .../applib/pages/index}/layout/component/ServiceActionLayoutData.adoc     | 0
 .../pages/index}/layout/component/ServiceActionLayoutDataOwner.adoc       | 0
 .../applib => refguide/modules/applib/pages/index}/layout/grid/Grid.adoc  | 0
 .../modules/applib/pages/index}/layout/grid/GridAbstract.adoc             | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3ClearFix.adoc   | 0
 .../applib/pages/index}/layout/grid/bootstrap3/BS3ClearFixHidden.adoc     | 0
 .../applib/pages/index}/layout/grid/bootstrap3/BS3ClearFixVisible.adoc    | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3Col.adoc        | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3Element.adoc    | 0
 .../applib/pages/index}/layout/grid/bootstrap3/BS3ElementAbstract.adoc    | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3Grid.adoc       | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3Row.adoc        | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3RowContent.adoc | 0
 .../applib/pages/index}/layout/grid/bootstrap3/BS3RowContentOwner.adoc    | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3RowOwner.adoc   | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3Tab.adoc        | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3TabGroup.adoc   | 0
 .../applib/pages/index}/layout/grid/bootstrap3/BS3TabGroupOwner.adoc      | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/BS3TabOwner.adoc   | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/HasCssId.adoc      | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/Size.adoc          | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/SizeSpan.adoc      | 0
 .../modules/applib/pages/index}/layout/grid/bootstrap3/WithinGrid.adoc    | 0
 .../applib => refguide/modules/applib/pages/index}/layout/links/Link.adoc | 0
 .../modules/applib/pages/index}/layout/menubars/HasNamed.adoc             | 0
 .../modules/applib/pages/index}/layout/menubars/Menu.adoc                 | 0
 .../modules/applib/pages/index}/layout/menubars/MenuBar.adoc              | 0
 .../modules/applib/pages/index}/layout/menubars/MenuBars.adoc             | 0
 .../modules/applib/pages/index}/layout/menubars/MenuBarsAbstract.adoc     | 0
 .../modules/applib/pages/index}/layout/menubars/MenuSection.adoc          | 0
 .../modules/applib/pages/index}/layout/menubars/bootstrap3/BS3Menu.adoc   | 0
 .../applib/pages/index}/layout/menubars/bootstrap3/BS3MenuBar.adoc        | 0
 .../applib/pages/index}/layout/menubars/bootstrap3/BS3MenuBars.adoc       | 0
 .../applib/pages/index}/layout/menubars/bootstrap3/BS3MenuSection.adoc    | 0
 .../modules/applib/pages/index}/mixins/MixinConstants.adoc                | 0
 .../applib => refguide/modules/applib/pages/index}/mixins/dto/Dto.adoc    | 0
 .../modules/applib/pages/index}/mixins/dto/Dto_downloadXml.adoc           | 0
 .../modules/applib/pages/index}/mixins/dto/Dto_downloadXsd.adoc           | 0
 .../applib/pages/index}/mixins/layout/Object_downloadLayoutXml.adoc       | 0
 .../modules/applib/pages/index}/mixins/layout/Object_openRestApi.adoc     | 0
 .../applib/pages/index}/mixins/layout/Object_rebuildMetamodel.adoc        | 0
 .../applib/pages/index}/mixins/metamodel/Object_downloadMetamodelXml.adoc | 0
 .../applib/pages/index}/mixins/metamodel/Object_objectIdentifier.adoc     | 0
 .../modules/applib/pages/index}/mixins/metamodel/Object_objectType.adoc   | 0
 .../modules/applib/pages/index}/query/AllInstancesQuery.adoc              | 0
 .../applib => refguide/modules/applib/pages/index}/query/NamedQuery.adoc  | 0
 .../index/applib => refguide/modules/applib/pages/index}/query/Query.adoc | 0
 .../applib => refguide/modules/applib/pages/index}/query/QueryRange.adoc  | 0
 .../modules/applib/pages/index}/services/DomainChangeRecord.adoc          | 0
 .../modules/applib/pages/index}/services/MethodReferences.adoc            | 0
 .../pages/index}/services/RepresentsInteractionMemberExecution.adoc       | 0
 .../applib/pages/index}/services/acceptheader/AcceptHeaderService.adoc    | 0
 .../acceptheader/hooks/AcceptHeaderService_010-implementation.adoc        | 0
 .../acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc    | 0
 .../pages/index}/services/appfeat/ApplicationFeatureRepository.adoc       | 0
 .../applib/pages/index}/services/appfeat/ApplicationMemberType.adoc       | 0
 .../appfeat/hooks/ApplicationFeatureRepository_010-implementation.adoc    | 0
 .../hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc        | 0
 .../modules/applib/pages/index}/services/bookmark/Bookmark.adoc           | 0
 .../modules/applib/pages/index}/services/bookmark/BookmarkHolder.adoc     | 0
 .../applib/pages/index}/services/bookmark/BookmarkHolder_lookup.adoc      | 0
 .../applib/pages/index}/services/bookmark/BookmarkHolder_object.adoc      | 0
 .../modules/applib/pages/index}/services/bookmark/BookmarkService.adoc    | 0
 .../services/bookmark/hooks/BookmarkService_010-implementation.adoc       | 0
 .../services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc   | 0
 .../applib/pages/index}/services/bookmarkui/BookmarkUiService.adoc        | 0
 .../services/bookmarkui/hooks/BookmarkUiService_010-implementation.adoc   | 0
 .../bookmarkui/hooks/BookmarkUiService_020-examples-and-usage.adoc        | 0
 .../modules/applib/pages/index}/services/clock/ClockService.adoc          | 0
 .../index}/services/clock/hooks/ClockService_010-implementation.adoc      | 0
 .../index}/services/clock/hooks/ClockService_020-examples-and-usage.adoc  | 0
 .../modules/applib/pages/index}/services/command/Command.adoc             | 0
 .../applib/pages/index}/services/command/CommandExecutorService.adoc      | 0
 .../applib/pages/index}/services/command/CommandOutcomeHandler.adoc       | 0
 .../services/command/hooks/CommandExecutorService_010-implementation.adoc | 0
 .../command/hooks/CommandExecutorService_020-examples-and-usage.adoc      | 0
 .../modules/applib/pages/index}/services/commanddto/HasCommandDto.adoc    | 0
 .../services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc    | 0
 .../services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc   | 0
 .../applib/pages/index}/services/commanddto/conmap/UserDataKeys.adoc      | 0
 .../pages/index}/services/commanddto/processor/CommandDtoProcessor.adoc   | 0
 .../commanddto/processor/CommandDtoProcessorForActionAbstract.adoc        | 0
 .../commanddto/processor/CommandDtoProcessorForPropertyAbstract.adoc      | 0
 .../processor/hooks/CommandDtoProcessorService_010-implementation.adoc    | 0
 .../hooks/CommandDtoProcessorService_020-examples-and-usage.adoc          | 0
 .../services/commanddto/processor/spi/CommandDtoProcessorService.adoc     | 0
 .../commanddto/processor/spi/CommandDtoProcessorServiceIdentity.adoc      | 0
 .../modules/applib/pages/index}/services/confview/ConfigurationMenu.adoc  | 0
 .../applib/pages/index}/services/confview/ConfigurationProperty.adoc      | 0
 .../applib/pages/index}/services/confview/ConfigurationViewService.adoc   | 0
 .../services/confview/hooks/ConfigurationMenu_010-implementation.adoc     | 0
 .../services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc | 0
 .../confview/hooks/ConfigurationViewService_010-implementation.adoc       | 0
 .../confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc   | 0
 .../applib/pages/index}/services/conmap/ContentMappingService.adoc        | 0
 .../services/conmap/hooks/ContentMappingService_010-implementation.adoc   | 0
 .../conmap/hooks/ContentMappingService_020-examples-and-usage.adoc        | 0
 .../modules/applib/pages/index}/services/email/EmailService.adoc          | 0
 .../index}/services/email/hooks/EmailService_010-implementation.adoc      | 0
 .../index}/services/email/hooks/EmailService_020-examples-and-usage.adoc  | 0
 .../modules/applib/pages/index}/services/error/ErrorDetails.adoc          | 0
 .../modules/applib/pages/index}/services/error/ErrorReportingService.adoc | 0
 .../modules/applib/pages/index}/services/error/SimpleTicket.adoc          | 0
 .../modules/applib/pages/index}/services/error/Ticket.adoc                | 0
 .../services/error/hooks/ErrorReportingService_010-implementation.adoc    | 0
 .../error/hooks/ErrorReportingService_020-examples-and-usage.adoc         | 0
 .../modules/applib/pages/index}/services/eventbus/EventBusService.adoc    | 0
 .../services/eventbus/hooks/EventBusService_010-implementation.adoc       | 0
 .../services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc   | 0
 .../modules/applib/pages/index}/services/exceprecog/Category.adoc         | 0
 .../applib/pages/index}/services/exceprecog/ExceptionRecognizer.adoc      | 0
 .../pages/index}/services/exceprecog/ExceptionRecognizerAbstract.adoc     | 0
 .../pages/index}/services/exceprecog/ExceptionRecognizerForType.adoc      | 0
 .../pages/index}/services/exceprecog/ExceptionRecognizerService.adoc      | 0
 .../modules/applib/pages/index}/services/exceprecog/Recognition.adoc      | 0
 .../exceprecog/hooks/ExceptionRecognizerService_010-implementation.adoc   | 0
 .../hooks/ExceptionRecognizerService_020-examples-and-usage.adoc          | 0
 .../services/exceprecog/hooks/ExceptionRecognizer_010-implementation.adoc | 0
 .../exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc      | 0
 .../modules/applib/pages/index}/services/factory/FactoryService.adoc      | 0
 .../index}/services/factory/hooks/FactoryService_010-implementation.adoc  | 0
 .../services/factory/hooks/FactoryService_020-examples-and-usage.adoc     | 0
 .../modules/applib/pages/index}/services/grid/GridLoaderService.adoc      | 0
 .../modules/applib/pages/index}/services/grid/GridService.adoc            | 0
 .../modules/applib/pages/index}/services/grid/GridSystemService.adoc      | 0
 .../index}/services/grid/hooks/GridLoaderService_010-implementation.adoc  | 0
 .../services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc     | 0
 .../pages/index}/services/grid/hooks/GridService_010-implementation.adoc  | 0
 .../index}/services/grid/hooks/GridService_020-examples-and-usage.adoc    | 0
 .../index}/services/grid/hooks/GridSystemService_010-implementation.adoc  | 0
 .../services/grid/hooks/GridSystemService_020-examples-and-usage.adoc     | 0
 .../modules/applib/pages/index}/services/health/Health.adoc               | 0
 .../modules/applib/pages/index}/services/health/HealthCheckService.adoc   | 0
 .../services/health/hooks/HealthCheckService_010-implementation.adoc      | 0
 .../services/health/hooks/HealthCheckService_020-examples-and-usage.adoc  | 0
 .../modules/applib/pages/index}/services/hint/HintIdProvider.adoc         | 0
 .../modules/applib/pages/index}/services/hint/HintStore.adoc              | 0
 .../index}/services/hint/hooks/HintIdProvider_010-implementation.adoc     | 0
 .../index}/services/hint/hooks/HintIdProvider_020-examples-and-usage.adoc | 0
 .../pages/index}/services/hint/hooks/HintStore_010-implementation.adoc    | 0
 .../index}/services/hint/hooks/HintStore_020-examples-and-usage.adoc      | 0
 .../applib/pages/index}/services/homepage/HomePageResolverService.adoc    | 0
 .../homepage/hooks/HomePageResolverService_010-implementation.adoc        | 0
 .../homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc    | 0
 .../modules/applib/pages/index}/services/i18n/LocaleProvider.adoc         | 0
 .../modules/applib/pages/index}/services/i18n/Mode.adoc                   | 0
 .../modules/applib/pages/index}/services/i18n/TranslatableString.adoc     | 0
 .../modules/applib/pages/index}/services/i18n/TranslationService.adoc     | 0
 .../modules/applib/pages/index}/services/i18n/TranslationsResolver.adoc   | 0
 .../index}/services/i18n/hooks/LocaleProvider_010-implementation.adoc     | 0
 .../index}/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc | 0
 .../index}/services/i18n/hooks/TranslationService_010-implementation.adoc | 0
 .../services/i18n/hooks/TranslationService_020-examples-and-usage.adoc    | 0
 .../services/i18n/hooks/TranslationsResolver_010-implementation.adoc      | 0
 .../services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc  | 0
 .../modules/applib/pages/index}/services/iactn/ActionInvocation.adoc      | 0
 .../modules/applib/pages/index}/services/iactn/Execution.adoc             | 0
 .../modules/applib/pages/index}/services/iactn/ExecutionContext.adoc      | 0
 .../modules/applib/pages/index}/services/iactn/Interaction.adoc           | 0
 .../modules/applib/pages/index}/services/iactn/InteractionContext.adoc    | 0
 .../modules/applib/pages/index}/services/iactn/PropertyEdit.adoc          | 0
 .../modules/applib/pages/index}/services/iactn/Sequence.adoc              | 0
 .../pages/index}/services/iactn/hooks/Execution_010-implementation.adoc   | 0
 .../index}/services/iactn/hooks/Execution_020-examples-and-usage.adoc     | 0
 .../services/iactn/hooks/InteractionContext_010-implementation.adoc       | 0
 .../services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc   | 0
 .../pages/index}/services/iactn/hooks/Interaction_010-implementation.adoc | 0
 .../index}/services/iactn/hooks/Interaction_020-examples-and-usage.adoc   | 0
 .../modules/applib/pages/index}/services/inject/ServiceInjector.adoc      | 0
 .../index}/services/inject/hooks/ServiceInjector_010-implementation.adoc  | 0
 .../services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc     | 0
 .../modules/applib/pages/index}/services/jaxb/JaxbService.adoc            | 0
 .../pages/index}/services/jaxb/hooks/JaxbService_010-implementation.adoc  | 0
 .../index}/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc    | 0
 .../modules/applib/pages/index}/services/layout/LayoutService.adoc        | 0
 .../modules/applib/pages/index}/services/layout/LayoutServiceMenu.adoc    | 0
 .../modules/applib/pages/index}/services/layout/Style.adoc                | 0
 .../services/layout/hooks/LayoutServiceMenu_010-implementation.adoc       | 0
 .../services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc   | 0
 .../index}/services/layout/hooks/LayoutService_010-implementation.adoc    | 0
 .../services/layout/hooks/LayoutService_020-examples-and-usage.adoc       | 0
 .../modules/applib/pages/index}/services/linking/DeepLinkService.adoc     | 0
 .../index}/services/linking/hooks/DeepLinkService_010-implementation.adoc | 0
 .../services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc    | 0
 .../modules/applib/pages/index}/services/menu/MenuBarsLoaderService.adoc  | 0
 .../modules/applib/pages/index}/services/menu/MenuBarsService.adoc        | 0
 .../services/menu/hooks/MenuBarsLoaderService_010-implementation.adoc     | 0
 .../services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc | 0
 .../index}/services/menu/hooks/MenuBarsService_010-implementation.adoc    | 0
 .../services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc       | 0
 .../modules/applib/pages/index}/services/message/MessageService.adoc      | 0
 .../index}/services/message/hooks/MessageService_010-implementation.adoc  | 0
 .../services/message/hooks/MessageService_020-examples-and-usage.adoc     | 0
 .../modules/applib/pages/index}/services/metamodel/BeanSort.adoc          | 0
 .../modules/applib/pages/index}/services/metamodel/Config.adoc            | 0
 .../modules/applib/pages/index}/services/metamodel/DomainMember.adoc      | 0
 .../modules/applib/pages/index}/services/metamodel/DomainModel.adoc       | 0
 .../modules/applib/pages/index}/services/metamodel/MetaModelService.adoc  | 0
 .../applib/pages/index}/services/metamodel/MetaModelServiceMenu.adoc      | 0
 .../services/metamodel/hooks/MetaModelServiceMenu_010-implementation.adoc | 0
 .../metamodel/hooks/MetaModelServiceMenu_020-examples-and-usage.adoc      | 0
 .../services/metamodel/hooks/MetaModelService_010-implementation.adoc     | 0
 .../services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc | 0
 .../modules/applib/pages/index}/services/metrics/MetricsService.adoc      | 0
 .../index}/services/metrics/hooks/MetricsService_010-implementation.adoc  | 0
 .../services/metrics/hooks/MetricsService_020-examples-and-usage.adoc     | 0
 .../applib/pages/index}/services/publishing/log/CommandLogger.adoc        | 0
 .../applib/pages/index}/services/publishing/log/EntityChangesLogger.adoc  | 0
 .../pages/index}/services/publishing/log/EntityPropertyChangeLogger.adoc  | 0
 .../applib/pages/index}/services/publishing/log/ExecutionLogger.adoc      | 0
 .../applib/pages/index}/services/publishing/spi/CommandSubscriber.adoc    | 0
 .../applib/pages/index}/services/publishing/spi/EntityChanges.adoc        | 0
 .../pages/index}/services/publishing/spi/EntityChangesSubscriber.adoc     | 0
 .../applib/pages/index}/services/publishing/spi/EntityPropertyChange.adoc | 0
 .../index}/services/publishing/spi/EntityPropertyChangeSubscriber.adoc    | 0
 .../applib/pages/index}/services/publishing/spi/ExecutionSubscriber.adoc  | 0
 .../publishing/spi/hooks/CommandSubscriber_010-implementation.adoc        | 0
 .../publishing/spi/hooks/CommandSubscriber_020-examples-and-usage.adoc    | 0
 .../publishing/spi/hooks/EntityChangesSubscriber_010-implementation.adoc  | 0
 .../spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc         | 0
 .../spi/hooks/EntityPropertyChangeSubscriber_010-implementation.adoc      | 0
 .../spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc  | 0
 .../publishing/spi/hooks/ExecutionSubscriber_010-implementation.adoc      | 0
 .../publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc  | 0
 .../applib/pages/index}/services/queryresultscache/QueryResultsCache.adoc | 0
 .../pages/index}/services/queryresultscache/QueryResultsCacheControl.adoc | 0
 .../hooks/QueryResultsCacheControl_010-implementation.adoc                | 0
 .../hooks/QueryResultsCacheControl_020-examples-and-usage.adoc            | 0
 .../queryresultscache/hooks/QueryResultsCache_010-implementation.adoc     | 0
 .../queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc | 0
 .../pages/index}/services/registry/InstanceByPriorityComparator.adoc      | 0
 .../modules/applib/pages/index}/services/registry/ServiceRegistry.adoc    | 0
 .../services/registry/hooks/ServiceRegistry_010-implementation.adoc       | 0
 .../services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc   | 0
 .../modules/applib/pages/index}/services/repository/EntityState.adoc      | 0
 .../applib/pages/index}/services/repository/RepositoryService.adoc        | 0
 .../services/repository/hooks/RepositoryService_010-implementation.adoc   | 0
 .../repository/hooks/RepositoryService_020-examples-and-usage.adoc        | 0
 .../modules/applib/pages/index}/services/routing/RoutingService.adoc      | 0
 .../index}/services/routing/hooks/RoutingService_010-implementation.adoc  | 0
 .../services/routing/hooks/RoutingService_020-examples-and-usage.adoc     | 0
 .../modules/applib/pages/index}/services/scratchpad/Scratchpad.adoc       | 0
 .../index}/services/scratchpad/hooks/Scratchpad_010-implementation.adoc   | 0
 .../services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc      | 0
 .../applib/pages/index}/services/session/SessionLoggingService.adoc       | 0
 .../pages/index}/services/session/SessionLoggingServiceLogging.adoc       | 0
 .../services/session/hooks/SessionLoggingService_010-implementation.adoc  | 0
 .../session/hooks/SessionLoggingService_020-examples-and-usage.adoc       | 0
 .../modules/applib/pages/index}/services/sudo/SudoService.adoc            | 0
 .../services/sudo/hooks/SudoServiceListener_010-implementation.adoc       | 0
 .../services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc   | 0
 .../pages/index}/services/sudo/hooks/SudoService_010-implementation.adoc  | 0
 .../index}/services/sudo/hooks/SudoService_020-examples-and-usage.adoc    | 0
 .../modules/applib/pages/index}/services/swagger/Format.adoc              | 0
 .../modules/applib/pages/index}/services/swagger/SwaggerService.adoc      | 0
 .../modules/applib/pages/index}/services/swagger/Visibility.adoc          | 0
 .../index}/services/swagger/hooks/SwaggerService_010-implementation.adoc  | 0
 .../services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc     | 0
 .../services/tablecol/TableColumnOrderForCollectionTypeAbstract.adoc      | 0
 .../applib/pages/index}/services/tablecol/TableColumnOrderService.adoc    | 0
 .../tablecol/hooks/TableColumnOrderService_010-implementation.adoc        | 0
 .../tablecol/hooks/TableColumnOrderService_020-examples-and-usage.adoc    | 0
 .../modules/applib/pages/index}/services/title/TitleService.adoc          | 0
 .../index}/services/title/hooks/TitleService_010-implementation.adoc      | 0
 .../index}/services/title/hooks/TitleService_020-examples-and-usage.adoc  | 0
 .../applib/pages/index}/services/urlencoding/UrlEncodingService.adoc      | 0
 .../services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc | 0
 .../services/urlencoding/hooks/UrlEncodingService_010-implementation.adoc | 0
 .../urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc      | 0
 .../modules/applib/pages/index}/services/user/RoleMemento.adoc            | 0
 .../modules/applib/pages/index}/services/user/UserMemento.adoc            | 0
 .../modules/applib/pages/index}/services/user/UserService.adoc            | 0
 .../pages/index}/services/user/hooks/UserService_010-implementation.adoc  | 0
 .../index}/services/user/hooks/UserService_020-examples-and-usage.adoc    | 0
 .../modules/applib/pages/index}/services/userprof/UserProfileService.adoc | 0
 .../services/userprof/hooks/UserProfileService_010-implementation.adoc    | 0
 .../userprof/hooks/UserProfileService_020-examples-and-usage.adoc         | 0
 .../applib/pages/index}/services/userreg/EmailNotificationService.adoc    | 0
 .../modules/applib/pages/index}/services/userreg/UserDetails.adoc         | 0
 .../applib/pages/index}/services/userreg/UserRegistrationService.adoc     | 0
 .../applib/pages/index}/services/userreg/events/EmailEventAbstract.adoc   | 0
 .../pages/index}/services/userreg/events/EmailRegistrationEvent.adoc      | 0
 .../applib/pages/index}/services/userreg/events/PasswordResetEvent.adoc   | 0
 .../userreg/hooks/EmailNotificationService_010-implementation.adoc        | 0
 .../userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc    | 0
 .../userreg/hooks/UserRegistrationService_010-implementation.adoc         | 0
 .../userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc     | 0
 .../modules/applib/pages/index}/services/wrapper/DisabledException.adoc   | 0
 .../modules/applib/pages/index}/services/wrapper/HiddenException.adoc     | 0
 .../modules/applib/pages/index}/services/wrapper/InvalidException.adoc    | 0
 .../modules/applib/pages/index}/services/wrapper/WrapperFactory.adoc      | 0
 .../modules/applib/pages/index}/services/wrapper/WrappingObject.adoc      | 0
 .../applib/pages/index}/services/wrapper/control/AsyncControl.adoc        | 0
 .../applib/pages/index}/services/wrapper/control/ControlAbstract.adoc     | 0
 .../applib/pages/index}/services/wrapper/control/ExceptionHandler.adoc    | 0
 .../pages/index}/services/wrapper/control/ExceptionHandlerAbstract.adoc   | 0
 .../applib/pages/index}/services/wrapper/control/ExecutionMode.adoc       | 0
 .../modules/applib/pages/index}/services/wrapper/control/SyncControl.adoc | 0
 .../modules/applib/pages/index}/services/wrapper/events/AccessEvent.adoc  | 0
 .../applib/pages/index}/services/wrapper/events/ActionArgumentEvent.adoc  | 0
 .../pages/index}/services/wrapper/events/ActionInvocationEvent.adoc       | 0
 .../applib/pages/index}/services/wrapper/events/ActionUsabilityEvent.adoc | 0
 .../pages/index}/services/wrapper/events/ActionVisibilityEvent.adoc       | 0
 .../pages/index}/services/wrapper/events/CollectionAccessEvent.adoc       | 0
 .../applib/pages/index}/services/wrapper/events/CollectionAddToEvent.adoc | 0
 .../pages/index}/services/wrapper/events/CollectionMethodEvent.adoc       | 0
 .../pages/index}/services/wrapper/events/CollectionRemoveFromEvent.adoc   | 0
 .../pages/index}/services/wrapper/events/CollectionUsabilityEvent.adoc    | 0
 .../applib/pages/index}/services/wrapper/events/InteractionEvent.adoc     | 0
 .../applib/pages/index}/services/wrapper/events/ObjectTitleEvent.adoc     | 0
 .../applib/pages/index}/services/wrapper/events/ObjectValidityEvent.adoc  | 0
 .../pages/index}/services/wrapper/events/ObjectVisibilityEvent.adoc       | 0
 .../applib/pages/index}/services/wrapper/events/ParseValueEvent.adoc      | 0
 .../applib/pages/index}/services/wrapper/events/PropertyAccessEvent.adoc  | 0
 .../applib/pages/index}/services/wrapper/events/PropertyModifyEvent.adoc  | 0
 .../pages/index}/services/wrapper/events/PropertyUsabilityEvent.adoc      | 0
 .../pages/index}/services/wrapper/events/PropertyVisibilityEvent.adoc     | 0
 .../applib/pages/index}/services/wrapper/events/ProposedHolderEvent.adoc  | 0
 .../applib/pages/index}/services/wrapper/events/UsabilityEvent.adoc       | 0
 .../applib/pages/index}/services/wrapper/events/ValidityEvent.adoc        | 0
 .../applib/pages/index}/services/wrapper/events/VisibilityEvent.adoc      | 0
 .../index}/services/wrapper/hooks/WrapperFactory_010-implementation.adoc  | 0
 .../services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc     | 0
 .../pages/index}/services/wrapper/listeners/InteractionAdapter.adoc       | 0
 .../pages/index}/services/wrapper/listeners/InteractionListener.adoc      | 0
 .../modules/applib/pages/index}/services/xactn/TransactionId.adoc         | 0
 .../modules/applib/pages/index}/services/xactn/TransactionService.adoc    | 0
 .../modules/applib/pages/index}/services/xactn/TransactionState.adoc      | 0
 .../applib/pages/index}/services/xactn/TransactionalProcessor.adoc        | 0
 .../services/xactn/hooks/TransactionService_010-implementation.adoc       | 0
 .../services/xactn/hooks/TransactionService_020-examples-and-usage.adoc   | 0
 .../services/xactn/hooks/TransactionalProcessor_010-implementation.adoc   | 0
 .../xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc        | 0
 .../modules/applib/pages/index}/services/xml/XmlService.adoc              | 0
 .../pages/index}/services/xml/hooks/XmlService_010-implementation.adoc    | 0
 .../index}/services/xml/hooks/XmlService_020-examples-and-usage.adoc      | 0
 .../applib/pages/index}/services/xmlsnapshot/XmlSnapshotService.adoc      | 0
 .../pages/index}/services/xmlsnapshot/XmlSnapshotService~Snapshot.adoc    | 0
 .../index}/services/xmlsnapshot/XmlSnapshotService~Snapshot~Builder.adoc  | 0
 .../services/xmlsnapshot/hooks/XmlSnapshotService_010-implementation.adoc | 0
 .../xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc      | 0
 .../modules/applib/pages/index}/snapshot/SnapshottableWithInclusions.adoc | 0
 .../modules/applib/pages/index}/spec/AbstractSpecification.adoc           | 0
 .../modules/applib/pages/index}/spec/AbstractSpecification2.adoc          | 0
 .../modules/applib/pages/index}/spec/Specification.adoc                   | 0
 .../modules/applib/pages/index}/spec/Specification2.adoc                  | 0
 .../modules/applib/pages/index}/spec/SpecificationAnd.adoc                | 0
 .../modules/applib/pages/index}/spec/SpecificationNot.adoc                | 0
 .../modules/applib/pages/index}/spec/SpecificationOr.adoc                 | 0
 .../modules/applib/pages/index}/types/DescriptionType.adoc                | 0
 .../modules/applib/pages/index}/types/MemberIdentifierType.adoc           | 0
 .../modules/applib/pages/index}/types/TargetActionType.adoc               | 0
 .../modules/applib/pages/index}/types/TargetClassType.adoc                | 0
 .../index/applib => refguide/modules/applib/pages/index}/util/Enums.adoc  | 0
 .../applib => refguide/modules/applib/pages/index}/util/Equality.adoc     | 0
 .../applib => refguide/modules/applib/pages/index}/util/Hashing.adoc      | 0
 .../applib => refguide/modules/applib/pages/index}/util/JaxbUtil.adoc     | 0
 .../modules/applib/pages/index}/util/ObjectContracts.adoc                 | 0
 .../applib => refguide/modules/applib/pages/index}/util/ReasonBuffer.adoc | 0
 .../modules/applib/pages/index}/util/ReasonBuffer2.adoc                   | 0
 .../applib => refguide/modules/applib/pages/index}/util/Reasons.adoc      | 0
 .../applib => refguide/modules/applib/pages/index}/util/TitleBuffer.adoc  | 0
 .../modules/applib/pages/index}/util/TitleBufferException.adoc            | 0
 .../applib => refguide/modules/applib/pages/index}/util/ToString.adoc     | 0
 .../modules/applib/pages/index}/util/hooks/Enums_examples.adoc            | 0
 .../pages/index}/util/hooks/ObjectContracts_examples-and-usage.adoc       | 0
 .../modules/applib/pages/index}/util/schema/ChangesDtoUtils.adoc          | 0
 .../modules/applib/pages/index}/util/schema/CommandDtoUtils.adoc          | 0
 .../modules/applib/pages/index}/util/schema/CommonDtoUtils.adoc           | 0
 .../modules/applib/pages/index}/util/schema/InteractionDtoUtils.adoc      | 0
 .../modules/applib/pages/index}/util/schema/MemberExecutionDtoUtils.adoc  | 0
 .../index/applib => refguide/modules/applib/pages/index}/value/Blob.adoc  | 0
 .../index/applib => refguide/modules/applib/pages/index}/value/Clob.adoc  | 0
 .../applib => refguide/modules/applib/pages/index}/value/HasHtml.adoc     | 0
 .../modules/applib/pages/index}/value/LocalResourcePath.adoc              | 0
 .../applib => refguide/modules/applib/pages/index}/value/Markup.adoc      | 0
 .../modules/applib/pages/index}/value/NamedWithMimeType.adoc              | 0
 .../modules/applib/pages/index}/value/OpenUrlStrategy.adoc                | 0
 .../applib => refguide/modules/applib/pages/index}/value/Password.adoc    | 0
 .../commons => refguide/modules/commons/pages/index}/collections/Can.adoc | 0
 .../modules/commons/pages/index}/collections/Cardinality.adoc             | 0
 .../modules/commons/pages/index}/functional/Result.adoc                   | 0
 .../modules/commons/pages/index}/having/HasUniqueId.adoc                  | 0
 .../modules/commons/pages/index}/having/HasUpdatedAt.adoc                 | 0
 .../modules/commons/pages/index}/having/HasUpdatedBy.adoc                 | 0
 .../modules/commons/pages/index}/having/HasUsername.adoc                  | 0
 .../modules/commons/pages/index}/resource/ResourceCoordinates.adoc        | 0
 .../pages/index}/config/datasources/DataSourceIntrospectionService.adoc   | 0
 .../modules/core/pages/index}/interaction/session/InteractionFactory.adoc | 0
 .../index}/runtimeservices/transaction/TransactionServiceSpring.adoc      | 0
 .../modules/core/pages/index}/runtimeservices/xml/XmlServiceDefault.adoc  | 0
 .../index}/transaction/changetracking/EntityChangeTrackerDefault.adoc     | 0
 .../pages/index}/transaction/events/TransactionAfterCompletionEvent.adoc  | 0
 .../extensions/pages/index}/commandlog/impl/CommandSubscriberForJdo.adoc  | 0
 .../pages/index}/commandlog/impl/IsisModuleExtCommandLogImpl.adoc         | 0
 .../pages/index}/commandlog/impl/mixins/HasUniqueId_command.adoc          | 0
 .../index}/commandlog/impl/mixins/HasUsername_recentCommandsByUser.adoc   | 0
 .../extensions/pages/index}/commandlog/impl/ui/CommandServiceMenu.adoc    | 0
 .../index}/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc   | 0
 .../pages/index}/commandreplay/primary/config/PrimaryConfig.adoc          | 0
 .../pages/index}/commandreplay/primary/mixins/Object_openOnSecondary.adoc | 0
 .../index}/commandreplay/primary/restapi/CommandRetrievalService.adoc     | 0
 .../index}/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc    | 0
 .../commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc      | 0
 .../extensions/pages/index}/commandreplay/secondary/SecondaryStatus.adoc  | 0
 .../index}/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc    | 0
 .../commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc  | 0
 .../commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc     | 0
 .../commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc    | 0
 .../pages/index}/commandreplay/secondary/clock/TickingClockService.adoc   | 0
 .../pages/index}/commandreplay/secondary/config/SecondaryConfig.adoc      | 0
 .../commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc  | 0
 .../pages/index}/commandreplay/secondary/fetch/CommandFetcher.adoc        | 0
 .../pages/index}/commandreplay/secondary/job/ReplicateAndReplayJob.adoc   | 0
 .../pages/index}/commandreplay/secondary/job/SecondaryStatusData.adoc     | 0
 .../commandreplay/secondary/jobcallables/ReplicateAndRunCommands.adoc     | 0
 .../pages/index}/commandreplay/secondary/mixins/CommandJdo_exclude.adoc   | 0
 .../index}/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc     | 0
 .../pages/index}/commandreplay/secondary/mixins/Object_openOnPrimary.adoc | 0
 .../commandreplay/secondary/spi/ReplayCommandExecutionController.adoc     | 0
 .../commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc       | 0
 .../modules/extensions/pages/index}/cors/impl/IsisModuleExtCorsImpl.adoc  | 0
 .../extensions/pages/index}/fullcalendar/applib/CalendarEventable.adoc    | 0
 .../modules/extensions/pages/index}/fullcalendar/applib/Calendarable.adoc | 0
 .../pages/index}/fullcalendar/applib/IsisModuleExtFullCalendarApplib.adoc | 0
 .../index}/fullcalendar/applib/spi/CalendarableDereferencingService.adoc  | 0
 .../extensions/pages/index}/fullcalendar/applib/value/CalendarEvent.adoc  | 0
 .../index}/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc     | 0
 .../extensions/pages/index}/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc     | 0
 .../extensions/pages/index}/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc | 0
 .../pages/index}/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc   | 0
 .../extensions/pages/index}/jaxrsclient/applib/client/JaxRsClient.adoc    | 0
 .../extensions/pages/index}/jaxrsclient/applib/client/JaxRsResponse.adoc  | 0
 .../pages/index}/modelannotation/applib/IsisModuleIncModelApplib.adoc     | 0
 .../extensions/pages/index}/modelannotation/applib/annotation/Model.adoc  | 0
 .../index}/modelannotation/metamodel/IsisModuleExtModelAnnotation.adoc    | 0
 .../metamodel/facets/SupportingMethodValidatorRefinerFactory.adoc         | 0
 .../modelannotation/metamodel/services/IncubatorMetaModelPlugin.adoc      | 0
 .../modules/extensions/pages/index}/quartz/IsisModuleExtQuartzImpl.adoc   | 0
 .../modules/extensions/pages/index}/quartz/context/JobExecutionData.adoc  | 0
 .../pages/index}/quartz/spring/AutowiringSpringBeanJobFactory.adoc        | 0
 .../extensions/pages/index}/restclient/ActionParameterListBuilder.adoc    | 0
 .../extensions/pages/index}/restclient/IsisModuleExtRestClient.adoc       | 0
 .../modules/extensions/pages/index}/restclient/ResponseDigest.adoc        | 0
 .../modules/extensions/pages/index}/restclient/RestfulClient.adoc         | 0
 .../modules/extensions/pages/index}/restclient/RestfulClientConfig.adoc   | 0
 .../extensions/pages/index}/restclient/RestfulClientException.adoc        | 0
 .../modules/extensions/pages/index}/restclient/auth/BasicAuthFilter.adoc  | 0
 .../extensions/pages/index}/restclient/log/ClientConversationFilter.adoc  | 0
 .../extensions/pages/index}/restclient/log/ClientConversationLogger.adoc  | 0
 .../extensions/pages/index}/secman/api/IsisModuleExtSecmanApi.adoc        | 0
 .../modules/extensions/pages/index}/secman/api/SecmanConfiguration.adoc   | 0
 .../modules/extensions/pages/index}/secman/api/SecurityRealm.adoc         | 0
 .../extensions/pages/index}/secman/api/SecurityRealmCharacteristic.adoc   | 0
 .../modules/extensions/pages/index}/secman/api/SecurityRealmService.adoc  | 0
 .../pages/index}/secman/api/encryption/PasswordEncryptionService.adoc     | 0
 .../pages/index}/secman/api/encryption/PasswordEncryptionServiceNone.adoc | 0
 .../extensions/pages/index}/secman/api/events/UserCreatedEvent.adoc       | 0
 .../pages/index}/secman/api/permission/ApplicationPermission.adoc         | 0
 .../pages/index}/secman/api/permission/ApplicationPermissionMode.adoc     | 0
 .../index}/secman/api/permission/ApplicationPermissionRepository.adoc     | 0
 .../pages/index}/secman/api/permission/ApplicationPermissionRule.adoc     | 0
 .../pages/index}/secman/api/permission/ApplicationPermissionValue.adoc    | 0
 .../pages/index}/secman/api/permission/ApplicationPermissionValueSet.adoc | 0
 .../pages/index}/secman/api/permission/PermissionsEvaluationService.adoc  | 0
 .../secman/api/permission/PermissionsEvaluationServiceAbstract.adoc       | 0
 .../secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.adoc | 0
 .../secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.adoc | 0
 .../modules/extensions/pages/index}/secman/api/role/ApplicationRole.adoc  | 0
 .../pages/index}/secman/api/role/ApplicationRoleRepository.adoc           | 0
 .../extensions/pages/index}/secman/api/tenancy/ApplicationTenancy.adoc    | 0
 .../pages/index}/secman/api/tenancy/ApplicationTenancyEvaluator.adoc      | 0
 .../pages/index}/secman/api/tenancy/ApplicationTenancyRepository.adoc     | 0
 .../modules/extensions/pages/index}/secman/api/tenancy/HasAtPath.adoc     | 0
 .../modules/extensions/pages/index}/secman/api/user/AccountType.adoc      | 0
 .../modules/extensions/pages/index}/secman/api/user/ApplicationUser.adoc  | 0
 .../pages/index}/secman/api/user/ApplicationUserRepository.adoc           | 0
 .../extensions/pages/index}/secman/api/user/ApplicationUserStatus.adoc    | 0
 .../secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.adoc   | 0
 .../jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.adoc           | 0
 .../pages/index}/secman/jdo/IsisModuleExtSecmanPersistenceJdo.adoc        | 0
 .../pages/index/secman/jdo}/seed/SeedSecurityModuleService.adoc           | 0
 .../pages/index}/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc      | 0
 .../extensions/pages/index/secman/jdo}/seed/scripts/GlobalTenancy.adoc    | 0
 .../seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc     | 0
 .../secman/jdo}/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc    | 0
 .../pages/index/secman/jdo}/seed/scripts/IsisExtSecmanAdminUser.adoc      | 0
 .../secman/jdo}/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc  | 0
 .../jdo}/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc     | 0
 .../pages/index}/secman/jpa/IsisModuleExtSecmanPersistenceJpa.adoc        | 0
 .../pages/index/secman/jpa}/seed/SeedSecurityModuleService.adoc           | 0
 .../pages/index}/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc      | 0
 .../extensions/pages/index/secman/jpa}/seed/scripts/GlobalTenancy.adoc    | 0
 .../seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc     | 0
 .../secman/jpa}/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc    | 0
 .../pages/index/secman/jpa}/seed/scripts/IsisExtSecmanAdminUser.adoc      | 0
 .../secman/jpa}/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc  | 0
 .../jpa}/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc     | 0
 .../jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc     | 0
 .../extensions/pages/index}/secman/model/IsisModuleExtSecmanModel.adoc    | 0
 .../modules/extensions/pages/index}/secman/model/app/user/MeService.adoc  | 0
 .../pages/index}/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc          | 0
 .../pages/index}/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc          | 0
 .../index}/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc      | 0
 .../modules/extensions/pages/index}/secman/shiro/util/ShiroUtils.adoc     | 0
 .../pages/index}/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc    | 0
 .../extensions/pages/index}/shirorealmldap/realm/impl/IsisLdapRealm.adoc  | 0
 .../index}/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.adoc | 0
 .../viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc      | 0
 .../wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc     | 0
 .../exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc     | 0
 .../pages/index}/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.adoc  | 0
 .../pages/index}/viewer/wicket/pdfjs/applib/config/PdfJsConfig.adoc       | 0
 .../extensions/pages/index}/viewer/wicket/pdfjs/applib/config/Scale.adoc  | 0
 .../pages/index}/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc   | 0
 .../pages/index}/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc         | 0
 antora/components/{system => refguide}/modules/generated/nav.adoc         | 0
 .../{system => refguide}/modules/generated/pages/system-overview.adoc     | 0
 .../pages/index}/jdo/applib/IsisModulePersistenceJdoApplib.adoc           | 0
 .../persistence/pages/index}/jdo/applib/services/JdoSupportService.adoc   | 0
 .../pages/index}/jdo/datanucleus/IsisModuleJdoDatanucleus.adoc            | 0
 .../pages/index}/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc | 0
 .../persistence/pages/index}/jdo/datanucleus/dialect/DnJdoDialect.adoc    | 0
 .../index}/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.adoc      | 0
 .../index}/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.adoc | 0
 .../jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.adoc   | 0
 .../index}/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.adoc    | 0
 .../jdo/datanucleus/typeconverters/applib/IsisBookmarkConverter.adoc      | 0
 .../datanucleus/typeconverters/applib/IsisLocalResourcePathConverter.adoc | 0
 .../index}/jdo/datanucleus/typeconverters/applib/IsisMarkupConverter.adoc | 0
 .../jdo/datanucleus/typeconverters/applib/IsisPasswordConverter.adoc      | 0
 .../typeconverters/image/JavaAwtBufferedImageByteArrayConverter.adoc      | 0
 .../jdo/datanucleus/typeconverters/schema/v2/IsisChangesDtoConverter.adoc | 0
 .../jdo/datanucleus/typeconverters/schema/v2/IsisCommandDtoConverter.adoc | 0
 .../datanucleus/typeconverters/schema/v2/IsisInteractionDtoConverter.adoc | 0
 .../jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.adoc     | 0
 .../jdo/datanucleus/typeconverters/time/IsoOffsetTimeConverter.adoc       | 0
 .../jdo/datanucleus/typeconverters/time/IsoZonedDateTimeConverter.adoc    | 0
 .../jdo/datanucleus/valuemappings/applib/ByteArrayBlobRdbmsMapping.adoc   | 0
 .../pages/index}/jdo/datanucleus/valuetypes/applib/IsisBlobMapping.adoc   | 0
 .../pages/index}/jdo/datanucleus/valuetypes/applib/IsisClobMapping.adoc   | 0
 .../index}/jpa/applib/integration/JpaEntityInjectionPointResolver.adoc    | 0
 .../persistence/pages/index}/jpa/applib/services/JpaSupportService.adoc   | 0
 .../pages/index}/jpa/eclipselink/IsisModuleJpaEclipselink.adoc            | 0
 .../schema => refguide/modules/schema/pages/index}/IsisModuleSchema.adoc  | 0
 .../modules/security/pages/index}/bypass/IsisModuleSecurityBypass.adoc    | 0
 .../security/pages/index}/bypass/authentication/AuthenticatorBypass.adoc  | 0
 .../security/pages/index}/bypass/authorization/AuthorizorBypass.adoc      | 0
 .../security/pages/index}/keycloak/IsisModuleSecurityKeycloak.adoc        | 0
 .../pages/index}/keycloak/authentication/AuthenticatorKeycloak.adoc       | 0
 .../security/pages/index}/keycloak/authorization/AuthorizorKeycloak.adoc  | 0
 .../modules/security/pages/index}/keycloak/webmodule/KeycloakFilter.adoc  | 0
 .../security/pages/index}/keycloak/webmodule/WebModuleKeycloak.adoc       | 0
 .../modules/security/pages/index}/shiro/IsisModuleSecurityShiro.adoc      | 0
 .../security/pages/index}/shiro/authentication/AuthenticatorShiro.adoc    | 0
 .../security/pages/index}/shiro/authorization/AuthorizorShiro.adoc        | 0
 .../modules/security/pages/index}/shiro/authorization/IsisPermission.adoc | 0
 .../security/pages/index}/shiro/authorization/IsisPermissionResolver.adoc | 0
 .../modules/security/pages/index}/shiro/webmodule/WebModuleShiro.adoc     | 0
 .../modules/subdomains/pages/index}/base/applib/Chained.adoc              | 0
 .../modules/subdomains/pages/index}/base/applib/Dflt.adoc                 | 0
 .../pages/index}/base/applib/IsisModuleSubdomainsBaseApplib.adoc          | 0
 .../modules/subdomains/pages/index}/base/applib/PowerType.adoc            | 0
 .../modules/subdomains/pages/index}/base/applib/Titled.adoc               | 0
 .../modules/subdomains/pages/index}/base/applib/TitledEnum.adoc           | 0
 .../subdomains/pages/index}/base/applib/services/BaseServicesModule.adoc  | 0
 .../pages/index}/base/applib/services/calendar/CalendarService.adoc       | 0
 .../subdomains/pages/index/base}/applib/types/DescriptionType.adoc        | 0
 .../modules/subdomains/pages/index}/base/applib/types/FqcnType.adoc       | 0
 .../modules/subdomains/pages/index}/base/applib/types/MoneyType.adoc      | 0
 .../modules/subdomains/pages/index}/base/applib/types/NameType.adoc       | 0
 .../modules/subdomains/pages/index}/base/applib/types/NotesType.adoc      | 0
 .../subdomains/pages/index}/base/applib/types/ObjectIdentifierType.adoc   | 0
 .../modules/subdomains/pages/index}/base/applib/types/PercentageType.adoc | 0
 .../modules/subdomains/pages/index}/base/applib/types/ProperNameType.adoc | 0
 .../modules/subdomains/pages/index}/base/applib/types/ReferenceType.adoc  | 0
 .../modules/subdomains/pages/index}/base/applib/types/TitleType.adoc      | 0
 .../subdomains/pages/index}/base/applib/types/UrlTemplateType.adoc        | 0
 .../modules/subdomains/pages/index}/base/applib/types/UserNameType.adoc   | 0
 .../modules/subdomains/pages/index}/base/applib/types/XxxType.adoc        | 0
 .../modules/subdomains/pages/index}/base/applib/utils/ClassUtils.adoc     | 0
 .../subdomains/pages/index}/base/applib/utils/JodaPeriodUtils.adoc        | 0
 .../modules/subdomains/pages/index}/base/applib/utils/MathUtils.adoc      | 0
 .../modules/subdomains/pages/index}/base/applib/utils/MessageUtils.adoc   | 0
 .../modules/subdomains/pages/index}/base/applib/utils/StringUtils.adoc    | 0
 .../modules/subdomains/pages/index}/base/applib/utils/TitleBuilder.adoc   | 0
 .../subdomains/pages/index}/base/applib/valuetypes/AbstractInterval.adoc  | 0
 .../subdomains/pages/index}/base/applib/valuetypes/LocalDateInterval.adoc | 0
 .../modules/subdomains/pages/index}/base/applib/valuetypes/VT.adoc        | 0
 .../subdomains/pages/index}/base/applib/with/WithCodeComparable.adoc      | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithCodeGetter.adoc  | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithCodeUnique.adoc  | 0
 .../pages/index}/base/applib/with/WithDescriptionComparable.adoc          | 0
 .../subdomains/pages/index}/base/applib/with/WithDescriptionGetter.adoc   | 0
 .../subdomains/pages/index}/base/applib/with/WithDescriptionUnique.adoc   | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithInterval.adoc    | 0
 .../subdomains/pages/index}/base/applib/with/WithIntervalContiguous.adoc  | 0
 .../subdomains/pages/index}/base/applib/with/WithIntervalMutable.adoc     | 0
 .../subdomains/pages/index}/base/applib/with/WithNameComparable.adoc      | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithNameGetter.adoc  | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithNameUnique.adoc  | 0
 .../subdomains/pages/index}/base/applib/with/WithReferenceComparable.adoc | 0
 .../subdomains/pages/index}/base/applib/with/WithReferenceGetter.adoc     | 0
 .../subdomains/pages/index}/base/applib/with/WithReferenceUnique.adoc     | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithSequence.adoc    | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithStartDate.adoc   | 0
 .../subdomains/pages/index}/base/applib/with/WithTitleComparable.adoc     | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithTitleGetter.adoc | 0
 .../modules/subdomains/pages/index}/base/applib/with/WithTitleUnique.adoc | 0
 .../pages/index}/excel/applib/IsisModuleSubdomainsExcelApplib.adoc        | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/AggregationType.adoc | 0
 .../subdomains/pages/index}/excel/applib/dom/ExcelMetaDataEnabled.adoc    | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/ExcelService.adoc    | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/HyperLink.adoc       | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/PivotColumn.adoc     | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/PivotDecoration.adoc | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/PivotRow.adoc        | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/PivotValue.adoc      | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/RowHandler.adoc      | 0
 .../subdomains/pages/index}/excel/applib/dom/WorksheetContent.adoc        | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/WorksheetSpec.adoc   | 0
 .../subdomains/pages/index}/excel/applib/dom/util/AnnotationList.adoc     | 0
 .../subdomains/pages/index}/excel/applib/dom/util/AnnotationTriplet.adoc  | 0
 .../pages/index}/excel/applib/dom/util/ExcelFileBlobConverter.adoc        | 0
 .../subdomains/pages/index}/excel/applib/dom/util/ExcelServiceImpl.adoc   | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/util/Mode.adoc       | 0
 .../modules/subdomains/pages/index}/excel/applib/dom/util/PivotUtils.adoc | 0
 .../subdomains/pages/index}/excel/applib/dom/util/SheetPivoter.adoc       | 0
 .../modules/subdomains/pages/index}/excel/testing/ExcelFixture.adoc       | 0
 .../modules/subdomains/pages/index}/excel/testing/ExcelFixture2.adoc      | 0
 .../subdomains/pages/index}/excel/testing/ExcelFixtureRowHandler.adoc     | 0
 .../pages/index}/excel/testing/ExcelFixtureWorkbookHandler.adoc           | 0
 .../subdomains/pages/index}/excel/testing/FixtureAwareRowHandler.adoc     | 0
 .../pages/index}/excel/testing/IsisModuleSubdomainsExcelTesting.adoc      | 0
 .../pages/index}/spring/applib/IsisModuleSubdomainsSpringApplib.adoc      | 0
 .../subdomains/pages/index}/spring/applib/service/BeanDescriptor.adoc     | 0
 .../subdomains/pages/index}/spring/applib/service/ContextBeans.adoc       | 0
 .../subdomains/pages/index}/spring/applib/service/SpringBeansService.adoc | 0
 .../index}/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc    | 0
 .../subdomains/pages/index}/xdocreport/applib/service/OutputType.adoc     | 0
 .../pages/index}/xdocreport/applib/service/XDocReportModel.adoc           | 0
 .../pages/index}/xdocreport/applib/service/XDocReportService.adoc         | 0
 .../pages/index}/fakedata/applib/IsisModuleTestingFakeDataApplib.adoc     | 0
 .../index}/fakedata/applib/services/AbstractRandomValueGenerator.adoc     | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Addresses.adoc  | 0
 .../testing/pages/index}/fakedata/applib/services/BigDecimals.adoc        | 0
 .../testing/pages/index}/fakedata/applib/services/BigIntegers.adoc        | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Books.adoc      | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Booleans.adoc   | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Bytes.adoc      | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Chars.adoc      | 0
 .../testing/pages/index}/fakedata/applib/services/Collections.adoc        | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Comms.adoc      | 0
 .../testing/pages/index}/fakedata/applib/services/CreditCards.adoc        | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Doubles.adoc    | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Enums.adoc      | 0
 .../testing/pages/index}/fakedata/applib/services/FakeDataService.adoc    | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Floats.adoc     | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Integers.adoc   | 0
 .../modules/testing/pages/index}/fakedata/applib/services/IsisBlobs.adoc  | 0
 .../modules/testing/pages/index}/fakedata/applib/services/IsisClobs.adoc  | 0
 .../testing/pages/index}/fakedata/applib/services/IsisPasswords.adoc      | 0
 .../testing/pages/index}/fakedata/applib/services/J8DateTimes.adoc        | 0
 .../testing/pages/index}/fakedata/applib/services/J8LocalDates.adoc       | 0
 .../modules/testing/pages/index}/fakedata/applib/services/J8Periods.adoc  | 0
 .../testing/pages/index}/fakedata/applib/services/JavaSqlDates.adoc       | 0
 .../testing/pages/index}/fakedata/applib/services/JavaSqlTimestamps.adoc  | 0
 .../testing/pages/index}/fakedata/applib/services/JavaUtilDates.adoc      | 0
 .../testing/pages/index}/fakedata/applib/services/JodaDateTimes.adoc      | 0
 .../testing/pages/index}/fakedata/applib/services/JodaLocalDates.adoc     | 0
 .../testing/pages/index}/fakedata/applib/services/JodaPeriods.adoc        | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Longs.adoc      | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Lorem.adoc      | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Names.adoc      | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Shorts.adoc     | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Strings.adoc    | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Urls.adoc       | 0
 .../modules/testing/pages/index}/fakedata/applib/services/Uuids.adoc      | 0
 .../testing/pages/index}/h2console/ui/IsisModuleTestingH2ConsoleUi.adoc   | 0
 .../modules/testing/pages/index}/h2console/ui/services/H2ManagerMenu.adoc | 0
 .../testing/pages/index}/h2console/ui/webmodule/WebModuleH2Console.adoc   | 0
 .../index}/integtestsupport/applib/ExceptionRecognizerTranslate.adoc      | 0
 .../pages/index}/integtestsupport/applib/IsisIntegrationTestAbstract.adoc | 0
 .../pages/index}/integtestsupport/applib/IsisInteractionHandler.adoc      | 0
 .../testing/pages/index}/integtestsupport/applib/ThrowableMatchers.adoc   | 0
 .../pages/index}/integtestsupport/applib/swagger/SwaggerExporter.adoc     | 0
 .../index}/integtestsupport/applib/validate/DomainModelValidator.adoc     | 0
 .../index}/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc     | 0
 .../specsupport/applib/integration/ObjectFactoryForIntegration.adoc       | 0
 .../modules/testing/pages/index}/specsupport/applib/specs/V.adoc          | 0
 .../unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.adoc    | 0
 .../index}/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc    | 0
 .../unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc      | 0
 .../unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.adoc       | 0
 .../index}/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.adoc  | 0
 .../index}/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.adoc  | 0
 .../testing/pages/index}/unittestsupport/applib/bean/PojoTester.adoc      | 0
 .../unittestsupport/applib/core/AbstractApplyToAllContractTest.adoc       | 0
 .../applib/core/bidir/BidirectionalRelationshipContractTestAbstract.adoc  | 0
 .../pages/index}/unittestsupport/applib/core/bidir/Instantiator.adoc      | 0
 .../index}/unittestsupport/applib/core/bidir/InstantiatorSimple.adoc      | 0
 .../pages/index}/unittestsupport/applib/core/bidir/Instantiators.adoc     | 0
 .../applib/core/comparable/ComparableContractTest_compareTo.adoc          | 0
 .../unittestsupport/applib/core/comparable/ComparableContractTester.adoc  | 0
 .../testing/pages/index}/unittestsupport/applib/core/files/Files.adoc     | 0
 .../pages/index}/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc       | 0
 .../pages/index}/unittestsupport/applib/core/jmocking/Imposterisers.adoc  | 0
 .../unittestsupport/applib/core/jmocking/InjectIntoJMockAction.adoc       | 0
 .../pages/index}/unittestsupport/applib/core/jmocking/IsisActions.adoc    | 0
 .../pages/index}/unittestsupport/applib/core/jmocking/JMockActions.adoc   | 0
 .../index}/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc    | 0
 .../index}/unittestsupport/applib/core/jmocking/PostponedAction.adoc      | 0
 .../unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc      | 0
 .../pages/index}/unittestsupport/applib/core/soap/SoapEndpointSpec.adoc   | 0
 .../applib/core/sortedsets/SortedSetsContractTestAbstract.adoc            | 0
 .../pages/index}/unittestsupport/applib/core/streams/NullPrintStream.adoc | 0
 .../pages/index}/unittestsupport/applib/core/utils/CollectUtils.adoc      | 0
 .../pages/index}/unittestsupport/applib/core/utils/IndentPrinter.adoc     | 0
 .../pages/index}/unittestsupport/applib/core/utils/ReflectUtils.adoc      | 0
 .../pages/index}/unittestsupport/applib/core/utils/StringUtils.adoc       | 0
 .../unittestsupport/applib/core/value/ValueTypeContractTestAbstract.adoc  | 0
 .../pages/index}/unittestsupport/applib/dom/assertions/Asserting.adoc     | 0
 .../pages/index}/unittestsupport/applib/dom/matchers/IsisMatchers.adoc    | 0
 .../unittestsupport/applib/dom/privatecons/PrivateConstructorTester.adoc  | 0
 .../pages/index}/unittestsupport/applib/dom/reflect/ReflectUtils.adoc     | 0
 .../pages/index}/unittestsupport/applib/dom/repo/FinderInteraction.adoc   | 0
 .../pages/index}/asciidoc/applib/IsisModuleValAsciidocApplib.adoc         | 0
 .../valuetypes/pages/index}/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.adoc | 0
 .../modules/valuetypes/pages/index}/asciidoc/applib/value/AsciiDoc.adoc   | 0
 .../pages/index}/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc   | 0
 .../persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.adoc       | 0
 .../asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.adoc    | 0
 .../pages/index}/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc          | 0
 .../pages/index}/markdown/applib/IsisModuleValMarkdownApplib.adoc         | 0
 .../valuetypes/pages/index}/markdown/applib/jaxb/MarkdownJaxbAdapter.adoc | 0
 .../modules/valuetypes/pages/index}/markdown/applib/value/Converter.adoc  | 0
 .../pages/index}/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc   | 0
 .../persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.adoc       | 0
 .../markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.adoc    | 0
 .../pages/index}/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc          | 0
 .../valuetypes/pages/index}/sse/applib/IsisModuleValSseApplib.adoc        | 0
 .../valuetypes/pages/index}/sse/applib/annotations/ServerSentEvents.adoc  | 0
 .../modules/valuetypes/pages/index}/sse/applib/annotations/SseSource.adoc | 0
 .../modules/valuetypes/pages/index}/sse/applib/service/SseChannel.adoc    | 0
 .../modules/valuetypes/pages/index}/sse/applib/service/SseService.adoc    | 0
 .../modules/valuetypes/pages/index}/sse/ui/wkt/IsisModuleValSseUiWkt.adoc | 0
 .../valuetypes/pages/index}/sse/ui/wkt/services/SseServiceDefault.adoc    | 0
 .../pages/index}/sse/ui/wkt/webmodule/WebModuleServerSentEvents.adoc      | 0
 .../restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc       | 0
 .../viewer/pages/index}/restfulobjects/applib/JsonRepresentation.adoc     | 0
 .../viewer/pages/index}/restfulobjects/applib/LinkRepresentation.adoc     | 0
 .../modules/viewer/pages/index}/restfulobjects/applib/Rel.adoc            | 0
 .../modules/viewer/pages/index}/restfulobjects/applib/RelDefinition.adoc  | 0
 .../viewer/pages/index}/restfulobjects/applib/RepresentationType.adoc     | 0
 .../viewer/pages/index}/restfulobjects/applib/RestfulHttpMethod.adoc      | 0
 .../viewer/pages/index}/restfulobjects/applib/RestfulMediaType.adoc       | 0
 .../modules/viewer/pages/index}/restfulobjects/applib/RestfulRequest.adoc | 0
 .../viewer/pages/index}/restfulobjects/applib/RestfulResponse.adoc        | 0
 .../viewer/pages/index}/restfulobjects/applib/boot/BootstrapResource.adoc | 0
 .../applib/domainobjects/AbstractObjectMemberRepresentation.adoc          | 0
 .../restfulobjects/applib/domainobjects/ActionResultRepresentation.adoc   | 0
 .../applib/domainobjects/DomainObjectMemberRepresentation.adoc            | 0
 .../restfulobjects/applib/domainobjects/DomainObjectRepresentation.adoc   | 0
 .../index}/restfulobjects/applib/domainobjects/DomainObjectResource.adoc  | 0
 .../index}/restfulobjects/applib/domainobjects/DomainRepresentation.adoc  | 0
 .../index}/restfulobjects/applib/domainobjects/DomainServiceResource.adoc | 0
 .../index}/restfulobjects/applib/domainobjects/ListRepresentation.adoc    | 0
 .../restfulobjects/applib/domainobjects/ObjectActionRepresentation.adoc   | 0
 .../applib/domainobjects/ObjectCollectionRepresentation.adoc              | 0
 .../restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.adoc | 0
 .../restfulobjects/applib/domainobjects/ScalarValueRepresentation.adoc    | 0
 .../applib/domaintypes/AbstractTypeMemberRepresentation.adoc              | 0
 .../applib/domaintypes/ActionDescriptionRepresentation.adoc               | 0
 .../applib/domaintypes/ActionParameterDescriptionRepresentation.adoc      | 0
 .../applib/domaintypes/CollectionDescriptionRepresentation.adoc           | 0
 .../restfulobjects/applib/domaintypes/DomainTypeRepresentation.adoc       | 0
 .../index}/restfulobjects/applib/domaintypes/DomainTypeResource.adoc      | 0
 .../applib/domaintypes/PropertyDescriptionRepresentation.adoc             | 0
 .../restfulobjects/applib/domaintypes/TypeActionResultRepresentation.adoc | 0
 .../index}/restfulobjects/applib/domaintypes/TypeListRepresentation.adoc  | 0
 .../viewer/pages/index}/restfulobjects/applib/dtos/ScalarValueDtoV2.adoc  | 0
 .../pages/index}/restfulobjects/applib/errors/ErrorRepresentation.adoc    | 0
 .../pages/index}/restfulobjects/applib/health/HealthRepresentation.adoc   | 0
 .../viewer/pages/index}/restfulobjects/applib/health/HealthResource.adoc  | 0
 .../index}/restfulobjects/applib/homepage/HomePageRepresentation.adoc     | 0
 .../pages/index}/restfulobjects/applib/homepage/HomePageResource.adoc     | 0
 .../pages/index}/restfulobjects/applib/menubars/MenuBarsResource.adoc     | 0
 .../pages/index}/restfulobjects/applib/user/UserRepresentation.adoc       | 0
 .../viewer/pages/index}/restfulobjects/applib/user/UserResource.adoc      | 0
 .../viewer/pages/index}/restfulobjects/applib/util/JsonMapper.adoc        | 0
 .../viewer/pages/index}/restfulobjects/applib/util/JsonNodeUtils.adoc     | 0
 .../viewer/pages/index}/restfulobjects/applib/util/MediaTypes.adoc        | 0
 .../modules/viewer/pages/index}/restfulobjects/applib/util/Parser.adoc    | 0
 .../modules/viewer/pages/index}/restfulobjects/applib/util/PathNode.adoc  | 0
 .../viewer/pages/index}/restfulobjects/applib/util/UrlEncodingUtils.adoc  | 0
 .../pages/index}/restfulobjects/applib/version/VersionRepresentation.adoc | 0
 .../pages/index}/restfulobjects/applib/version/VersionResource.adoc       | 0
 .../jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.adoc      | 0
 .../jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.adoc             | 0
 .../restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.adoc  | 0
 .../restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc       | 0
 .../index}/restfulobjects/rendering/service/RepresentationService.adoc    | 0
 .../rendering/service/RepresentationServiceContentNegotiator.adoc         | 0
 .../rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc        | 0
 .../rendering/service/conneg/ContentNegotiationService.adoc               | 0
 .../rendering/service/conneg/ContentNegotiationServiceAbstract.adoc       | 0
 .../service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc    | 0
 .../service/conneg/ContentNegotiationServiceOrgApacheIsisV1.adoc          | 0
 .../service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc          | 0
 .../rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc  | 0
 .../restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc      | 0
 .../restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc       | 0
 .../viewer/pages/index}/wicket/model/IsisModuleViewerWicketModel.adoc     | 0
 .../modules/viewer/pages/index}/wicket/ui/IsisModuleViewerWicketUi.adoc   | 0
 .../viewer/pages/index}/wicket/viewer/IsisModuleViewerWicketViewer.adoc   | 0
 994 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/antora/components/system/antora.yml b/antora/components/refguide/antora.yml
similarity index 100%
rename from antora/components/system/antora.yml
rename to antora/components/refguide/antora.yml
diff --git a/antora/components/system/modules/generated/pages/index/applib/AbstractViewModel.adoc b/antora/components/refguide/modules/applib/pages/index/AbstractViewModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/AbstractViewModel.adoc
rename to antora/components/refguide/modules/applib/pages/index/AbstractViewModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/Identifier.adoc b/antora/components/refguide/modules/applib/pages/index/Identifier.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/Identifier.adoc
rename to antora/components/refguide/modules/applib/pages/index/Identifier.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/IsisModuleApplib.adoc b/antora/components/refguide/modules/applib/pages/index/IsisModuleApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/IsisModuleApplib.adoc
rename to antora/components/refguide/modules/applib/pages/index/IsisModuleApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/RecreatableDomainObject.adoc b/antora/components/refguide/modules/applib/pages/index/RecreatableDomainObject.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/RecreatableDomainObject.adoc
rename to antora/components/refguide/modules/applib/pages/index/RecreatableDomainObject.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/ViewModel.adoc b/antora/components/refguide/modules/applib/pages/index/ViewModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/ViewModel.adoc
rename to antora/components/refguide/modules/applib/pages/index/ViewModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/AbstractValueSemanticsProvider.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/AbstractValueSemanticsProvider.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/adapters/AbstractValueSemanticsProvider.adoc
rename to antora/components/refguide/modules/applib/pages/index/adapters/AbstractValueSemanticsProvider.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/DefaultsProvider.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/DefaultsProvider.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/adapters/DefaultsProvider.adoc
rename to antora/components/refguide/modules/applib/pages/index/adapters/DefaultsProvider.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/EncoderDecoder.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/EncoderDecoder.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/adapters/EncoderDecoder.adoc
rename to antora/components/refguide/modules/applib/pages/index/adapters/EncoderDecoder.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/EncodingException.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/EncodingException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/adapters/EncodingException.adoc
rename to antora/components/refguide/modules/applib/pages/index/adapters/EncodingException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/Parser.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/Parser.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/adapters/Parser.adoc
rename to antora/components/refguide/modules/applib/pages/index/adapters/Parser.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/ParsingException.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/ParsingException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/adapters/ParsingException.adoc
rename to antora/components/refguide/modules/applib/pages/index/adapters/ParsingException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/adapters/ValueSemanticsProvider.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/ValueSemanticsProvider.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/adapters/ValueSemanticsProvider.adoc
rename to antora/components/refguide/modules/applib/pages/index/adapters/ValueSemanticsProvider.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Action.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Action.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Action.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/ActionLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/ActionLayout.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/ActionLayout.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/ActionLayout.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/BookmarkPolicy.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/BookmarkPolicy.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/BookmarkPolicy.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/BookmarkPolicy.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Bounding.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Bounding.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Bounding.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Bounding.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Collection.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Collection.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Collection.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Collection.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/CollectionLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/CollectionLayout.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/CollectionLayout.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/CollectionLayout.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Defaulted.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Defaulted.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Defaulted.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Defaulted.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/DomainObject.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/DomainObject.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/DomainObject.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/DomainObject.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/DomainObjectLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/DomainObjectLayout.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/DomainService.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/DomainService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/DomainService.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/DomainService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/DomainServiceLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/DomainServiceLayout.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/DomainServiceLayout.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/DomainServiceLayout.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/DomainServiceLayout~MenuBar.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/DomainServiceLayout~MenuBar.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/DomainServiceLayout~MenuBar.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/DomainServiceLayout~MenuBar.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Editing.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Editing.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Editing.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Editing.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/EntityChangeKind.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/EntityChangeKind.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/EntityChangeKind.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/EntityChangeKind.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/EqualByContent.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/EqualByContent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/EqualByContent.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/EqualByContent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Facets.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Facets.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Facets.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Facets.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/HomePage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/HomePage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/HomePage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/HomePage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/InteractionScope.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/InteractionScope.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/InteractionScope.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/InteractionScope.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/LabelPosition.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/LabelPosition.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/LabelPosition.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/LabelPosition.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/MemberOrder.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/MemberOrder.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/MemberOrder.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/MemberOrder.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/MinLength.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/MinLength.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/MinLength.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/MinLength.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Module.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Module.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Module.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Module.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Nature.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Nature.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Nature.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Nature.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/NatureOfService.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/NatureOfService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/NatureOfService.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/NatureOfService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Navigable.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Navigable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Navigable.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Navigable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Optionality.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Optionality.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Optionality.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Optionality.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/OrderPrecedence.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/OrderPrecedence.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/OrderPrecedence.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/OrderPrecedence.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Parameter.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Parameter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Parameter.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Parameter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/ParameterLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/ParameterLayout.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/ParameterLayout.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/ParameterLayout.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Programmatic.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Programmatic.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Programmatic.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Programmatic.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Projecting.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Projecting.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Projecting.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Projecting.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/PromptStyle.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/PromptStyle.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/PromptStyle.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/PromptStyle.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Property.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Property.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Property.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Property.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/PropertyLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/PropertyLayout.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/PropertyLayout.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/PropertyLayout.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Publishing.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Publishing.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Publishing.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Publishing.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Redirect.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Redirect.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Redirect.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Redirect.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/RenderDay.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/RenderDay.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/RenderDay.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/RenderDay.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Repainting.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Repainting.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Repainting.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Repainting.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/RestrictTo.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/RestrictTo.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/RestrictTo.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/RestrictTo.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/SemanticsOf.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/SemanticsOf.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/SemanticsOf.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/SemanticsOf.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Snapshot.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Snapshot.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Snapshot.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Snapshot.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Title.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Title.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Title.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Title.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Value.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Value.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Value.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Value.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/Where.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Where.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/Where.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/Where.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_011-bookmarking.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_011-bookmarking.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_011-bookmarking.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_011-bookmarking.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_012-cssClass.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_012-cssClass.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_012-cssClass.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_012-cssClass.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_013-cssClassFa.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_013-cssClassFa.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_013-cssClassFa.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_013-cssClassFa.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_014-describedAs.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_014-describedAs.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_014-describedAs.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_014-describedAs.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_015-hidden.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_015-hidden.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_015-hidden.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_015-hidden.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_016-named.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_016-named.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_016-named.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_016-named.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_017-position.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_017-position.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_017-position.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_017-position.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_018-promptStyle.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_018-promptStyle.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_018-promptStyle.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_018-promptStyle.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_019-redirect.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_019-redirect.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ActionLayout_019-redirect.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_019-redirect.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Action_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Action_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Action_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Action_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_011-cssClass.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_011-cssClass.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_011-cssClass.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_011-cssClass.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_012-defaultView.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_012-defaultView.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_012-defaultView.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_012-defaultView.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_013-describedAs.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_013-describedAs.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_013-describedAs.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_013-describedAs.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_014-hidden.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_014-hidden.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_014-hidden.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_014-hidden.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_015-named.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_015-named.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_015-named.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_015-named.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_016-paged.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_016-paged.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_016-paged.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_016-paged.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_017-sortedBy.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_017-sortedBy.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/CollectionLayout_017-sortedBy.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_017-sortedBy.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_011_domainEvent.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_011_domainEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_011_domainEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_011_domainEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_012_hidden.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_012_hidden.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_012_hidden.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_012_hidden.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_013_typeOf.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_013_typeOf.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Collection_013_typeOf.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_013_typeOf.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_011-domain-events.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_011-domain-events.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_011-domain-events.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_011-domain-events.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_012-_lifecycle-events.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_012-_lifecycle-events.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_012-_lifecycle-events.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_012-_lifecycle-events.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_014-bounding.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_014-bounding.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_014-bounding.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_014-bounding.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_015-editing.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_015-editing.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_015-editing.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_015-editing.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_016-entityChangePublishing.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_016-entityChangePublishing.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_016-entityChangePublishing.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_016-entityChangePublishing.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_017-mixinMethod.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_017-mixinMethod.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_017-mixinMethod.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_017-mixinMethod.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_018-nature.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_018-nature.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_018-nature.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_018-nature.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_019-objectType.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_019-objectType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_019-objectType.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_019-objectType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_030-see-also.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_030-see-also.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainObject_030-see-also.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_030-see-also.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainServiceLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainServiceLayout_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainService_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainService_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/DomainService_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainService_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Facets_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Facets_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Facets_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Facets_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/HomePage_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/HomePage_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/HomePage_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/HomePage_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/InteractionScope_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/InteractionScope_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/InteractionScope_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/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/refguide/modules/applib/pages/index/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MinLength_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/MinLength_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/MinLength_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/MinLength_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ParameterLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ParameterLayout_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/ParameterLayout_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/ParameterLayout_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Parameter_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Parameter_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Parameter_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Parameter_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Programmatic_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Programmatic_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Programmatic_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Programmatic_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Property_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Property_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Property_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Property_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Title_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Title_010-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/annotation/hooks/Title_010-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/annotation/hooks/Title_010-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/client/RepresentationTypeSimplifiedV2.adoc b/antora/components/refguide/modules/applib/pages/index/client/RepresentationTypeSimplifiedV2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/client/RepresentationTypeSimplifiedV2.adoc
rename to antora/components/refguide/modules/applib/pages/index/client/RepresentationTypeSimplifiedV2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/client/SuppressionType.adoc b/antora/components/refguide/modules/applib/pages/index/client/SuppressionType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/client/SuppressionType.adoc
rename to antora/components/refguide/modules/applib/pages/index/client/SuppressionType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/clock/VirtualClock.adoc b/antora/components/refguide/modules/applib/pages/index/clock/VirtualClock.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/clock/VirtualClock.adoc
rename to antora/components/refguide/modules/applib/pages/index/clock/VirtualClock.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/domain/DomainObjectList.adoc b/antora/components/refguide/modules/applib/pages/index/domain/DomainObjectList.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/domain/DomainObjectList.adoc
rename to antora/components/refguide/modules/applib/pages/index/domain/DomainObjectList.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/EventObjectBase.adoc b/antora/components/refguide/modules/applib/pages/index/events/EventObjectBase.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/EventObjectBase.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/EventObjectBase.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/domain/AbstractDomainEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/domain/AbstractDomainEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/domain/AbstractDomainEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/domain/AbstractDomainEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/domain/ActionDomainEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/domain/ActionDomainEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/domain/ActionDomainEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/domain/ActionDomainEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/domain/CollectionDomainEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/domain/CollectionDomainEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/domain/CollectionDomainEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/domain/CollectionDomainEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/domain/PropertyDomainEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/domain/PropertyDomainEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/domain/PropertyDomainEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/domain/PropertyDomainEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/AbstractLifecycleEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/AbstractLifecycleEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/AbstractLifecycleEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/AbstractLifecycleEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectCreatedEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectCreatedEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectCreatedEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectCreatedEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectLoadedEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectLoadedEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectLoadedEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectLoadedEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectPersistedEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectPersistedEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectPersistedEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectPersistedEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectPersistingEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectPersistingEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectPersistingEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectPersistingEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectRemovingEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectRemovingEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectRemovingEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectRemovingEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectUpdatedEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectUpdatedEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectUpdatedEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectUpdatedEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectUpdatingEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectUpdatingEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/lifecycle/ObjectUpdatingEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/lifecycle/ObjectUpdatingEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/ui/AbstractUiEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/ui/AbstractUiEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/ui/AbstractUiEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/ui/AbstractUiEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/ui/CssClassUiEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/ui/CssClassUiEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/ui/CssClassUiEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/ui/CssClassUiEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/ui/IconUiEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/ui/IconUiEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/ui/IconUiEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/ui/IconUiEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/ui/LayoutUiEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/ui/LayoutUiEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/ui/LayoutUiEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/ui/LayoutUiEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/events/ui/TitleUiEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/ui/TitleUiEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/events/ui/TitleUiEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/events/ui/TitleUiEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/RecoverableException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/RecoverableException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/RecoverableException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/RecoverableException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/TranslatableException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/TranslatableException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/TranslatableException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/TranslatableException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/UnrecoverableException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/UnrecoverableException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/UnrecoverableException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/UnrecoverableException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/DomainModelException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/DomainModelException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/DomainModelException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/DomainModelException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/MetaModelException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/MetaModelException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/MetaModelException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/MetaModelException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/NoAuthenticatorException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/NoAuthenticatorException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/NoAuthenticatorException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/NoAuthenticatorException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/ObjectNotFoundException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/ObjectNotFoundException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/ObjectNotFoundException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/ObjectNotFoundException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/ObjectPersistenceException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/ObjectPersistenceException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/ObjectPersistenceException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/ObjectPersistenceException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/PersistFailedException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/PersistFailedException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/PersistFailedException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/PersistFailedException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/ReflectiveActionException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/ReflectiveActionException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/ReflectiveActionException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/ReflectiveActionException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/RepositoryException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/RepositoryException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/RepositoryException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/RepositoryException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/UnexpectedCallException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/UnexpectedCallException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/UnexpectedCallException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/UnexpectedCallException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/UnknownTypeException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/UnknownTypeException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/exceptions/unrecoverable/UnknownTypeException.adoc
rename to antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/UnknownTypeException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/Edge.adoc b/antora/components/refguide/modules/applib/pages/index/graph/Edge.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/Edge.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/Edge.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/SimpleEdge.adoc b/antora/components/refguide/modules/applib/pages/index/graph/SimpleEdge.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/SimpleEdge.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/SimpleEdge.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/Vertex.adoc b/antora/components/refguide/modules/applib/pages/index/graph/Vertex.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/Vertex.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/Vertex.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/tree/LazyTreeNode.adoc b/antora/components/refguide/modules/applib/pages/index/graph/tree/LazyTreeNode.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/tree/LazyTreeNode.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/tree/LazyTreeNode.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeAdapter.adoc b/antora/components/refguide/modules/applib/pages/index/graph/tree/TreeAdapter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeAdapter.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/tree/TreeAdapter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeNode.adoc b/antora/components/refguide/modules/applib/pages/index/graph/tree/TreeNode.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeNode.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/tree/TreeNode.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreePath.adoc b/antora/components/refguide/modules/applib/pages/index/graph/tree/TreePath.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/tree/TreePath.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/tree/TreePath.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeState.adoc b/antora/components/refguide/modules/applib/pages/index/graph/tree/TreeState.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/graph/tree/TreeState.adoc
rename to antora/components/refguide/modules/applib/pages/index/graph/tree/TreeState.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/DataTypeFactory.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/DataTypeFactory.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/DataTypeFactory.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/DataTypeFactory.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/JavaSqlJaxbAdapters.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/JavaSqlJaxbAdapters.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/JavaSqlJaxbAdapters.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/JavaSqlJaxbAdapters.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/JavaSqlXMLGregorianCalendarMarshalling.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/JavaSqlXMLGregorianCalendarMarshalling.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/JavaSqlXMLGregorianCalendarMarshalling.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/JavaSqlXMLGregorianCalendarMarshalling.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/JavaTimeJaxbAdapters.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/JavaTimeJaxbAdapters.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/JavaTimeJaxbAdapters.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/JavaTimeJaxbAdapters.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/JavaTimeXMLGregorianCalendarMarshalling.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/JavaTimeXMLGregorianCalendarMarshalling.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/JavaTimeXMLGregorianCalendarMarshalling.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/JavaTimeXMLGregorianCalendarMarshalling.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/JavaUtilJaxbAdapters.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/JavaUtilJaxbAdapters.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/JavaUtilJaxbAdapters.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/JavaUtilJaxbAdapters.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/JodaTimeJaxbAdapters.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/JodaTimeJaxbAdapters.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/JodaTimeJaxbAdapters.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/JodaTimeJaxbAdapters.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/JodaTimeXMLGregorianCalendarMarshalling.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/JodaTimeXMLGregorianCalendarMarshalling.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/JodaTimeXMLGregorianCalendarMarshalling.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/JodaTimeXMLGregorianCalendarMarshalling.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/PersistentEntitiesAdapter.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/PersistentEntitiesAdapter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/PersistentEntitiesAdapter.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/PersistentEntitiesAdapter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/PersistentEntityAdapter.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/PersistentEntityAdapter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/PersistentEntityAdapter.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/PersistentEntityAdapter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/jaxb/PrimitiveJaxbAdapters.adoc b/antora/components/refguide/modules/applib/pages/index/jaxb/PrimitiveJaxbAdapters.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/jaxb/PrimitiveJaxbAdapters.adoc
rename to antora/components/refguide/modules/applib/pages/index/jaxb/PrimitiveJaxbAdapters.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutData.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/ActionLayoutData.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutData.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/ActionLayoutData.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutDataOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/ActionLayoutDataOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/ActionLayoutDataOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/ActionLayoutDataOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutData.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutData.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutDataOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/CollectionLayoutDataOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/CollectionLayoutDataOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/CollectionLayoutDataOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/CssClassFaPosition.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/CssClassFaPosition.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/CssClassFaPosition.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/CssClassFaPosition.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/DomainObjectLayoutData.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/DomainObjectLayoutData.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/DomainObjectLayoutData.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/DomainObjectLayoutData.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/DomainObjectLayoutDataOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/DomainObjectLayoutDataOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/DomainObjectLayoutDataOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/DomainObjectLayoutDataOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/FieldSet.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/FieldSet.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/FieldSet.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/FieldSet.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/FieldSetOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/FieldSetOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/FieldSetOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/FieldSetOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/HasBookmarking.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/HasBookmarking.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/HasBookmarking.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/HasBookmarking.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/HasCssClass.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/HasCssClass.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/HasCssClass.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/HasCssClass.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/HasCssClassFa.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/HasCssClassFa.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/HasCssClassFa.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/HasCssClassFa.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/HasDescribedAs.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/HasDescribedAs.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/HasDescribedAs.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/HasDescribedAs.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/HasHidden.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/HasHidden.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/HasHidden.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/HasHidden.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/HasNamed.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/HasNamed.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/HasNamed.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/HasNamed.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/MemberRegion.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/MemberRegion.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/MemberRegion.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/MemberRegion.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/MemberRegionOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/MemberRegionOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/MemberRegionOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/MemberRegionOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/Owned.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/Owned.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/Owned.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/Owned.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/Owner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/Owner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/Owner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/Owner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/PropertyLayoutData.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/PropertyLayoutData.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/PropertyLayoutData.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/PropertyLayoutData.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutData.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutData.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutDataOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/ServiceActionLayoutDataOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/component/ServiceActionLayoutDataOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/component/ServiceActionLayoutDataOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/Grid.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/Grid.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/Grid.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/Grid.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/GridAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/GridAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/GridAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/GridAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ClearFix.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFix.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ClearFix.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFix.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ClearFixHidden.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixHidden.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ClearFixHidden.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixHidden.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ClearFixVisible.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixVisible.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ClearFixVisible.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixVisible.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Col.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Col.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Element.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Element.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Element.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Element.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ElementAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ElementAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3ElementAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3ElementAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Grid.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Grid.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Grid.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Grid.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Row.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Row.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3RowContent.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3RowContent.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3RowContentOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3RowContentOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3RowOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3RowOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Tab.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3Tab.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3TabGroup.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3TabGroup.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3TabGroupOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroupOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3TabGroupOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroupOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3TabOwner.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabOwner.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/BS3TabOwner.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabOwner.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/HasCssId.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/HasCssId.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/HasCssId.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/HasCssId.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/Size.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/Size.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/Size.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/Size.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/SizeSpan.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/SizeSpan.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/SizeSpan.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/SizeSpan.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/WithinGrid.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/WithinGrid.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/grid/bootstrap3/WithinGrid.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/WithinGrid.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/links/Link.adoc b/antora/components/refguide/modules/applib/pages/index/layout/links/Link.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/links/Link.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/links/Link.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/HasNamed.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/HasNamed.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/HasNamed.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/HasNamed.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/Menu.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/Menu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/Menu.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/Menu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuBar.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuBar.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuBar.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuBar.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuBars.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuBars.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuBars.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuBars.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuBarsAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuBarsAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuBarsAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuBarsAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuSection.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuSection.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/MenuSection.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/MenuSection.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3Menu.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3Menu.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3MenuBar.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3MenuBar.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3MenuBars.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3MenuBars.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3MenuSection.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/layout/menubars/bootstrap3/BS3MenuSection.adoc
rename to antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/MixinConstants.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/MixinConstants.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/MixinConstants.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/MixinConstants.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/dto/Dto.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/dto/Dto.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/dto/Dto.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/dto/Dto.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/dto/Dto_downloadXml.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/dto/Dto_downloadXml.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/dto/Dto_downloadXml.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/dto/Dto_downloadXml.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/dto/Dto_downloadXsd.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/dto/Dto_downloadXsd.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/dto/Dto_downloadXsd.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/dto/Dto_downloadXsd.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/layout/Object_downloadLayoutXml.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/layout/Object_downloadLayoutXml.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/layout/Object_downloadLayoutXml.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/layout/Object_downloadLayoutXml.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/layout/Object_openRestApi.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/layout/Object_openRestApi.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/layout/Object_openRestApi.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/layout/Object_openRestApi.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/layout/Object_rebuildMetamodel.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/layout/Object_rebuildMetamodel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/layout/Object_rebuildMetamodel.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/layout/Object_rebuildMetamodel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/metamodel/Object_downloadMetamodelXml.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/metamodel/Object_downloadMetamodelXml.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/metamodel/Object_downloadMetamodelXml.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/metamodel/Object_downloadMetamodelXml.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/metamodel/Object_objectIdentifier.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/metamodel/Object_objectIdentifier.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/metamodel/Object_objectIdentifier.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/metamodel/Object_objectIdentifier.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/metamodel/Object_objectType.adoc b/antora/components/refguide/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/metamodel/Object_objectType.adoc
rename to antora/components/refguide/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/AllInstancesQuery.adoc b/antora/components/refguide/modules/applib/pages/index/query/AllInstancesQuery.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/query/AllInstancesQuery.adoc
rename to antora/components/refguide/modules/applib/pages/index/query/AllInstancesQuery.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/NamedQuery.adoc b/antora/components/refguide/modules/applib/pages/index/query/NamedQuery.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/query/NamedQuery.adoc
rename to antora/components/refguide/modules/applib/pages/index/query/NamedQuery.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/Query.adoc b/antora/components/refguide/modules/applib/pages/index/query/Query.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/query/Query.adoc
rename to antora/components/refguide/modules/applib/pages/index/query/Query.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/query/QueryRange.adoc b/antora/components/refguide/modules/applib/pages/index/query/QueryRange.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/query/QueryRange.adoc
rename to antora/components/refguide/modules/applib/pages/index/query/QueryRange.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/DomainChangeRecord.adoc b/antora/components/refguide/modules/applib/pages/index/services/DomainChangeRecord.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/DomainChangeRecord.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/DomainChangeRecord.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/MethodReferences.adoc b/antora/components/refguide/modules/applib/pages/index/services/MethodReferences.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/MethodReferences.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/MethodReferences.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/RepresentsInteractionMemberExecution.adoc b/antora/components/refguide/modules/applib/pages/index/services/RepresentsInteractionMemberExecution.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/RepresentsInteractionMemberExecution.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/RepresentsInteractionMemberExecution.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/acceptheader/AcceptHeaderService.adoc b/antora/components/refguide/modules/applib/pages/index/services/acceptheader/AcceptHeaderService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/acceptheader/AcceptHeaderService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/acceptheader/AcceptHeaderService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/acceptheader/hooks/AcceptHeaderService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/acceptheader/hooks/AcceptHeaderService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/appfeat/ApplicationFeatureRepository.adoc b/antora/components/refguide/modules/applib/pages/index/services/appfeat/ApplicationFeatureRepository.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/appfeat/ApplicationFeatureRepository.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/appfeat/ApplicationFeatureRepository.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/appfeat/ApplicationMemberType.adoc b/antora/components/refguide/modules/applib/pages/index/services/appfeat/ApplicationMemberType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/appfeat/ApplicationMemberType.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/appfeat/ApplicationMemberType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/appfeat/hooks/ApplicationFeatureRepository_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/Bookmark.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/Bookmark.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmark/Bookmark.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmark/Bookmark.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkHolder.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkHolder.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkHolder.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkHolder.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkHolder_lookup.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkHolder_lookup.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkHolder_lookup.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkHolder_lookup.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkHolder_object.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkHolder_object.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkHolder_object.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkHolder_object.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkService.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmark/BookmarkService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/BookmarkUiService.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmarkui/BookmarkUiService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/BookmarkUiService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmarkui/BookmarkUiService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmarkui/hooks/BookmarkUiService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmarkui/hooks/BookmarkUiService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmarkui/hooks/BookmarkUiService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/bookmarkui/hooks/BookmarkUiService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/bookmarkui/hooks/BookmarkUiService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/clock/ClockService.adoc b/antora/components/refguide/modules/applib/pages/index/services/clock/ClockService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/clock/ClockService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/clock/ClockService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/clock/hooks/ClockService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/command/Command.adoc b/antora/components/refguide/modules/applib/pages/index/services/command/Command.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/command/Command.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/command/Command.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/command/CommandExecutorService.adoc b/antora/components/refguide/modules/applib/pages/index/services/command/CommandExecutorService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/command/CommandExecutorService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/command/CommandExecutorService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/command/CommandOutcomeHandler.adoc b/antora/components/refguide/modules/applib/pages/index/services/command/CommandOutcomeHandler.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/command/CommandOutcomeHandler.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/command/CommandOutcomeHandler.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/command/hooks/CommandExecutorService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/command/hooks/CommandExecutorService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/command/hooks/CommandExecutorService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/command/hooks/CommandExecutorService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/command/hooks/CommandExecutorService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/HasCommandDto.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/HasCommandDto.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/HasCommandDto.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/HasCommandDto.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/conmap/UserDataKeys.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/UserDataKeys.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/conmap/UserDataKeys.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/UserDataKeys.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/CommandDtoProcessor.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/CommandDtoProcessor.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/CommandDtoProcessor.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/CommandDtoProcessor.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/CommandDtoProcessorForActionAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/CommandDtoProcessorForActionAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/CommandDtoProcessorForActionAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/CommandDtoProcessorForActionAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/CommandDtoProcessorForPropertyAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/CommandDtoProcessorForPropertyAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/CommandDtoProcessorForPropertyAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/CommandDtoProcessorForPropertyAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/spi/CommandDtoProcessorService.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/spi/CommandDtoProcessorService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorServiceIdentity.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/confview/ConfigurationMenu.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/confview/ConfigurationMenu.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/confview/ConfigurationProperty.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationProperty.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/confview/ConfigurationProperty.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationProperty.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/confview/ConfigurationViewService.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationViewService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/confview/ConfigurationViewService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationViewService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/conmap/ContentMappingService.adoc b/antora/components/refguide/modules/applib/pages/index/services/conmap/ContentMappingService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/conmap/ContentMappingService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/conmap/ContentMappingService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/email/EmailService.adoc b/antora/components/refguide/modules/applib/pages/index/services/email/EmailService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/email/EmailService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/email/EmailService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/email/hooks/EmailService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/error/ErrorDetails.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/ErrorDetails.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/error/ErrorDetails.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/error/ErrorDetails.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/error/ErrorReportingService.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/ErrorReportingService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/error/ErrorReportingService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/error/ErrorReportingService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/error/SimpleTicket.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/SimpleTicket.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/error/SimpleTicket.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/error/SimpleTicket.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/error/Ticket.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/Ticket.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/error/Ticket.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/error/Ticket.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/eventbus/EventBusService.adoc b/antora/components/refguide/modules/applib/pages/index/services/eventbus/EventBusService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/eventbus/EventBusService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/eventbus/EventBusService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/eventbus/hooks/EventBusService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/eventbus/hooks/EventBusService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/Category.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/Category.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/Category.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/Category.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizer.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizer.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizer.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizer.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerForType.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerForType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerForType.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerForType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerService.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/ExceptionRecognizerService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/Recognition.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/Recognition.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/Recognition.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/Recognition.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizerService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizerService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizerService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizerService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizerService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/factory/FactoryService.adoc b/antora/components/refguide/modules/applib/pages/index/services/factory/FactoryService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/factory/FactoryService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/factory/FactoryService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/GridLoaderService.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/GridLoaderService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/GridLoaderService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/GridLoaderService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/GridService.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/GridService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/GridService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/GridService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/GridSystemService.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/GridSystemService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/GridSystemService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/GridSystemService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/health/Health.adoc b/antora/components/refguide/modules/applib/pages/index/services/health/Health.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/health/Health.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/health/Health.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/health/HealthCheckService.adoc b/antora/components/refguide/modules/applib/pages/index/services/health/HealthCheckService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/health/HealthCheckService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/health/HealthCheckService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/health/hooks/HealthCheckService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/health/hooks/HealthCheckService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/health/hooks/HealthCheckService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/health/hooks/HealthCheckService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/health/hooks/HealthCheckService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/hint/HintIdProvider.adoc b/antora/components/refguide/modules/applib/pages/index/services/hint/HintIdProvider.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/hint/HintIdProvider.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/hint/HintIdProvider.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/hint/HintStore.adoc b/antora/components/refguide/modules/applib/pages/index/services/hint/HintStore.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/hint/HintStore.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/hint/HintStore.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintIdProvider_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintIdProvider_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintIdProvider_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintIdProvider_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintIdProvider_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintStore_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintStore_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintStore_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/hint/hooks/HintStore_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/hint/hooks/HintStore_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/homepage/HomePageResolverService.adoc b/antora/components/refguide/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/homepage/HomePageResolverService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/LocaleProvider.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/LocaleProvider.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/LocaleProvider.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/LocaleProvider.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/Mode.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/Mode.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/Mode.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/Mode.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/TranslatableString.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslatableString.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/TranslatableString.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/TranslatableString.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/TranslationService.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/TranslationService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/TranslationsResolver.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationsResolver.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/TranslationsResolver.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationsResolver.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/ActionInvocation.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/ActionInvocation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/ActionInvocation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/ActionInvocation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/Execution.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/Execution.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/Execution.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/Execution.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/ExecutionContext.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/ExecutionContext.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/ExecutionContext.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/ExecutionContext.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/Interaction.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/Interaction.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/Interaction.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/Interaction.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/InteractionContext.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/InteractionContext.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/InteractionContext.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/InteractionContext.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/PropertyEdit.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/PropertyEdit.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/PropertyEdit.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/PropertyEdit.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/Sequence.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/Sequence.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/Sequence.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/Sequence.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Execution_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/inject/ServiceInjector.adoc b/antora/components/refguide/modules/applib/pages/index/services/inject/ServiceInjector.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/inject/ServiceInjector.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/inject/ServiceInjector.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/jaxb/JaxbService.adoc b/antora/components/refguide/modules/applib/pages/index/services/jaxb/JaxbService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/jaxb/JaxbService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/jaxb/JaxbService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/layout/LayoutService.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/layout/LayoutService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/layout/LayoutService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/layout/LayoutServiceMenu.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/layout/LayoutServiceMenu.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/layout/Style.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/Style.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/layout/Style.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/layout/Style.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/linking/DeepLinkService.adoc b/antora/components/refguide/modules/applib/pages/index/services/linking/DeepLinkService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/linking/DeepLinkService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/linking/DeepLinkService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/menu/MenuBarsLoaderService.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/menu/MenuBarsLoaderService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/menu/MenuBarsService.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/menu/MenuBarsService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/message/MessageService.adoc b/antora/components/refguide/modules/applib/pages/index/services/message/MessageService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/message/MessageService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/message/MessageService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/message/hooks/MessageService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/BeanSort.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/BeanSort.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/BeanSort.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/BeanSort.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/Config.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/Config.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/Config.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/Config.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/DomainMember.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/DomainMember.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/DomainMember.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/DomainMember.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/DomainModel.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/DomainModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/DomainModel.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/DomainModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/MetaModelService.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/MetaModelService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/MetaModelServiceMenu.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/MetaModelServiceMenu.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelServiceMenu_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelServiceMenu_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelServiceMenu_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelServiceMenu_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelServiceMenu_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metrics/MetricsService.adoc b/antora/components/refguide/modules/applib/pages/index/services/metrics/MetricsService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metrics/MetricsService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metrics/MetricsService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/log/CommandLogger.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/log/CommandLogger.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/log/CommandLogger.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/log/CommandLogger.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/log/EntityChangesLogger.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/log/EntityChangesLogger.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/log/EntityChangesLogger.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/log/EntityChangesLogger.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/log/EntityPropertyChangeLogger.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/log/EntityPropertyChangeLogger.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/log/EntityPropertyChangeLogger.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/log/EntityPropertyChangeLogger.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/log/ExecutionLogger.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/log/ExecutionLogger.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/log/ExecutionLogger.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/log/ExecutionLogger.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/CommandSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/CommandSubscriber.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/CommandSubscriber.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/CommandSubscriber.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityChanges.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChanges.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityChanges.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChanges.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityChangesSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChangesSubscriber.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityChangesSubscriber.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChangesSubscriber.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityPropertyChange.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChange.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityPropertyChange.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChange.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/ExecutionSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/ExecutionSubscriber.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/ExecutionSubscriber.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/ExecutionSubscriber.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/CommandSubscriber_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/CommandSubscriber_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/CommandSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/CommandSubscriber_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/CommandSubscriber_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCache.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCache.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCache.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCache.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCacheControl.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCacheControl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/QueryResultsCacheControl.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCacheControl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCacheControl_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCacheControl_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCacheControl_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCacheControl_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCacheControl_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/registry/InstanceByPriorityComparator.adoc b/antora/components/refguide/modules/applib/pages/index/services/registry/InstanceByPriorityComparator.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/registry/InstanceByPriorityComparator.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/registry/InstanceByPriorityComparator.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc b/antora/components/refguide/modules/applib/pages/index/services/registry/ServiceRegistry.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/registry/ServiceRegistry.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/registry/ServiceRegistry.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/repository/EntityState.adoc b/antora/components/refguide/modules/applib/pages/index/services/repository/EntityState.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/repository/EntityState.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/repository/EntityState.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/repository/RepositoryService.adoc b/antora/components/refguide/modules/applib/pages/index/services/repository/RepositoryService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/repository/RepositoryService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/repository/RepositoryService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/routing/RoutingService.adoc b/antora/components/refguide/modules/applib/pages/index/services/routing/RoutingService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/routing/RoutingService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/routing/RoutingService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/Scratchpad.adoc b/antora/components/refguide/modules/applib/pages/index/services/scratchpad/Scratchpad.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/scratchpad/Scratchpad.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/scratchpad/Scratchpad.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/session/SessionLoggingService.adoc b/antora/components/refguide/modules/applib/pages/index/services/session/SessionLoggingService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/session/SessionLoggingService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/session/SessionLoggingService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/session/SessionLoggingServiceLogging.adoc b/antora/components/refguide/modules/applib/pages/index/services/session/SessionLoggingServiceLogging.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/session/SessionLoggingServiceLogging.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/session/SessionLoggingServiceLogging.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/session/hooks/SessionLoggingService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/session/hooks/SessionLoggingService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/session/hooks/SessionLoggingService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/session/hooks/SessionLoggingService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/session/hooks/SessionLoggingService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/sudo/SudoService.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/SudoService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/sudo/SudoService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/sudo/SudoService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/swagger/Format.adoc b/antora/components/refguide/modules/applib/pages/index/services/swagger/Format.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/swagger/Format.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/swagger/Format.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/swagger/SwaggerService.adoc b/antora/components/refguide/modules/applib/pages/index/services/swagger/SwaggerService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/swagger/SwaggerService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/swagger/SwaggerService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/swagger/Visibility.adoc b/antora/components/refguide/modules/applib/pages/index/services/swagger/Visibility.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/swagger/Visibility.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/swagger/Visibility.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/tablecol/TableColumnOrderForCollectionTypeAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/tablecol/TableColumnOrderForCollectionTypeAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/tablecol/TableColumnOrderForCollectionTypeAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/tablecol/TableColumnOrderForCollectionTypeAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/tablecol/TableColumnOrderService.adoc b/antora/components/refguide/modules/applib/pages/index/services/tablecol/TableColumnOrderService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/tablecol/TableColumnOrderService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/tablecol/TableColumnOrderService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/tablecol/hooks/TableColumnOrderService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/tablecol/hooks/TableColumnOrderService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/tablecol/hooks/TableColumnOrderService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/tablecol/hooks/TableColumnOrderService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/tablecol/hooks/TableColumnOrderService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/title/TitleService.adoc b/antora/components/refguide/modules/applib/pages/index/services/title/TitleService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/title/TitleService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/title/TitleService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/title/hooks/TitleService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/title/hooks/TitleService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/title/hooks/TitleService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/title/hooks/TitleService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/title/hooks/TitleService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/urlencoding/UrlEncodingService.adoc b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/urlencoding/UrlEncodingService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/user/RoleMemento.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/RoleMemento.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/user/RoleMemento.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/user/RoleMemento.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/user/UserMemento.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/UserMemento.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/user/UserMemento.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/user/UserMemento.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/user/UserService.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/UserService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/user/UserService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/user/UserService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/user/hooks/UserService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userprof/UserProfileService.adoc b/antora/components/refguide/modules/applib/pages/index/services/userprof/UserProfileService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userprof/UserProfileService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userprof/UserProfileService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/userprof/hooks/UserProfileService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userprof/hooks/UserProfileService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/userprof/hooks/UserProfileService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userprof/hooks/UserProfileService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userprof/hooks/UserProfileService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/EmailNotificationService.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/EmailNotificationService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/EmailNotificationService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/EmailNotificationService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/UserDetails.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/UserDetails.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/UserDetails.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/UserDetails.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/UserRegistrationService.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/UserRegistrationService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/UserRegistrationService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/UserRegistrationService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/events/EmailEventAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/events/EmailEventAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/events/EmailEventAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/events/EmailEventAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/events/EmailRegistrationEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/events/EmailRegistrationEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/events/EmailRegistrationEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/events/EmailRegistrationEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/events/PasswordResetEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/events/PasswordResetEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/events/PasswordResetEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/events/PasswordResetEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/DisabledException.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/DisabledException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/DisabledException.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/DisabledException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/HiddenException.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/HiddenException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/HiddenException.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/HiddenException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/InvalidException.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/InvalidException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/InvalidException.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/InvalidException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrapperFactory.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/WrapperFactory.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrappingObject.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrappingObject.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrappingObject.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/WrappingObject.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/AsyncControl.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/AsyncControl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/AsyncControl.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/control/AsyncControl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ControlAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ControlAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ControlAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ControlAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExceptionHandler.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ExceptionHandler.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExceptionHandler.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ExceptionHandler.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExceptionHandlerAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ExceptionHandlerAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExceptionHandlerAbstract.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ExceptionHandlerAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExecutionMode.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ExecutionMode.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/ExecutionMode.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/control/ExecutionMode.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/SyncControl.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/SyncControl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/control/SyncControl.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/control/SyncControl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/AccessEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/AccessEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/AccessEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/AccessEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionArgumentEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionArgumentEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionArgumentEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionArgumentEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionInvocationEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionInvocationEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionInvocationEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionInvocationEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionUsabilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionUsabilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionUsabilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionUsabilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionVisibilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionVisibilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ActionVisibilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionVisibilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionAccessEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAccessEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionAccessEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAccessEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionAddToEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAddToEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionAddToEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAddToEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionMethodEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionMethodEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionMethodEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionMethodEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionRemoveFromEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionRemoveFromEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionRemoveFromEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionRemoveFromEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionUsabilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionUsabilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/CollectionUsabilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionUsabilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/InteractionEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/InteractionEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ObjectTitleEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ObjectTitleEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ObjectTitleEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ObjectTitleEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ObjectValidityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ObjectValidityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ObjectValidityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ObjectValidityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ObjectVisibilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ObjectVisibilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ObjectVisibilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ObjectVisibilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ParseValueEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ParseValueEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ParseValueEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ParseValueEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyAccessEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyAccessEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyAccessEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyAccessEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyModifyEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyModifyEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyModifyEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyModifyEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyUsabilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyUsabilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyUsabilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyUsabilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyVisibilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyVisibilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/PropertyVisibilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyVisibilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ProposedHolderEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ProposedHolderEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ProposedHolderEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ProposedHolderEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/UsabilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/UsabilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/UsabilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/UsabilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ValidityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ValidityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/ValidityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ValidityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/VisibilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/VisibilityEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/events/VisibilityEvent.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/events/VisibilityEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/hooks/WrapperFactory_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/hooks/WrapperFactory_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionAdapter.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionAdapter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionAdapter.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionAdapter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionListener.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionListener.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/wrapper/listeners/InteractionListener.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionListener.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionId.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionId.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionId.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionId.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionService.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionState.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionState.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionState.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionState.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionalProcessor.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/TransactionalProcessor.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionalProcessor.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xml/XmlService.adoc b/antora/components/refguide/modules/applib/pages/index/services/xml/XmlService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xml/XmlService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xml/XmlService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xml/hooks/XmlService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService.adoc b/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/XmlSnapshotService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/XmlSnapshotService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService~Snapshot.adoc b/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/XmlSnapshotService~Snapshot.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService~Snapshot.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/XmlSnapshotService~Snapshot.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService~Snapshot~Builder.adoc b/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/XmlSnapshotService~Snapshot~Builder.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/XmlSnapshotService~Snapshot~Builder.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/XmlSnapshotService~Snapshot~Builder.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_010-implementation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_010-implementation.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_010-implementation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/snapshot/SnapshottableWithInclusions.adoc b/antora/components/refguide/modules/applib/pages/index/snapshot/SnapshottableWithInclusions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/snapshot/SnapshottableWithInclusions.adoc
rename to antora/components/refguide/modules/applib/pages/index/snapshot/SnapshottableWithInclusions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/spec/AbstractSpecification.adoc b/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/spec/AbstractSpecification.adoc
rename to antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/spec/AbstractSpecification2.adoc b/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/spec/AbstractSpecification2.adoc
rename to antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/spec/Specification.adoc b/antora/components/refguide/modules/applib/pages/index/spec/Specification.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/spec/Specification.adoc
rename to antora/components/refguide/modules/applib/pages/index/spec/Specification.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/spec/Specification2.adoc b/antora/components/refguide/modules/applib/pages/index/spec/Specification2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/spec/Specification2.adoc
rename to antora/components/refguide/modules/applib/pages/index/spec/Specification2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/spec/SpecificationAnd.adoc b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationAnd.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/spec/SpecificationAnd.adoc
rename to antora/components/refguide/modules/applib/pages/index/spec/SpecificationAnd.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/spec/SpecificationNot.adoc b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationNot.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/spec/SpecificationNot.adoc
rename to antora/components/refguide/modules/applib/pages/index/spec/SpecificationNot.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/spec/SpecificationOr.adoc b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationOr.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/spec/SpecificationOr.adoc
rename to antora/components/refguide/modules/applib/pages/index/spec/SpecificationOr.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/DescriptionType.adoc b/antora/components/refguide/modules/applib/pages/index/types/DescriptionType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/DescriptionType.adoc
rename to antora/components/refguide/modules/applib/pages/index/types/DescriptionType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/types/MemberIdentifierType.adoc b/antora/components/refguide/modules/applib/pages/index/types/MemberIdentifierType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/types/MemberIdentifierType.adoc
rename to antora/components/refguide/modules/applib/pages/index/types/MemberIdentifierType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/types/TargetActionType.adoc b/antora/components/refguide/modules/applib/pages/index/types/TargetActionType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/types/TargetActionType.adoc
rename to antora/components/refguide/modules/applib/pages/index/types/TargetActionType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/types/TargetClassType.adoc b/antora/components/refguide/modules/applib/pages/index/types/TargetClassType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/types/TargetClassType.adoc
rename to antora/components/refguide/modules/applib/pages/index/types/TargetClassType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/Enums.adoc b/antora/components/refguide/modules/applib/pages/index/util/Enums.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/Enums.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/Enums.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/Equality.adoc b/antora/components/refguide/modules/applib/pages/index/util/Equality.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/Equality.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/Equality.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/Hashing.adoc b/antora/components/refguide/modules/applib/pages/index/util/Hashing.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/Hashing.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/Hashing.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/JaxbUtil.adoc b/antora/components/refguide/modules/applib/pages/index/util/JaxbUtil.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/JaxbUtil.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/JaxbUtil.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/ObjectContracts.adoc b/antora/components/refguide/modules/applib/pages/index/util/ObjectContracts.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/ObjectContracts.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/ObjectContracts.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/ReasonBuffer.adoc b/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/ReasonBuffer.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/ReasonBuffer2.adoc b/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/ReasonBuffer2.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/Reasons.adoc b/antora/components/refguide/modules/applib/pages/index/util/Reasons.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/Reasons.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/Reasons.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/TitleBuffer.adoc b/antora/components/refguide/modules/applib/pages/index/util/TitleBuffer.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/TitleBuffer.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/TitleBuffer.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/TitleBufferException.adoc b/antora/components/refguide/modules/applib/pages/index/util/TitleBufferException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/TitleBufferException.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/TitleBufferException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/ToString.adoc b/antora/components/refguide/modules/applib/pages/index/util/ToString.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/ToString.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/ToString.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/hooks/Enums_examples.adoc b/antora/components/refguide/modules/applib/pages/index/util/hooks/Enums_examples.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/hooks/Enums_examples.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/hooks/Enums_examples.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/hooks/ObjectContracts_examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/util/hooks/ObjectContracts_examples-and-usage.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/hooks/ObjectContracts_examples-and-usage.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/hooks/ObjectContracts_examples-and-usage.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/ChangesDtoUtils.adoc b/antora/components/refguide/modules/applib/pages/index/util/schema/ChangesDtoUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/schema/ChangesDtoUtils.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/schema/ChangesDtoUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/CommandDtoUtils.adoc b/antora/components/refguide/modules/applib/pages/index/util/schema/CommandDtoUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/schema/CommandDtoUtils.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/schema/CommandDtoUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc b/antora/components/refguide/modules/applib/pages/index/util/schema/CommonDtoUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/schema/CommonDtoUtils.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/schema/CommonDtoUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc b/antora/components/refguide/modules/applib/pages/index/util/schema/InteractionDtoUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/schema/InteractionDtoUtils.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/schema/InteractionDtoUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/util/schema/MemberExecutionDtoUtils.adoc b/antora/components/refguide/modules/applib/pages/index/util/schema/MemberExecutionDtoUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/util/schema/MemberExecutionDtoUtils.adoc
rename to antora/components/refguide/modules/applib/pages/index/util/schema/MemberExecutionDtoUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/Blob.adoc b/antora/components/refguide/modules/applib/pages/index/value/Blob.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/Blob.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/Blob.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/Clob.adoc b/antora/components/refguide/modules/applib/pages/index/value/Clob.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/Clob.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/Clob.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/HasHtml.adoc b/antora/components/refguide/modules/applib/pages/index/value/HasHtml.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/HasHtml.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/HasHtml.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/LocalResourcePath.adoc b/antora/components/refguide/modules/applib/pages/index/value/LocalResourcePath.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/LocalResourcePath.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/LocalResourcePath.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/Markup.adoc b/antora/components/refguide/modules/applib/pages/index/value/Markup.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/Markup.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/Markup.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/NamedWithMimeType.adoc b/antora/components/refguide/modules/applib/pages/index/value/NamedWithMimeType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/NamedWithMimeType.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/NamedWithMimeType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/OpenUrlStrategy.adoc b/antora/components/refguide/modules/applib/pages/index/value/OpenUrlStrategy.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/OpenUrlStrategy.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/OpenUrlStrategy.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/value/Password.adoc b/antora/components/refguide/modules/applib/pages/index/value/Password.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/value/Password.adoc
rename to antora/components/refguide/modules/applib/pages/index/value/Password.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc b/antora/components/refguide/modules/commons/pages/index/collections/Can.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/collections/Can.adoc
rename to antora/components/refguide/modules/commons/pages/index/collections/Can.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/collections/Cardinality.adoc b/antora/components/refguide/modules/commons/pages/index/collections/Cardinality.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/collections/Cardinality.adoc
rename to antora/components/refguide/modules/commons/pages/index/collections/Cardinality.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/functional/Result.adoc b/antora/components/refguide/modules/commons/pages/index/functional/Result.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/functional/Result.adoc
rename to antora/components/refguide/modules/commons/pages/index/functional/Result.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/having/HasUniqueId.adoc b/antora/components/refguide/modules/commons/pages/index/having/HasUniqueId.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/having/HasUniqueId.adoc
rename to antora/components/refguide/modules/commons/pages/index/having/HasUniqueId.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedAt.adoc b/antora/components/refguide/modules/commons/pages/index/having/HasUpdatedAt.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedAt.adoc
rename to antora/components/refguide/modules/commons/pages/index/having/HasUpdatedAt.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedBy.adoc b/antora/components/refguide/modules/commons/pages/index/having/HasUpdatedBy.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedBy.adoc
rename to antora/components/refguide/modules/commons/pages/index/having/HasUpdatedBy.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/having/HasUsername.adoc b/antora/components/refguide/modules/commons/pages/index/having/HasUsername.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/having/HasUsername.adoc
rename to antora/components/refguide/modules/commons/pages/index/having/HasUsername.adoc
diff --git a/antora/components/system/modules/generated/pages/index/commons/resource/ResourceCoordinates.adoc b/antora/components/refguide/modules/commons/pages/index/resource/ResourceCoordinates.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/commons/resource/ResourceCoordinates.adoc
rename to antora/components/refguide/modules/commons/pages/index/resource/ResourceCoordinates.adoc
diff --git a/antora/components/system/modules/generated/pages/index/core/config/datasources/DataSourceIntrospectionService.adoc b/antora/components/refguide/modules/core/pages/index/config/datasources/DataSourceIntrospectionService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/core/config/datasources/DataSourceIntrospectionService.adoc
rename to antora/components/refguide/modules/core/pages/index/config/datasources/DataSourceIntrospectionService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/core/interaction/session/InteractionFactory.adoc b/antora/components/refguide/modules/core/pages/index/interaction/session/InteractionFactory.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/core/interaction/session/InteractionFactory.adoc
rename to antora/components/refguide/modules/core/pages/index/interaction/session/InteractionFactory.adoc
diff --git a/antora/components/system/modules/generated/pages/index/core/runtimeservices/transaction/TransactionServiceSpring.adoc b/antora/components/refguide/modules/core/pages/index/runtimeservices/transaction/TransactionServiceSpring.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/core/runtimeservices/transaction/TransactionServiceSpring.adoc
rename to antora/components/refguide/modules/core/pages/index/runtimeservices/transaction/TransactionServiceSpring.adoc
diff --git a/antora/components/system/modules/generated/pages/index/core/runtimeservices/xml/XmlServiceDefault.adoc b/antora/components/refguide/modules/core/pages/index/runtimeservices/xml/XmlServiceDefault.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/core/runtimeservices/xml/XmlServiceDefault.adoc
rename to antora/components/refguide/modules/core/pages/index/runtimeservices/xml/XmlServiceDefault.adoc
diff --git a/antora/components/system/modules/generated/pages/index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc b/antora/components/refguide/modules/core/pages/index/transaction/changetracking/EntityChangeTrackerDefault.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc
rename to antora/components/refguide/modules/core/pages/index/transaction/changetracking/EntityChangeTrackerDefault.adoc
diff --git a/antora/components/system/modules/generated/pages/index/core/transaction/events/TransactionAfterCompletionEvent.adoc b/antora/components/refguide/modules/core/pages/index/transaction/events/TransactionAfterCompletionEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/core/transaction/events/TransactionAfterCompletionEvent.adoc
rename to antora/components/refguide/modules/core/pages/index/transaction/events/TransactionAfterCompletionEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/CommandSubscriberForJdo.adoc b/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/CommandSubscriberForJdo.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/CommandSubscriberForJdo.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandlog/impl/CommandSubscriberForJdo.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.adoc b/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/IsisModuleExtCommandLogImpl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandlog/impl/IsisModuleExtCommandLogImpl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/mixins/HasUniqueId_command.adoc b/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUniqueId_command.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/mixins/HasUniqueId_command.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUniqueId_command.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.adoc b/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUsername_recentCommandsByUser.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUsername_recentCommandsByUser.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/ui/CommandServiceMenu.adoc b/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/ui/CommandServiceMenu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandlog/impl/ui/CommandServiceMenu.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandlog/impl/ui/CommandServiceMenu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/config/PrimaryConfig.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/config/PrimaryConfig.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/config/PrimaryConfig.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/config/PrimaryConfig.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/mixins/Object_openOnSecondary.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/mixins/Object_openOnSecondary.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/mixins/Object_openOnSecondary.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/mixins/Object_openOnSecondary.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/restapi/CommandRetrievalService.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/restapi/CommandRetrievalService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/SecondaryStatus.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/SecondaryStatus.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/SecondaryStatus.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/SecondaryStatus.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analyser/CommandReplayAnalyserResult.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/analysis/CommandReplayAnalysisService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/clock/TickingClockService.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/clock/TickingClockService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/clock/TickingClockService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/clock/TickingClockService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/config/SecondaryConfig.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/config/SecondaryConfig.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/config/SecondaryConfig.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/config/SecondaryConfig.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/fetch/CommandFetcher.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/fetch/CommandFetcher.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/fetch/CommandFetcher.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/fetch/CommandFetcher.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/job/ReplicateAndReplayJob.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/job/ReplicateAndReplayJob.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/job/SecondaryStatusData.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/job/SecondaryStatusData.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/job/SecondaryStatusData.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/job/SecondaryStatusData.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/mixins/CommandJdo_exclude.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandJdo_exclude.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/mixins/CommandJdo_exclude.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandJdo_exclude.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/mixins/CommandJdo_replayQueue.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/mixins/Object_openOnPrimary.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/mixins/Object_openOnPrimary.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/mixins/Object_openOnPrimary.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/spi/ReplayCommandExecutionController.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/spi/ReplayCommandExecutionController.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/spi/ReplayCommandExecutionController.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/spi/ReplayCommandExecutionController.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/cors/impl/IsisModuleExtCorsImpl.adoc b/antora/components/refguide/modules/extensions/pages/index/cors/impl/IsisModuleExtCorsImpl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/cors/impl/IsisModuleExtCorsImpl.adoc
rename to antora/components/refguide/modules/extensions/pages/index/cors/impl/IsisModuleExtCorsImpl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/CalendarEventable.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/CalendarEventable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/CalendarEventable.adoc
rename to antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/CalendarEventable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/Calendarable.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/Calendarable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/Calendarable.adoc
rename to antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/Calendarable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/IsisModuleExtFullCalendarApplib.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/IsisModuleExtFullCalendarApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/IsisModuleExtFullCalendarApplib.adoc
rename to antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/IsisModuleExtFullCalendarApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/spi/CalendarableDereferencingService.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/spi/CalendarableDereferencingService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/spi/CalendarableDereferencingService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/spi/CalendarableDereferencingService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/value/CalendarEvent.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/value/CalendarEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/fullcalendar/applib/value/CalendarEvent.adoc
rename to antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/value/CalendarEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc
rename to antora/components/refguide/modules/extensions/pages/index/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc b/antora/components/refguide/modules/extensions/pages/index/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc
rename to antora/components/refguide/modules/extensions/pages/index/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc b/antora/components/refguide/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
rename to antora/components/refguide/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc b/antora/components/refguide/modules/extensions/pages/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc
rename to antora/components/refguide/modules/extensions/pages/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsClient.adoc b/antora/components/refguide/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsClient.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsClient.adoc
rename to antora/components/refguide/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsClient.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsResponse.adoc b/antora/components/refguide/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsResponse.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/jaxrsclient/applib/client/JaxRsResponse.adoc
rename to antora/components/refguide/modules/extensions/pages/index/jaxrsclient/applib/client/JaxRsResponse.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/modelannotation/applib/IsisModuleIncModelApplib.adoc b/antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/IsisModuleIncModelApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/modelannotation/applib/IsisModuleIncModelApplib.adoc
rename to antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/IsisModuleIncModelApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/modelannotation/applib/annotation/Model.adoc b/antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/annotation/Model.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/modelannotation/applib/annotation/Model.adoc
rename to antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/annotation/Model.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/modelannotation/metamodel/IsisModuleExtModelAnnotation.adoc b/antora/components/refguide/modules/extensions/pages/index/modelannotation/metamodel/IsisModuleExtModelAnnotation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/modelannotation/metamodel/IsisModuleExtModelAnnotation.adoc
rename to antora/components/refguide/modules/extensions/pages/index/modelannotation/metamodel/IsisModuleExtModelAnnotation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.adoc b/antora/components/refguide/modules/extensions/pages/index/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.adoc
rename to antora/components/refguide/modules/extensions/pages/index/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/modelannotation/metamodel/services/IncubatorMetaModelPlugin.adoc b/antora/components/refguide/modules/extensions/pages/index/modelannotation/metamodel/services/IncubatorMetaModelPlugin.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/modelannotation/metamodel/services/IncubatorMetaModelPlugin.adoc
rename to antora/components/refguide/modules/extensions/pages/index/modelannotation/metamodel/services/IncubatorMetaModelPlugin.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/quartz/IsisModuleExtQuartzImpl.adoc b/antora/components/refguide/modules/extensions/pages/index/quartz/IsisModuleExtQuartzImpl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/quartz/IsisModuleExtQuartzImpl.adoc
rename to antora/components/refguide/modules/extensions/pages/index/quartz/IsisModuleExtQuartzImpl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/quartz/context/JobExecutionData.adoc b/antora/components/refguide/modules/extensions/pages/index/quartz/context/JobExecutionData.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/quartz/context/JobExecutionData.adoc
rename to antora/components/refguide/modules/extensions/pages/index/quartz/context/JobExecutionData.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/quartz/spring/AutowiringSpringBeanJobFactory.adoc b/antora/components/refguide/modules/extensions/pages/index/quartz/spring/AutowiringSpringBeanJobFactory.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/quartz/spring/AutowiringSpringBeanJobFactory.adoc
rename to antora/components/refguide/modules/extensions/pages/index/quartz/spring/AutowiringSpringBeanJobFactory.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/ActionParameterListBuilder.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/ActionParameterListBuilder.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/ActionParameterListBuilder.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/ActionParameterListBuilder.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/IsisModuleExtRestClient.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/IsisModuleExtRestClient.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/IsisModuleExtRestClient.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/IsisModuleExtRestClient.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/ResponseDigest.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/ResponseDigest.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/ResponseDigest.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClient.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/RestfulClient.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClient.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/RestfulClient.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClientConfig.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/RestfulClientConfig.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClientConfig.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/RestfulClientConfig.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClientException.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/RestfulClientException.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/RestfulClientException.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/RestfulClientException.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/auth/BasicAuthFilter.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/auth/BasicAuthFilter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/auth/BasicAuthFilter.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/auth/BasicAuthFilter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/log/ClientConversationFilter.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/log/ClientConversationFilter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/log/ClientConversationFilter.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/log/ClientConversationFilter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/restclient/log/ClientConversationLogger.adoc b/antora/components/refguide/modules/extensions/pages/index/restclient/log/ClientConversationLogger.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/restclient/log/ClientConversationLogger.adoc
rename to antora/components/refguide/modules/extensions/pages/index/restclient/log/ClientConversationLogger.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/IsisModuleExtSecmanApi.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/IsisModuleExtSecmanApi.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/SecmanConfiguration.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/SecmanConfiguration.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/SecmanConfiguration.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/SecmanConfiguration.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/SecurityRealm.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/SecurityRealm.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/SecurityRealm.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/SecurityRealm.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/SecurityRealmCharacteristic.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/SecurityRealmCharacteristic.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/SecurityRealmCharacteristic.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/SecurityRealmCharacteristic.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/SecurityRealmService.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/SecurityRealmService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/SecurityRealmService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/SecurityRealmService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/encryption/PasswordEncryptionService.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/encryption/PasswordEncryptionService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/encryption/PasswordEncryptionServiceNone.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionServiceNone.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/encryption/PasswordEncryptionServiceNone.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionServiceNone.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/events/UserCreatedEvent.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/events/UserCreatedEvent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/events/UserCreatedEvent.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/events/UserCreatedEvent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermission.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermission.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermission.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionMode.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionMode.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionMode.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionMode.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionRepository.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRepository.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionRepository.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRepository.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionRule.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRule.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionRule.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRule.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValue.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValue.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValue.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValue.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValueSet.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValueSet.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/ApplicationPermissionValueSet.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValueSet.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationService.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationServiceAbstract.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationServiceAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationServiceAbstract.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationServiceAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationServiceAllowBeatsVeto.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationServiceVetoBeatsAllow.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRole.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/role/ApplicationRole.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRole.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/role/ApplicationRole.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRoleRepository.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/role/ApplicationRoleRepository.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/role/ApplicationRoleRepository.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/role/ApplicationRoleRepository.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancy.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancy.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancy.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancy.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancyEvaluator.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyEvaluator.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancyEvaluator.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyEvaluator.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancyRepository.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyRepository.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/ApplicationTenancyRepository.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyRepository.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/HasAtPath.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/HasAtPath.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/tenancy/HasAtPath.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/HasAtPath.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/AccountType.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/user/AccountType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/user/AccountType.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/user/AccountType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUser.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/user/ApplicationUser.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUser.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/user/ApplicationUser.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUserRepository.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/user/ApplicationUserRepository.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUserRepository.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/user/ApplicationUserRepository.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUserStatus.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/user/ApplicationUserStatus.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/api/user/ApplicationUserStatus.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/api/user/ApplicationUserStatus.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/IsisModuleExtSecmanPersistenceJdo.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/IsisModuleExtSecmanPersistenceJdo.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedSecurityModuleService.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedSecurityModuleService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedSecurityModuleService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedSecurityModuleService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/GlobalTenancy.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/GlobalTenancy.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/GlobalTenancy.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/GlobalTenancy.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanAdminUser.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanAdminUser.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanAdminUser.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanAdminUser.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/IsisModuleExtSecmanPersistenceJpa.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/IsisModuleExtSecmanPersistenceJpa.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedSecurityModuleService.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedSecurityModuleService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/SeedSecurityModuleService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedSecurityModuleService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/GlobalTenancy.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/GlobalTenancy.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/GlobalTenancy.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/GlobalTenancy.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanAdminUser.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanAdminUser.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanAdminUser.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanAdminUser.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/model/IsisModuleExtSecmanModel.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/model/IsisModuleExtSecmanModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/model/IsisModuleExtSecmanModel.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/model/IsisModuleExtSecmanModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/model/app/user/MeService.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/model/app/user/MeService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/model/app/user/MeService.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/model/app/user/MeService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/secman/shiro/util/ShiroUtils.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/shiro/util/ShiroUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/secman/shiro/util/ShiroUtils.adoc
rename to antora/components/refguide/modules/extensions/pages/index/secman/shiro/util/ShiroUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc b/antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc
rename to antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/shirorealmldap/realm/impl/IsisLdapRealm.adoc b/antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/shirorealmldap/realm/impl/IsisLdapRealm.adoc
rename to antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.adoc b/antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.adoc
rename to antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/config/PdfJsConfig.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/config/PdfJsConfig.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/config/PdfJsConfig.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/config/PdfJsConfig.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/config/Scale.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/config/Scale.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/config/Scale.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/config/Scale.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc
diff --git a/antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc
rename to antora/components/refguide/modules/extensions/pages/index/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc
diff --git a/antora/components/system/modules/generated/nav.adoc b/antora/components/refguide/modules/generated/nav.adoc
similarity index 100%
rename from antora/components/system/modules/generated/nav.adoc
rename to antora/components/refguide/modules/generated/nav.adoc
diff --git a/antora/components/system/modules/generated/pages/system-overview.adoc b/antora/components/refguide/modules/generated/pages/system-overview.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/system-overview.adoc
rename to antora/components/refguide/modules/generated/pages/system-overview.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/applib/IsisModulePersistenceJdoApplib.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/applib/IsisModulePersistenceJdoApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/applib/IsisModulePersistenceJdoApplib.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/applib/IsisModulePersistenceJdoApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/applib/services/JdoSupportService.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/applib/services/JdoSupportService.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/applib/services/JdoSupportService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/IsisModuleJdoDatanucleus.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/IsisModuleJdoDatanucleus.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/IsisModuleJdoDatanucleus.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/IsisModuleJdoDatanucleus.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/dialect/DnJdoDialect.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/dialect/DnJdoDialect.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/dialect/DnJdoDialect.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/dialect/DnJdoDialect.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisBookmarkConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisBookmarkConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisBookmarkConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisBookmarkConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisLocalResourcePathConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisLocalResourcePathConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisLocalResourcePathConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisLocalResourcePathConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisMarkupConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisMarkupConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisMarkupConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisMarkupConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisPasswordConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisPasswordConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/applib/IsisPasswordConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/applib/IsisPasswordConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/image/JavaAwtBufferedImageByteArrayConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisChangesDtoConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisChangesDtoConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisChangesDtoConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisChangesDtoConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisCommandDtoConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisCommandDtoConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisCommandDtoConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisCommandDtoConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisInteractionDtoConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisInteractionDtoConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisInteractionDtoConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisInteractionDtoConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/schema/v2/IsisOidDtoConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/time/IsoOffsetTimeConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/time/IsoOffsetTimeConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/time/IsoOffsetTimeConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/time/IsoOffsetTimeConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/time/IsoZonedDateTimeConverter.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/time/IsoZonedDateTimeConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/typeconverters/time/IsoZonedDateTimeConverter.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/typeconverters/time/IsoZonedDateTimeConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/valuemappings/applib/ByteArrayBlobRdbmsMapping.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/valuemappings/applib/ByteArrayBlobRdbmsMapping.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/valuemappings/applib/ByteArrayBlobRdbmsMapping.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/valuemappings/applib/ByteArrayBlobRdbmsMapping.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/valuetypes/applib/IsisBlobMapping.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/valuetypes/applib/IsisBlobMapping.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/valuetypes/applib/IsisBlobMapping.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/valuetypes/applib/IsisBlobMapping.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/valuetypes/applib/IsisClobMapping.adoc b/antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/valuetypes/applib/IsisClobMapping.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jdo/datanucleus/valuetypes/applib/IsisClobMapping.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jdo/datanucleus/valuetypes/applib/IsisClobMapping.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jpa/applib/integration/JpaEntityInjectionPointResolver.adoc b/antora/components/refguide/modules/persistence/pages/index/jpa/applib/integration/JpaEntityInjectionPointResolver.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jpa/applib/integration/JpaEntityInjectionPointResolver.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jpa/applib/integration/JpaEntityInjectionPointResolver.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jpa/applib/services/JpaSupportService.adoc b/antora/components/refguide/modules/persistence/pages/index/jpa/applib/services/JpaSupportService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jpa/applib/services/JpaSupportService.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jpa/applib/services/JpaSupportService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.adoc b/antora/components/refguide/modules/persistence/pages/index/jpa/eclipselink/IsisModuleJpaEclipselink.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.adoc
rename to antora/components/refguide/modules/persistence/pages/index/jpa/eclipselink/IsisModuleJpaEclipselink.adoc
diff --git a/antora/components/system/modules/generated/pages/index/schema/IsisModuleSchema.adoc b/antora/components/refguide/modules/schema/pages/index/IsisModuleSchema.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/schema/IsisModuleSchema.adoc
rename to antora/components/refguide/modules/schema/pages/index/IsisModuleSchema.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/bypass/IsisModuleSecurityBypass.adoc b/antora/components/refguide/modules/security/pages/index/bypass/IsisModuleSecurityBypass.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/bypass/IsisModuleSecurityBypass.adoc
rename to antora/components/refguide/modules/security/pages/index/bypass/IsisModuleSecurityBypass.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/bypass/authentication/AuthenticatorBypass.adoc b/antora/components/refguide/modules/security/pages/index/bypass/authentication/AuthenticatorBypass.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/bypass/authentication/AuthenticatorBypass.adoc
rename to antora/components/refguide/modules/security/pages/index/bypass/authentication/AuthenticatorBypass.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/bypass/authorization/AuthorizorBypass.adoc b/antora/components/refguide/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/bypass/authorization/AuthorizorBypass.adoc
rename to antora/components/refguide/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/keycloak/IsisModuleSecurityKeycloak.adoc b/antora/components/refguide/modules/security/pages/index/keycloak/IsisModuleSecurityKeycloak.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/keycloak/IsisModuleSecurityKeycloak.adoc
rename to antora/components/refguide/modules/security/pages/index/keycloak/IsisModuleSecurityKeycloak.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/keycloak/authentication/AuthenticatorKeycloak.adoc b/antora/components/refguide/modules/security/pages/index/keycloak/authentication/AuthenticatorKeycloak.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/keycloak/authentication/AuthenticatorKeycloak.adoc
rename to antora/components/refguide/modules/security/pages/index/keycloak/authentication/AuthenticatorKeycloak.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/keycloak/authorization/AuthorizorKeycloak.adoc b/antora/components/refguide/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/keycloak/authorization/AuthorizorKeycloak.adoc
rename to antora/components/refguide/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/keycloak/webmodule/KeycloakFilter.adoc b/antora/components/refguide/modules/security/pages/index/keycloak/webmodule/KeycloakFilter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/keycloak/webmodule/KeycloakFilter.adoc
rename to antora/components/refguide/modules/security/pages/index/keycloak/webmodule/KeycloakFilter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/keycloak/webmodule/WebModuleKeycloak.adoc b/antora/components/refguide/modules/security/pages/index/keycloak/webmodule/WebModuleKeycloak.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/keycloak/webmodule/WebModuleKeycloak.adoc
rename to antora/components/refguide/modules/security/pages/index/keycloak/webmodule/WebModuleKeycloak.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/shiro/IsisModuleSecurityShiro.adoc b/antora/components/refguide/modules/security/pages/index/shiro/IsisModuleSecurityShiro.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/shiro/IsisModuleSecurityShiro.adoc
rename to antora/components/refguide/modules/security/pages/index/shiro/IsisModuleSecurityShiro.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/shiro/authentication/AuthenticatorShiro.adoc b/antora/components/refguide/modules/security/pages/index/shiro/authentication/AuthenticatorShiro.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/shiro/authentication/AuthenticatorShiro.adoc
rename to antora/components/refguide/modules/security/pages/index/shiro/authentication/AuthenticatorShiro.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/shiro/authorization/AuthorizorShiro.adoc b/antora/components/refguide/modules/security/pages/index/shiro/authorization/AuthorizorShiro.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/shiro/authorization/AuthorizorShiro.adoc
rename to antora/components/refguide/modules/security/pages/index/shiro/authorization/AuthorizorShiro.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/shiro/authorization/IsisPermission.adoc b/antora/components/refguide/modules/security/pages/index/shiro/authorization/IsisPermission.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/shiro/authorization/IsisPermission.adoc
rename to antora/components/refguide/modules/security/pages/index/shiro/authorization/IsisPermission.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/shiro/authorization/IsisPermissionResolver.adoc b/antora/components/refguide/modules/security/pages/index/shiro/authorization/IsisPermissionResolver.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/shiro/authorization/IsisPermissionResolver.adoc
rename to antora/components/refguide/modules/security/pages/index/shiro/authorization/IsisPermissionResolver.adoc
diff --git a/antora/components/system/modules/generated/pages/index/security/shiro/webmodule/WebModuleShiro.adoc b/antora/components/refguide/modules/security/pages/index/shiro/webmodule/WebModuleShiro.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/security/shiro/webmodule/WebModuleShiro.adoc
rename to antora/components/refguide/modules/security/pages/index/shiro/webmodule/WebModuleShiro.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/Chained.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/Chained.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/Chained.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/Chained.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/Dflt.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/Dflt.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/Dflt.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/Dflt.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/IsisModuleSubdomainsBaseApplib.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/IsisModuleSubdomainsBaseApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/IsisModuleSubdomainsBaseApplib.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/IsisModuleSubdomainsBaseApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/PowerType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/PowerType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/PowerType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/PowerType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/Titled.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/Titled.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/Titled.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/Titled.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/TitledEnum.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/TitledEnum.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/services/BaseServicesModule.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/services/BaseServicesModule.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/services/BaseServicesModule.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/services/BaseServicesModule.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/services/calendar/CalendarService.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/services/calendar/CalendarService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/services/calendar/CalendarService.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/services/calendar/CalendarService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/applib/types/DescriptionType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/DescriptionType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/applib/types/DescriptionType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/DescriptionType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/FqcnType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/FqcnType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/FqcnType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/FqcnType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/MoneyType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/MoneyType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/MoneyType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/MoneyType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/NameType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/NameType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/NameType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/NameType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/NotesType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/NotesType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/NotesType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/NotesType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/ObjectIdentifierType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/ObjectIdentifierType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/ObjectIdentifierType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/ObjectIdentifierType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/PercentageType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/PercentageType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/PercentageType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/PercentageType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/ProperNameType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/ProperNameType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/ProperNameType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/ProperNameType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/ReferenceType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/ReferenceType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/ReferenceType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/ReferenceType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/TitleType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/TitleType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/TitleType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/TitleType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/UrlTemplateType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/UrlTemplateType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/UrlTemplateType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/UrlTemplateType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/UserNameType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/UserNameType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/UserNameType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/UserNameType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/XxxType.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/types/XxxType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/types/XxxType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/types/XxxType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/ClassUtils.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/ClassUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/ClassUtils.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/ClassUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/JodaPeriodUtils.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/JodaPeriodUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/JodaPeriodUtils.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/JodaPeriodUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/MathUtils.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/MathUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/MathUtils.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/MathUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/MessageUtils.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/MessageUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/MessageUtils.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/MessageUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/StringUtils.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/StringUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/StringUtils.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/StringUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/TitleBuilder.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/utils/TitleBuilder.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/AbstractInterval.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/valuetypes/AbstractInterval.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/AbstractInterval.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/valuetypes/AbstractInterval.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/LocalDateInterval.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/valuetypes/LocalDateInterval.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/LocalDateInterval.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/valuetypes/LocalDateInterval.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/VT.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/valuetypes/VT.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/valuetypes/VT.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/valuetypes/VT.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithCodeComparable.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithCodeComparable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithCodeComparable.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithCodeComparable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithCodeGetter.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithCodeGetter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithCodeGetter.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithCodeGetter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithCodeUnique.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithCodeUnique.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithCodeUnique.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithCodeUnique.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithDescriptionComparable.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithDescriptionComparable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithDescriptionComparable.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithDescriptionComparable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithDescriptionGetter.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithDescriptionGetter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithDescriptionGetter.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithDescriptionGetter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithDescriptionUnique.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithDescriptionUnique.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithDescriptionUnique.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithDescriptionUnique.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithInterval.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithInterval.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithInterval.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithInterval.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalContiguous.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalContiguous.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalMutable.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalMutable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithIntervalMutable.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalMutable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithNameComparable.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithNameComparable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithNameComparable.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithNameComparable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithNameGetter.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithNameGetter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithNameGetter.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithNameGetter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithNameUnique.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithNameUnique.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithNameUnique.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithNameUnique.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithReferenceComparable.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithReferenceComparable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithReferenceComparable.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithReferenceComparable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithReferenceGetter.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithReferenceGetter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithReferenceGetter.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithReferenceGetter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithReferenceUnique.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithReferenceUnique.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithReferenceUnique.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithReferenceUnique.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithSequence.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithSequence.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithSequence.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithSequence.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithStartDate.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithStartDate.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithStartDate.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithStartDate.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithTitleComparable.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithTitleComparable.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithTitleComparable.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithTitleComparable.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithTitleGetter.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithTitleGetter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithTitleGetter.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithTitleGetter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithTitleUnique.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithTitleUnique.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/base/applib/with/WithTitleUnique.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithTitleUnique.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/AggregationType.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/AggregationType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/AggregationType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/AggregationType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelMetaDataEnabled.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/ExcelMetaDataEnabled.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelMetaDataEnabled.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/ExcelMetaDataEnabled.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelService.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/ExcelService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/ExcelService.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/ExcelService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/HyperLink.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/HyperLink.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/HyperLink.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/HyperLink.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotColumn.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotColumn.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotColumn.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotColumn.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotDecoration.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotDecoration.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotDecoration.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotDecoration.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotRow.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotRow.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotRow.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotRow.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotValue.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotValue.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/PivotValue.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/PivotValue.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/RowHandler.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/RowHandler.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/RowHandler.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/RowHandler.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetContent.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/WorksheetContent.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetContent.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/WorksheetContent.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetSpec.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/WorksheetSpec.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/WorksheetSpec.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/WorksheetSpec.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/AnnotationList.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/AnnotationList.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/AnnotationList.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/AnnotationList.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/AnnotationTriplet.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/AnnotationTriplet.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/AnnotationTriplet.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/AnnotationTriplet.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelFileBlobConverter.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelFileBlobConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelFileBlobConverter.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelFileBlobConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelServiceImpl.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelServiceImpl.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/ExcelServiceImpl.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelServiceImpl.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/Mode.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/Mode.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/Mode.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/Mode.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/PivotUtils.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/PivotUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/PivotUtils.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/PivotUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/SheetPivoter.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/SheetPivoter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/applib/dom/util/SheetPivoter.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/SheetPivoter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixture2.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixtureRowHandler.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixtureRowHandler.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixtureRowHandler.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixtureRowHandler.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixtureWorkbookHandler.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixtureWorkbookHandler.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/testing/ExcelFixtureWorkbookHandler.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/testing/ExcelFixtureWorkbookHandler.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/FixtureAwareRowHandler.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/testing/FixtureAwareRowHandler.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/testing/FixtureAwareRowHandler.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/testing/FixtureAwareRowHandler.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/testing/IsisModuleSubdomainsExcelTesting.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/excel/testing/IsisModuleSubdomainsExcelTesting.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.adoc b/antora/components/refguide/modules/subdomains/pages/index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/spring/applib/IsisModuleSubdomainsSpringApplib.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/BeanDescriptor.adoc b/antora/components/refguide/modules/subdomains/pages/index/spring/applib/service/BeanDescriptor.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/BeanDescriptor.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/spring/applib/service/BeanDescriptor.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/ContextBeans.adoc b/antora/components/refguide/modules/subdomains/pages/index/spring/applib/service/ContextBeans.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/ContextBeans.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/spring/applib/service/ContextBeans.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/SpringBeansService.adoc b/antora/components/refguide/modules/subdomains/pages/index/spring/applib/service/SpringBeansService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/spring/applib/service/SpringBeansService.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/spring/applib/service/SpringBeansService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc b/antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/OutputType.adoc b/antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/service/OutputType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/OutputType.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/service/OutputType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportModel.adoc b/antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/service/XDocReportModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportModel.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/service/XDocReportModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportService.adoc b/antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/service/XDocReportService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/subdomains/xdocreport/applib/service/XDocReportService.adoc
rename to antora/components/refguide/modules/subdomains/pages/index/xdocreport/applib/service/XDocReportService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/IsisModuleTestingFakeDataApplib.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/IsisModuleTestingFakeDataApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/IsisModuleTestingFakeDataApplib.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/IsisModuleTestingFakeDataApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/AbstractRandomValueGenerator.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/AbstractRandomValueGenerator.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/AbstractRandomValueGenerator.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/AbstractRandomValueGenerator.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Addresses.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Addresses.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Addresses.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Addresses.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/BigDecimals.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/BigDecimals.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/BigDecimals.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/BigDecimals.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/BigIntegers.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/BigIntegers.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/BigIntegers.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/BigIntegers.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Books.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Books.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Books.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Books.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Booleans.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Booleans.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Booleans.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Booleans.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Bytes.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Bytes.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Bytes.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Bytes.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Chars.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Chars.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Chars.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Chars.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Collections.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Collections.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Collections.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Collections.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Comms.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Comms.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Comms.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Comms.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/CreditCards.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/CreditCards.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/CreditCards.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/CreditCards.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Doubles.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Doubles.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Doubles.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Doubles.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Enums.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Enums.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Enums.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Enums.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/FakeDataService.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/FakeDataService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/FakeDataService.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/FakeDataService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Floats.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Floats.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Floats.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Floats.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Integers.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Integers.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Integers.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Integers.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/IsisBlobs.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/IsisBlobs.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/IsisBlobs.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/IsisBlobs.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/IsisClobs.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/IsisClobs.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/IsisClobs.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/IsisClobs.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/IsisPasswords.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/IsisPasswords.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/IsisPasswords.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/IsisPasswords.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/J8DateTimes.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/J8DateTimes.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/J8DateTimes.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/J8DateTimes.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/J8LocalDates.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/J8LocalDates.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/J8LocalDates.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/J8LocalDates.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/J8Periods.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/J8Periods.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/J8Periods.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/J8Periods.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JavaSqlDates.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JavaSqlDates.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JavaSqlDates.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JavaSqlDates.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JavaSqlTimestamps.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JavaSqlTimestamps.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JavaSqlTimestamps.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JavaSqlTimestamps.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JavaUtilDates.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JavaUtilDates.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JavaUtilDates.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JavaUtilDates.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JodaDateTimes.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JodaDateTimes.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JodaDateTimes.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JodaDateTimes.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JodaLocalDates.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JodaLocalDates.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JodaLocalDates.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JodaLocalDates.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JodaPeriods.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JodaPeriods.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/JodaPeriods.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/JodaPeriods.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Longs.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Longs.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Longs.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Longs.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Lorem.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Lorem.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Lorem.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Lorem.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Names.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Names.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Names.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Names.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Shorts.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Shorts.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Shorts.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Shorts.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Strings.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Strings.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Strings.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Strings.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Urls.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Urls.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Urls.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Urls.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Uuids.adoc b/antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Uuids.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/fakedata/applib/services/Uuids.adoc
rename to antora/components/refguide/modules/testing/pages/index/fakedata/applib/services/Uuids.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.adoc b/antora/components/refguide/modules/testing/pages/index/h2console/ui/IsisModuleTestingH2ConsoleUi.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.adoc
rename to antora/components/refguide/modules/testing/pages/index/h2console/ui/IsisModuleTestingH2ConsoleUi.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/h2console/ui/services/H2ManagerMenu.adoc b/antora/components/refguide/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/h2console/ui/services/H2ManagerMenu.adoc
rename to antora/components/refguide/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/h2console/ui/webmodule/WebModuleH2Console.adoc b/antora/components/refguide/modules/testing/pages/index/h2console/ui/webmodule/WebModuleH2Console.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/h2console/ui/webmodule/WebModuleH2Console.adoc
rename to antora/components/refguide/modules/testing/pages/index/h2console/ui/webmodule/WebModuleH2Console.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/ExceptionRecognizerTranslate.adoc b/antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/ExceptionRecognizerTranslate.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/ExceptionRecognizerTranslate.adoc
rename to antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/ExceptionRecognizerTranslate.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisIntegrationTestAbstract.adoc b/antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/IsisIntegrationTestAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisIntegrationTestAbstract.adoc
rename to antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/IsisIntegrationTestAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisInteractionHandler.adoc b/antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/IsisInteractionHandler.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/IsisInteractionHandler.adoc
rename to antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/IsisInteractionHandler.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/ThrowableMatchers.adoc b/antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/ThrowableMatchers.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/ThrowableMatchers.adoc
rename to antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/ThrowableMatchers.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/swagger/SwaggerExporter.adoc b/antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/swagger/SwaggerExporter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/swagger/SwaggerExporter.adoc
rename to antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/swagger/SwaggerExporter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/validate/DomainModelValidator.adoc b/antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/validate/DomainModelValidator.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/integtestsupport/applib/validate/DomainModelValidator.adoc
rename to antora/components/refguide/modules/testing/pages/index/integtestsupport/applib/validate/DomainModelValidator.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc b/antora/components/refguide/modules/testing/pages/index/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc
rename to antora/components/refguide/modules/testing/pages/index/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/integration/ObjectFactoryForIntegration.adoc b/antora/components/refguide/modules/testing/pages/index/specsupport/applib/integration/ObjectFactoryForIntegration.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/specsupport/applib/integration/ObjectFactoryForIntegration.adoc
rename to antora/components/refguide/modules/testing/pages/index/specsupport/applib/integration/ObjectFactoryForIntegration.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/specsupport/applib/specs/V.adoc b/antora/components/refguide/modules/testing/pages/index/specsupport/applib/specs/V.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/specsupport/applib/specs/V.adoc
rename to antora/components/refguide/modules/testing/pages/index/specsupport/applib/specs/V.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/FixtureDatumFactoriesForTime.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/PojoTester.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/PojoTester.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/bean/PojoTester.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/bean/PojoTester.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/AbstractApplyToAllContractTest.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/AbstractApplyToAllContractTest.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/AbstractApplyToAllContractTest.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/AbstractApplyToAllContractTest.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAbstract.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAbstract.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/BidirectionalRelationshipContractTestAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/Instantiator.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/Instantiator.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/Instantiator.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/Instantiator.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/InstantiatorSimple.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/InstantiatorSimple.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/InstantiatorSimple.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/InstantiatorSimple.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/Instantiators.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/Instantiators.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/bidir/Instantiators.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/bidir/Instantiators.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/comparable/ComparableContractTest_compareTo.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTester.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/comparable/ComparableContractTester.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/comparable/ComparableContractTester.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/comparable/ComparableContractTester.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/files/Files.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/files/Files.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/files/Files.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/files/Files.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jaxb/JaxbMatchers.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/Imposterisers.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/Imposterisers.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/Imposterisers.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/Imposterisers.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/InjectIntoJMockAction.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/InjectIntoJMockAction.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/InjectIntoJMockAction.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/InjectIntoJMockAction.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/IsisActions.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/IsisActions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/IsisActions.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/IsisActions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JMockActions.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/JMockActions.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JMockActions.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/JMockActions.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/JUnitRuleMockery2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/PostponedAction.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/PostponedAction.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/jmocking/PostponedAction.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/jmocking/PostponedAction.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/soap/SoapEndpointPublishingRule.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointSpec.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/soap/SoapEndpointSpec.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/soap/SoapEndpointSpec.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/soap/SoapEndpointSpec.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAbstract.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAbstract.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/sortedsets/SortedSetsContractTestAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/streams/NullPrintStream.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/streams/NullPrintStream.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/streams/NullPrintStream.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/streams/NullPrintStream.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/CollectUtils.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/CollectUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/CollectUtils.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/CollectUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/IndentPrinter.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/IndentPrinter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/IndentPrinter.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/IndentPrinter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/ReflectUtils.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/ReflectUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/ReflectUtils.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/ReflectUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/StringUtils.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/StringUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/utils/StringUtils.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/utils/StringUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/value/ValueTypeContractTestAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/core/value/ValueTypeContractTestAbstract.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/core/value/ValueTypeContractTestAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/assertions/Asserting.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/assertions/Asserting.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/assertions/Asserting.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/assertions/Asserting.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/matchers/IsisMatchers.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/matchers/IsisMatchers.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/matchers/IsisMatchers.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/matchers/IsisMatchers.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/reflect/ReflectUtils.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/reflect/ReflectUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/reflect/ReflectUtils.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/reflect/ReflectUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/repo/FinderInteraction.adoc b/antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/repo/FinderInteraction.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/testing/unittestsupport/applib/dom/repo/FinderInteraction.adoc
rename to antora/components/refguide/modules/testing/pages/index/unittestsupport/applib/dom/repo/FinderInteraction.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.adoc b/antora/components/refguide/modules/valuetypes/pages/index/asciidoc/applib/IsisModuleValAsciidocApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/asciidoc/applib/IsisModuleValAsciidocApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.adoc b/antora/components/refguide/modules/valuetypes/pages/index/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/applib/value/AsciiDoc.adoc b/antora/components/refguide/modules/valuetypes/pages/index/asciidoc/applib/value/AsciiDoc.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/applib/value/AsciiDoc.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/asciidoc/applib/value/AsciiDoc.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc b/antora/components/refguide/modules/valuetypes/pages/index/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.adoc b/antora/components/refguide/modules/valuetypes/pages/index/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.adoc b/antora/components/refguide/modules/valuetypes/pages/index/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc b/antora/components/refguide/modules/valuetypes/pages/index/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.adoc b/antora/components/refguide/modules/valuetypes/pages/index/markdown/applib/IsisModuleValMarkdownApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/markdown/applib/IsisModuleValMarkdownApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.adoc b/antora/components/refguide/modules/valuetypes/pages/index/markdown/applib/jaxb/MarkdownJaxbAdapter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/markdown/applib/jaxb/MarkdownJaxbAdapter.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/markdown/applib/jaxb/MarkdownJaxbAdapter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/markdown/applib/value/Converter.adoc b/antora/components/refguide/modules/valuetypes/pages/index/markdown/applib/value/Converter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/markdown/applib/value/Converter.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/markdown/applib/value/Converter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc b/antora/components/refguide/modules/valuetypes/pages/index/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.adoc b/antora/components/refguide/modules/valuetypes/pages/index/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.adoc b/antora/components/refguide/modules/valuetypes/pages/index/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc b/antora/components/refguide/modules/valuetypes/pages/index/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/IsisModuleValSseApplib.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/applib/IsisModuleValSseApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/IsisModuleValSseApplib.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/applib/IsisModuleValSseApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/annotations/ServerSentEvents.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/applib/annotations/ServerSentEvents.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/annotations/ServerSentEvents.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/applib/annotations/ServerSentEvents.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/annotations/SseSource.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/applib/annotations/SseSource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/annotations/SseSource.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/applib/annotations/SseSource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/service/SseChannel.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/applib/service/SseChannel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/service/SseChannel.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/applib/service/SseChannel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/service/SseService.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/applib/service/SseService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/applib/service/SseService.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/applib/service/SseService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/ui/wkt/IsisModuleValSseUiWkt.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/ui/wkt/IsisModuleValSseUiWkt.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/ui/wkt/IsisModuleValSseUiWkt.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/ui/wkt/IsisModuleValSseUiWkt.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/ui/wkt/services/SseServiceDefault.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/ui/wkt/services/SseServiceDefault.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/ui/wkt/services/SseServiceDefault.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/ui/wkt/services/SseServiceDefault.adoc
diff --git a/antora/components/system/modules/generated/pages/index/valuetypes/sse/ui/wkt/webmodule/WebModuleServerSentEvents.adoc b/antora/components/refguide/modules/valuetypes/pages/index/sse/ui/wkt/webmodule/WebModuleServerSentEvents.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/valuetypes/sse/ui/wkt/webmodule/WebModuleServerSentEvents.adoc
rename to antora/components/refguide/modules/valuetypes/pages/index/sse/ui/wkt/webmodule/WebModuleServerSentEvents.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/JsonRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/JsonRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/LinkRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/LinkRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/LinkRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/LinkRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/Rel.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/Rel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/Rel.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/Rel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RelDefinition.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RelDefinition.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RelDefinition.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RelDefinition.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RepresentationType.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RepresentationType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RepresentationType.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RepresentationType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulHttpMethod.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulHttpMethod.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulHttpMethod.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulHttpMethod.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulMediaType.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulMediaType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulMediaType.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulMediaType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulRequest.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulRequest.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulRequest.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulRequest.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulResponse.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulResponse.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/RestfulResponse.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RestfulResponse.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/boot/BootstrapResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/boot/BootstrapResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/boot/BootstrapResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/boot/BootstrapResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ActionResultRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ActionResultRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ActionResultRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainServiceResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/DomainServiceResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainServiceResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ListRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ListRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ListRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ListRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ObjectActionRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ObjectActionRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ObjectActionRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ObjectCollectionRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ObjectPropertyRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ScalarValueRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domainobjects/ScalarValueRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/ScalarValueRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/AbstractTypeMemberRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/ActionDescriptionRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/ActionParameterDescriptionRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/CollectionDescriptionRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/DomainTypeRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/DomainTypeRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/DomainTypeRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/DomainTypeResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/DomainTypeResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/PropertyDescriptionRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/TypeActionResultRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/TypeListRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/domaintypes/TypeListRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domaintypes/TypeListRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/dtos/ScalarValueDtoV2.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/dtos/ScalarValueDtoV2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/dtos/ScalarValueDtoV2.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/dtos/ScalarValueDtoV2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/errors/ErrorRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/errors/ErrorRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/errors/ErrorRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/errors/ErrorRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/health/HealthRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/health/HealthRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/health/HealthRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/health/HealthRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/health/HealthResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/health/HealthResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/health/HealthResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/health/HealthResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/homepage/HomePageRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/homepage/HomePageRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/homepage/HomePageRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/homepage/HomePageRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/homepage/HomePageResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/homepage/HomePageResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/homepage/HomePageResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/homepage/HomePageResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/menubars/MenuBarsResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/menubars/MenuBarsResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/menubars/MenuBarsResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/menubars/MenuBarsResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/user/UserRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/user/UserRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/user/UserRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/user/UserRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/user/UserResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/user/UserResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/user/UserResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/user/UserResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonMapper.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/JsonMapper.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonMapper.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/JsonMapper.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonNodeUtils.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/JsonNodeUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/JsonNodeUtils.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/JsonNodeUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/MediaTypes.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/MediaTypes.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/MediaTypes.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/Parser.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/Parser.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/Parser.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/Parser.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/PathNode.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/PathNode.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/PathNode.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/PathNode.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/UrlEncodingUtils.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/UrlEncodingUtils.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/util/UrlEncodingUtils.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/util/UrlEncodingUtils.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/version/VersionRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/version/VersionRepresentation.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/version/VersionRepresentation.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/version/VersionRepresentation.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/version/VersionResource.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/version/VersionResource.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/applib/version/VersionResource.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/version/VersionResource.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/RepresentationService.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/RepresentationService.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc
rename to antora/components/refguide/modules/viewer/pages/index/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/wicket/model/IsisModuleViewerWicketModel.adoc b/antora/components/refguide/modules/viewer/pages/index/wicket/model/IsisModuleViewerWicketModel.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/wicket/model/IsisModuleViewerWicketModel.adoc
rename to antora/components/refguide/modules/viewer/pages/index/wicket/model/IsisModuleViewerWicketModel.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/wicket/ui/IsisModuleViewerWicketUi.adoc b/antora/components/refguide/modules/viewer/pages/index/wicket/ui/IsisModuleViewerWicketUi.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/wicket/ui/IsisModuleViewerWicketUi.adoc
rename to antora/components/refguide/modules/viewer/pages/index/wicket/ui/IsisModuleViewerWicketUi.adoc
diff --git a/antora/components/system/modules/generated/pages/index/viewer/wicket/viewer/IsisModuleViewerWicketViewer.adoc b/antora/components/refguide/modules/viewer/pages/index/wicket/viewer/IsisModuleViewerWicketViewer.adoc
similarity index 100%
rename from antora/components/system/modules/generated/pages/index/viewer/wicket/viewer/IsisModuleViewerWicketViewer.adoc
rename to antora/components/refguide/modules/viewer/pages/index/wicket/viewer/IsisModuleViewerWicketViewer.adoc


[isis] 02/05: ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component

Posted by da...@apache.org.
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 cfb832b25cc64a2369ed3709b7b719af856969b5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 22 07:05:55 2021 +0000

    ISIS-2444: reworking projdoc tooling to split out into separate antora modules in a 'refguide' antora component
---
 .../org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
index 7cb3bb4..9be58c0 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocWriter.java
@@ -127,8 +127,7 @@ final class ProjectDocWriter {
             final @NonNull CliConfig.Commands.Index index
             ) {
 
-        // eg: was: antora/components/system/modules/generated
-        // eg: now: antora/components/refguide
+        // eg: antora/components/refguide
         final File outputRootFolder = global.getOutputRootFolder();
         val indexFolder = index.getDocumentIndexFolder(outputRootFolder);
 
@@ -140,14 +139,17 @@ final class ProjectDocWriter {
         .skip(global.getNamespacePartsSkipCount())
         .peek(subDir-> {
             // applib
-            // ... so updates to antora/components/refguide/modules/applib
+            // ... so updates to antora/components/refguide/modules/applib/pages/index
             destFolderBuilder.update(currentDir -> new File(currentDir, "modules"));
             destFolderBuilder.update(currentDir -> new File(currentDir, subDir));
+            destFolderBuilder.update(currentDir -> new File(currentDir, "pages"));
+            destFolderBuilder.update(currentDir -> new File(currentDir, "index"));
         })
         // annotation
         .skip(1)
         .forEach(subDir-> {
             // annotation
+            // ... so updates to antora/components/refguide/modules/applib/pages/index/annotation
             destFolderBuilder.update(currentDir -> new File(currentDir, subDir));
         });
 


[isis] 05/05: ISIS-2444: fixes xref's for new structure

Posted by da...@apache.org.
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 b6edfb3d00d8ea911569ac3a8ece4c4a79c4ba7c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Feb 22 09:18:18 2021 +0000

    ISIS-2444: fixes xref's for new structure
---
 .../pages/what-is-apache-isis/screencasts.adoc     |  20 +--
 antora/components/refguide/antora.yml              |   6 +-
 .../components/refguide/modules/_overview/nav.adoc |   2 -
 .../refguide/modules/_overview/pages/about.adoc    | 200 ++++++++++-----------
 .../pages/index/RecreatableDomainObject.adoc       |   2 +-
 .../modules/applib/pages/index/ViewModel.adoc      |   2 +-
 .../applib/pages/index/adapters/Parser.adoc        |   2 +-
 .../index/adapters/ValueSemanticsProvider.adoc     |  14 +-
 .../applib/pages/index/annotation/Action.adoc      |  28 +--
 .../applib/pages/index/annotation/Collection.adoc  |   4 +-
 .../applib/pages/index/annotation/Defaulted.adoc   |  10 +-
 .../pages/index/annotation/DomainObject.adoc       |  42 ++---
 .../pages/index/annotation/DomainObjectLayout.adoc |  16 +-
 .../pages/index/annotation/EqualByContent.adoc     |   4 +-
 .../applib/pages/index/annotation/Module.adoc      |   4 +-
 .../applib/pages/index/annotation/Nature.adoc      |   6 +-
 .../applib/pages/index/annotation/Parameter.adoc   |   8 +-
 .../applib/pages/index/annotation/Property.adoc    |  28 +--
 .../pages/index/annotation/PropertyLayout.adoc     |   2 +-
 .../applib/pages/index/annotation/Publishing.adoc  |  10 +-
 .../applib/pages/index/annotation/Title.adoc       |   4 +-
 .../applib/pages/index/annotation/Value.adoc       |  12 +-
 .../hooks/ActionLayout_011-bookmarking.adoc        |   4 +-
 .../hooks/ActionLayout_012-cssClass.adoc           |   4 +-
 .../hooks/ActionLayout_013-cssClassFa.adoc         |   6 +-
 .../hooks/ActionLayout_014-describedAs.adoc        |   2 +-
 .../annotation/hooks/ActionLayout_015-hidden.adoc  |   4 +-
 .../annotation/hooks/ActionLayout_016-named.adoc   |   2 +-
 .../hooks/ActionLayout_017-position.adoc           |   2 +-
 .../hooks/ActionLayout_018-promptStyle.adoc        |   2 +-
 .../hooks/ActionLayout_019-redirect.adoc           |   4 +-
 .../hooks/Action_010-examples-and-usage.adoc       |  46 ++---
 .../CollectionLayout_010-examples-and-usage.adoc   |   2 +-
 .../hooks/CollectionLayout_011-cssClass.adoc       |   2 +-
 .../hooks/CollectionLayout_012-defaultView.adoc    |   2 +-
 .../hooks/CollectionLayout_013-describedAs.adoc    |   2 +-
 .../hooks/CollectionLayout_014-hidden.adoc         |   4 +-
 .../hooks/CollectionLayout_015-named.adoc          |   4 +-
 .../hooks/CollectionLayout_016-paged.adoc          |   2 +-
 .../hooks/CollectionLayout_017-sortedBy.adoc       |   2 +-
 .../hooks/Collection_010-examples-and-usage.adoc   |   2 +-
 .../hooks/Collection_011_domainEvent.adoc          |  12 +-
 .../annotation/hooks/Collection_012_hidden.adoc    |   2 +-
 .../annotation/hooks/Collection_013_typeOf.adoc    |   2 +-
 .../DomainObjectLayout_010-examples-and-usage.adoc |  24 +--
 .../hooks/DomainObject_010-examples-and-usage.adoc |   6 +-
 .../hooks/DomainObject_011-domain-events.adoc      |  14 +-
 .../hooks/DomainObject_012-_lifecycle-events.adoc  |  26 +--
 .../DomainObject_013-autoCompleteRepository.adoc   |   6 +-
 .../hooks/DomainObject_014-bounding.adoc           |   4 +-
 .../annotation/hooks/DomainObject_015-editing.adoc |   2 +-
 .../DomainObject_016-entityChangePublishing.adoc   |   2 +-
 .../hooks/DomainObject_017-mixinMethod.adoc        |   6 +-
 .../annotation/hooks/DomainObject_018-nature.adoc  |   4 +-
 .../hooks/DomainObject_019-objectType.adoc         |   6 +-
 .../hooks/DomainObject_030-see-also.adoc           |   4 +-
 .../InteractionScope_010-examples-and-usage.adoc   |   4 +-
 .../hooks/MemberOrder_010-examples-and-usage.adoc  |   2 +-
 .../PropertyLayout_010-examples-and-usage.adoc     |   2 +-
 .../hooks/Property_010-examples-and-usage.adoc     |   2 +-
 .../applib/pages/index/clock/VirtualClock.adoc     |   2 +-
 .../pages/index/domain/DomainObjectList.adoc       |   4 +-
 .../index/events/domain/AbstractDomainEvent.adoc   |   2 +-
 .../index/exceptions/TranslatableException.adoc    |   6 +-
 .../unrecoverable/PersistFailedException.adoc      |   2 +-
 .../unrecoverable/RepositoryException.adoc         |   2 +-
 .../pages/index/layout/component/FieldSet.adoc     |   4 +-
 .../applib/pages/index/layout/grid/Grid.adoc       |   2 +-
 .../pages/index/layout/grid/GridAbstract.adoc      |   2 +-
 .../pages/index/layout/grid/bootstrap3/BS3Col.adoc |   6 +-
 .../pages/index/layout/grid/bootstrap3/BS3Row.adoc |   2 +-
 .../layout/grid/bootstrap3/BS3RowContent.adoc      |   2 +-
 .../pages/index/layout/grid/bootstrap3/BS3Tab.adoc |   4 +-
 .../index/layout/grid/bootstrap3/BS3TabGroup.adoc  |   4 +-
 .../index/layout/menubars/bootstrap3/BS3Menu.adoc  |   2 +-
 .../layout/menubars/bootstrap3/BS3MenuBar.adoc     |   2 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.adoc    |   2 +-
 .../layout/menubars/bootstrap3/BS3MenuSection.adoc |   2 +-
 .../modules/applib/pages/index/query/Query.adoc    |   2 +-
 .../pages/index/services/DomainChangeRecord.adoc   |   4 +-
 .../RepresentsInteractionMemberExecution.adoc      |   2 +-
 ...AcceptHeaderService_020-examples-and-usage.adoc |   6 +-
 .../pages/index/services/bookmark/Bookmark.adoc    |   4 +-
 .../index/services/bookmark/BookmarkService.adoc   |  12 +-
 .../BookmarkService_020-examples-and-usage.adoc    |  14 +-
 .../hooks/ClockService_020-examples-and-usage.adoc |   2 +-
 .../pages/index/services/command/Command.adoc      |  10 +-
 .../ContentMappingServiceForCommandsDto.adoc       |   4 +-
 ...DtoProcessorService_020-examples-and-usage.adoc |   4 +-
 .../processor/spi/CommandDtoProcessorService.adoc  |   4 +-
 .../index/services/confview/ConfigurationMenu.adoc |   2 +-
 .../confview/ConfigurationViewService.adoc         |   6 +-
 .../ConfigurationMenu_020-examples-and-usage.adoc  |   2 +-
 ...gurationViewService_020-examples-and-usage.adoc |   2 +-
 .../ContentMappingService_010-implementation.adoc  |   2 +-
 ...ntentMappingService_020-examples-and-usage.adoc |   2 +-
 .../hooks/EmailService_020-examples-and-usage.adoc |   2 +-
 .../pages/index/services/error/ErrorDetails.adoc   |   2 +-
 .../pages/index/services/error/SimpleTicket.adoc   |   2 +-
 .../applib/pages/index/services/error/Ticket.adoc  |   2 +-
 ...rorReportingService_020-examples-and-usage.adoc |   6 +-
 .../EventBusService_020-examples-and-usage.adoc    |  24 +--
 .../services/exceprecog/ExceptionRecognizer.adoc   |   2 +-
 .../exceprecog/ExceptionRecognizerAbstract.adoc    |   2 +-
 .../exceprecog/ExceptionRecognizerForType.adoc     |   2 +-
 .../exceprecog/ExceptionRecognizerService.adoc     |   2 +-
 .../index/services/exceprecog/Recognition.adoc     |  14 +-
 ...ExceptionRecognizer_020-examples-and-usage.adoc |  14 +-
 .../FactoryService_020-examples-and-usage.adoc     |   6 +-
 .../index/services/grid/GridLoaderService.adoc     |  10 +-
 .../pages/index/services/grid/GridService.adoc     |  30 ++--
 .../index/services/grid/GridSystemService.adoc     |   4 +-
 .../GridLoaderService_020-examples-and-usage.adoc  |   4 +-
 .../hooks/GridService_020-examples-and-usage.adoc  |   6 +-
 .../GridSystemService_020-examples-and-usage.adoc  |   2 +-
 .../pages/index/services/hint/HintStore.adoc       |   2 +-
 .../services/homepage/HomePageResolverService.adoc |   2 +-
 ...PageResolverService_020-examples-and-usage.adoc |   2 +-
 .../applib/pages/index/services/i18n/Mode.adoc     |   2 +-
 .../index/services/i18n/TranslatableString.adoc    |   4 +-
 .../index/services/i18n/TranslationsResolver.adoc  |   4 +-
 .../LocaleProvider_020-examples-and-usage.adoc     |   4 +-
 .../TranslationService_020-examples-and-usage.adoc |   4 +-
 ...ranslationsResolver_020-examples-and-usage.adoc |   2 +-
 .../pages/index/services/iactn/Execution.adoc      |   8 +-
 .../index/services/iactn/ExecutionContext.adoc     |   6 +-
 .../pages/index/services/iactn/Interaction.adoc    |  18 +-
 .../index/services/iactn/InteractionContext.adoc   |   8 +-
 .../pages/index/services/iactn/Sequence.adoc       |   8 +-
 .../hooks/Execution_020-examples-and-usage.adoc    |   8 +-
 .../InteractionContext_020-examples-and-usage.adoc |   8 +-
 .../hooks/Interaction_020-examples-and-usage.adoc  |   6 +-
 .../ServiceInjector_020-examples-and-usage.adoc    |   6 +-
 .../hooks/JaxbService_020-examples-and-usage.adoc  |   2 +-
 .../pages/index/services/layout/LayoutService.adoc |   4 +-
 .../index/services/layout/LayoutServiceMenu.adoc   |   2 +-
 .../applib/pages/index/services/layout/Style.adoc  |   2 +-
 .../LayoutServiceMenu_020-examples-and-usage.adoc  |   4 +-
 .../LayoutService_020-examples-and-usage.adoc      |  14 +-
 .../hooks/DeepLinkService_010-implementation.adoc  |   2 +-
 .../DeepLinkService_020-examples-and-usage.adoc    |   2 +-
 .../index/services/menu/MenuBarsLoaderService.adoc |  10 +-
 .../pages/index/services/menu/MenuBarsService.adoc |   2 +-
 ...nuBarsLoaderService_020-examples-and-usage.adoc |   2 +-
 .../hooks/MenuBarsService_010-implementation.adoc  |   2 +-
 .../MenuBarsService_020-examples-and-usage.adoc    |   2 +-
 .../MessageService_020-examples-and-usage.adoc     |   4 +-
 .../index/services/metamodel/MetaModelService.adoc |  12 +-
 .../services/metamodel/MetaModelServiceMenu.adoc   |   2 +-
 .../MetaModelService_020-examples-and-usage.adoc   |  12 +-
 .../MetricsService_020-examples-and-usage.adoc     |   4 +-
 .../services/publishing/spi/CommandSubscriber.adoc |   2 +-
 .../services/publishing/spi/EntityChanges.adoc     |  10 +-
 .../publishing/spi/EntityChangesSubscriber.adoc    |   4 +-
 .../publishing/spi/EntityPropertyChange.adoc       |   2 +-
 .../spi/EntityPropertyChangeSubscriber.adoc        |   4 +-
 .../publishing/spi/ExecutionSubscriber.adoc        |   4 +-
 ...tyChangesSubscriber_020-examples-and-usage.adoc |   2 +-
 ...rtyChangeSubscriber_020-examples-and-usage.adoc |   2 +-
 ...ExecutionSubscriber_020-examples-and-usage.adoc |  16 +-
 .../QueryResultsCacheControl.adoc                  |   8 +-
 .../QueryResultsCache_020-examples-and-usage.adoc  |   2 +-
 .../index/services/registry/ServiceRegistry.adoc   |   8 +-
 .../ServiceRegistry_020-examples-and-usage.adoc    |   6 +-
 .../services/repository/RepositoryService.adoc     |  18 +-
 .../RepositoryService_020-examples-and-usage.adoc  |  20 +--
 .../hooks/RoutingService_010-implementation.adoc   |   2 +-
 .../RoutingService_020-examples-and-usage.adoc     |   2 +-
 .../hooks/Scratchpad_010-implementation.adoc       |   2 +-
 .../hooks/Scratchpad_020-examples-and-usage.adoc   |   2 +-
 .../pages/index/services/sudo/SudoService.adoc     |  12 +-
 ...SudoServiceListener_020-examples-and-usage.adoc |   2 +-
 .../hooks/SudoService_020-examples-and-usage.adoc  |   8 +-
 .../SwaggerService_020-examples-and-usage.adoc     |   4 +-
 ...rlEncodingServiceUsingBaseEncodingAbstract.adoc |   2 +-
 .../UrlEncodingService_020-examples-and-usage.adoc |   2 +-
 .../pages/index/services/user/RoleMemento.adoc     |   2 +-
 .../pages/index/services/user/UserService.adoc     |  10 +-
 .../hooks/UserService_020-examples-and-usage.adoc  |   4 +-
 ...NotificationService_020-examples-and-usage.adoc |  12 +-
 ...RegistrationService_020-examples-and-usage.adoc |   8 +-
 .../index/services/wrapper/WrapperFactory.adoc     |  18 +-
 .../index/services/wrapper/WrappingObject.adoc     |   4 +-
 .../services/wrapper/control/AsyncControl.adoc     |   4 +-
 .../services/wrapper/control/SyncControl.adoc      |   4 +-
 .../index/services/wrapper/events/AccessEvent.adoc |   2 +-
 .../wrapper/events/ActionArgumentEvent.adoc        |   2 +-
 .../wrapper/events/ActionInvocationEvent.adoc      |   4 +-
 .../wrapper/events/ActionVisibilityEvent.adoc      |   2 +-
 .../wrapper/events/CollectionAccessEvent.adoc      |   2 +-
 .../services/wrapper/events/InteractionEvent.adoc  |  14 +-
 .../wrapper/events/PropertyAccessEvent.adoc        |   2 +-
 .../wrapper/events/ProposedHolderEvent.adoc        |   2 +-
 .../services/wrapper/events/VisibilityEvent.adoc   |   2 +-
 .../WrapperFactory_020-examples-and-usage.adoc     |  18 +-
 .../wrapper/listeners/InteractionAdapter.adoc      |   2 +-
 .../wrapper/listeners/InteractionListener.adoc     |   4 +-
 .../pages/index/services/xactn/TransactionId.adoc  |   4 +-
 .../TransactionService_020-examples-and-usage.adoc |   4 +-
 ...nsactionalProcessor_020-examples-and-usage.adoc |   4 +-
 .../hooks/XmlService_020-examples-and-usage.adoc   |   2 +-
 .../XmlSnapshotService_020-examples-and-usage.adoc |   8 +-
 .../snapshot/SnapshottableWithInclusions.adoc      |   2 +-
 .../pages/index/spec/AbstractSpecification.adoc    |   2 +-
 .../pages/index/spec/AbstractSpecification2.adoc   |   2 +-
 .../applib/pages/index/spec/Specification2.adoc    |   8 +-
 .../applib/pages/index/spec/SpecificationAnd.adoc  |   4 +-
 .../applib/pages/index/spec/SpecificationNot.adoc  |   4 +-
 .../applib/pages/index/spec/SpecificationOr.adoc   |   4 +-
 .../applib/pages/index/util/ReasonBuffer.adoc      |   2 +-
 .../applib/pages/index/util/ReasonBuffer2.adoc     |   2 +-
 .../modules/applib/pages/index/util/Reasons.adoc   |   2 +-
 .../applib/pages/index/util/TitleBuffer.adoc       |  40 ++---
 .../index/util/schema/InteractionDtoUtils.adoc     |   8 +-
 .../modules/applib/pages/index/value/Blob.adoc     |   8 +-
 .../modules/applib/pages/index/value/Clob.adoc     |   8 +-
 .../pages/index/value/LocalResourcePath.adoc       |   4 +-
 .../applib/pages/index/value/OpenUrlStrategy.adoc  |   2 +-
 .../commons/pages/index/collections/Can.adoc       |   8 +-
 .../commons/pages/index/functional/Result.adoc     |   2 +-
 .../impl/mixins/HasUniqueId_command.adoc           |   6 +-
 .../executor/CommandExecutorServiceWithTime.adoc   |   2 +-
 .../fullcalendar/applib/CalendarEventable.adoc     |   2 +-
 .../spi/CalendarableDereferencingService.adoc      |   2 +-
 .../modelannotation/applib/annotation/Model.adoc   |   2 +-
 .../api/permission/ApplicationPermission.adoc      |   4 +-
 .../api/permission/ApplicationPermissionMode.adoc  |   4 +-
 .../api/permission/ApplicationPermissionRule.adoc  |   4 +-
 .../api/permission/ApplicationPermissionValue.adoc |   2 +-
 .../permission/ApplicationPermissionValueSet.adoc  |   2 +-
 .../permission/PermissionsEvaluationService.adoc   |   2 +-
 .../api/tenancy/ApplicationTenancyEvaluator.adoc   |   2 +-
 .../pages/index/secman/api/tenancy/HasAtPath.adoc  |   6 +-
 .../jdo/seed/SeedUsersAndRolesFixtureScript.adoc   |   2 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.adoc |   2 +-
 .../jpa/seed/SeedUsersAndRolesFixtureScript.adoc   |   2 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.adoc |   2 +-
 ...tyModuleAppUserRegistrationServiceAbstract.adoc |   2 +-
 .../realm/impl/IsisLdapContextFactory.adoc         |   2 +-
 .../CollectionContentsAsExcelFactory.adoc          |   2 +-
 .../pages/index/base/applib/Chained.adoc           |  12 +-
 .../pages/index/base/applib/TitledEnum.adoc        |   2 +-
 .../base/applib/with/WithIntervalContiguous.adoc   |   8 +-
 .../excel/applib/dom/util/ExcelServiceImpl.adoc    |  18 +-
 .../restfulobjects/applib/JsonRepresentation.adoc  |  12 +-
 .../pages/index/restfulobjects/applib/Rel.adoc     |   4 +-
 .../index/restfulobjects/applib/RelDefinition.adoc |  10 +-
 .../restfulobjects/applib/RepresentationType.adoc  |   8 +-
 .../DomainObjectMemberRepresentation.adoc          |   4 +-
 .../RepresentationServiceContentNegotiator.adoc    |   6 +-
 .../ContentNegotiationServiceOrgApacheIsisV2.adoc  |   2 +-
 .../ContentNegotiationServiceXRoDomainType.adoc    |  10 +-
 .../modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc |   4 +-
 antora/playbooks/site-tooling.yml                  |   2 +-
 antora/playbooks/site.yml                          |   2 +-
 .../btb/pages/hints-and-tips/are-you-sure.adoc     |   2 +-
 .../how-to-handle-void-and-null-results.adoc       |   4 +-
 .../how-to-implement-a-spellchecker.adoc           |   6 +-
 .../replacing-default-service-implementations.adoc |   2 +-
 .../simulating-collections-of-values.adoc          |   2 +-
 .../hints-and-tips/transactions-and-errors.adoc    |   6 +-
 .../pages/hints-and-tips/vetoing-visibility.adoc   |   2 +-
 .../hints-and-tips/view-model-instantiation.adoc   |   6 +-
 api/adoc/userguide/modules/btb/pages/i18n.adoc     |   2 +-
 .../fun/pages/business-rules/usability.adoc        |   4 +-
 .../modules/fun/pages/business-rules/validity.adoc |   2 +-
 .../apache-isis-vs-cqrs-and-event-sourcing.adoc    |   6 +-
 .../fun/pages/concepts-patterns/architecture.adoc  |   2 +-
 .../fun/pages/concepts-patterns/core-values.adoc   |   2 +-
 .../pages/domain-entities-and-services/crud.adoc   |  22 +--
 .../domain-entities.adoc                           |   2 +-
 .../domain-services.adoc                           |  20 +--
 .../inject-services.adoc                           |   8 +-
 .../modules/fun/pages/drop-downs-and-defaults.adoc |   6 +-
 .../modules/fun/pages/meta-annotations.adoc        |   4 +-
 api/adoc/userguide/modules/fun/pages/mixins.adoc   |  14 +-
 .../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         |  16 +-
 .../modules/fun/pages/overview/identifiers.adoc    |  10 +-
 .../modules/fun/pages/overview/modules.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      |  10 +-
 .../fun/pages/ui/names-and-descriptions.adoc       |  20 +--
 .../modules/fun/pages/ui/object-layout.adoc        |  10 +-
 .../fun/pages/ui/object-titles-and-icons.adoc      |  14 +-
 .../modules/fun/pages/ui/table-columns.adoc        |   2 +-
 .../userguide/modules/fun/pages/view-models.adoc   |  12 +-
 .../modules/fun/pages/view-models/UNUSED-dto.adoc  |   8 +-
 .../modules/fun/partials/_deployment-options.adoc  |   4 +-
 .../main/adoc/modules/applib-ant/pages/Column.adoc |   6 +-
 .../modules/applib-ant/pages/Discriminator.adoc    |   4 +-
 .../adoc/modules/applib-ant/pages/Nullable.adoc    |   6 +-
 .../applib-ant/pages/PersistenceCapable.adoc       |   4 +-
 .../adoc/modules/applib-ant/pages/PrimaryKey.adoc  |   2 +-
 .../applib-ant/pages/XmlJavaTypeAdapter.adoc       |   2 +-
 .../modules/applib-ant/pages/XmlRootElement.adoc   |   6 +-
 .../adoc/modules/applib-ant/pages/about/jee.adoc   |   2 +-
 .../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    |  38 ++--
 .../modules/applib-classes/pages/ViewModel.adoc    |   2 +-
 .../applib-classes/pages/events/domainevent.adoc   |   4 +-
 .../events/domainevent/ActionDomainEvent.adoc      |   2 +-
 .../events/domainevent/CollectionDomainEvent.adoc  |   2 +-
 .../events/domainevent/PropertyDomainEvent.adoc    |   2 +-
 .../pages/events/lifecycleevent.adoc               |  12 +-
 .../events/lifecycleevent/ObjectCreatedEvent.adoc  |   4 +-
 .../lifecycleevent/ObjectPersistedEvent.adoc       |   4 +-
 .../lifecycleevent/ObjectPersistingEvent.adoc      |   4 +-
 .../events/lifecycleevent/ObjectRemovingEvent.adoc |   4 +-
 .../events/lifecycleevent/ObjectUpdatedEvent.adoc  |   4 +-
 .../events/lifecycleevent/ObjectUpdatingEvent.adoc |   4 +-
 .../applib-classes/pages/events/uievent.adoc       |   8 +-
 .../pages/events/uievent/IconUiEvent.adoc          |   2 +-
 .../pages/events/uievent/TitleUiEvent.adoc         |   2 +-
 .../applib-classes/pages/layout/menubars.adoc      |   6 +-
 .../applib-classes/pages/layout/object-layout.adoc |  12 +-
 .../roles-mixins-contributees/contributee.adoc     |   6 +-
 .../roles-mixins-contributees/mixins/Dto.adoc      |   2 +-
 .../roles-mixins-contributees/mixins/Object.adoc   |  10 +-
 .../roles/HoldsUpdatedAt.adoc                      |   2 +-
 .../adoc/modules/applib-classes/pages/spec.adoc    |   2 +-
 .../adoc/modules/applib-classes/pages/utility.adoc |   8 +-
 .../modules/applib-methods/pages/lifecycle.adoc    |   2 +-
 .../applib-methods/pages/lifecycle/created.adoc    |   4 +-
 .../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 +-
 .../applib-methods/pages/prefixes/default.adoc     |   4 +-
 .../pages/reserved/deprecated/getId.adoc           |   4 +-
 .../applib-methods/pages/reserved/layout.adoc      |   2 +-
 .../applib-methods/pages/reserved/title.adoc       |   2 +-
 .../main/adoc/modules/applib-svc/pages/about.adoc  |  50 +++---
 .../partials/_application-layer-api.adoc           |  14 +-
 .../partials/_application-layer-spi.adoc           |   6 +-
 .../applib-svc/partials/_core-domain-api.adoc      |  18 +-
 .../applib-svc/partials/_integration-api.adoc      |   8 +-
 .../applib-svc/partials/_integration-spi.adoc      |  14 +-
 .../modules/applib-svc/partials/_metadata-api.adoc |  12 +-
 .../modules/applib-svc/partials/_metadata-spi.adoc |  18 +-
 .../partials/_persistence-layer-api.adoc           |  10 +-
 .../partials/_persistence-layer-spi.adoc           |   4 +-
 .../partials/_presentation-layer-api.adoc          |   6 +-
 .../partials/_presentation-layer-spi.adoc          |  30 ++--
 .../modules/applib-svc/partials/_security-spi.adoc |   6 +-
 .../modules/applib-svc/partials/module-nav.adoc    | 120 ++++++-------
 .../src/main/adoc/modules/schema/pages/chg.adoc    |   4 +-
 .../src/main/adoc/modules/schema/pages/common.adoc |   4 +-
 .../src/main/adoc/modules/schema/pages/ixn.adoc    |   4 +-
 .../src/main/adoc/modules/config/pages/about.adoc  |   2 +-
 .../application-specific/application-css.adoc      |   8 +-
 .../pages/AuthenticationSessionProvider.adoc       |   2 +-
 .../pages/CommandDtoServiceInternal.adoc           |   6 +-
 .../runtime-services/pages/CommandPublisher.adoc   |   2 +-
 .../pages/ContentNegotiationService.adoc           |   6 +-
 .../pages/EntityChangeTracker.adoc                 |   2 +-
 .../pages/EntityChangesPublisher.adoc              |   4 +-
 .../pages/EntityPropertyChangePublisher.adoc       |   4 +-
 .../runtime-services/pages/ExecutionPublisher.adoc |  10 +-
 .../pages/InteractionDtoServiceInternal.adoc       |   2 +-
 .../pages/RepresentationService.adoc               |   4 +-
 .../partials/_application-layer.adoc               |   6 +-
 .../partials/_persistence-layer.adoc               |   4 +-
 .../partials/_presentation-layer.adoc              |   2 +-
 .../adoc/modules/audit-trail/pages/about.adoc      |   8 +-
 .../ROOT/pages/services/IsisJdoSupport.adoc        |   4 +-
 security/adoc/modules/ROOT/pages/about.adoc        |   6 +-
 .../domain-services-api-for-applications.adoc      |   2 +-
 .../adoc/modules/starters/pages/helloworld.adoc    |  10 +-
 .../adoc/modules/starters/pages/simpleapp.adoc     |  16 +-
 testing/adoc/modules/ROOT/pages/about.adoc         |   4 +-
 .../pages/fixture-scripts/mocking-the-clock.adoc   |   6 +-
 .../fixtures/pages/services/FixtureScripts.adoc    |   2 +-
 .../adoc/modules/integtestsupport/pages/about.adoc |  18 +-
 .../integtestsupport/pages/swagger-exporter.adoc   |   4 +-
 .../adoc/modules/specsupport/pages/about.adoc      |   2 +-
 .../apache/isis/tooling/model4adoc/xref/Xref.java  |  24 +--
 .../adoc/modules/ROOT/pages/architecture.adoc      |   2 +-
 .../adoc/modules/ROOT/pages/health-check.adoc      |   2 +-
 .../adoc/modules/ROOT/pages/layout-resources.adoc  |   8 +-
 .../adoc/modules/ROOT/pages/ro-spec.adoc           |   2 +-
 .../ROOT/pages/configuration-properties.adoc       |  12 +-
 .../modules/ROOT/pages/extending/custom-pages.adoc |   4 +-
 .../ROOT/pages/features/bookmarked-pages.adoc      |   6 +-
 .../ROOT/pages/features/user-registration.adoc     |  12 +-
 .../i18n-label-in-wicket-viewer.adoc               |   2 +-
 .../ROOT/partials/security/user-registration.adoc  |   2 +-
 396 files changed, 1380 insertions(+), 1386 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 23418c5..78bb27f 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:system:generated:index/applib/annotation/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:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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: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.
+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:index/annotation/DomainObjectLayout.adoc#bookmarking[domain objects] and (xref:refguide:applib:index/annotation/Action.adoc#semantics[query-only]) xref:refguide:applib:index/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: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.
+Using the xref:refguide:applib:index/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:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]  and the Specification interface.
+How to validate action parameters using the xref:refguide:applib:index/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]  and the Specification interface.
 |||||||||x||
 
 
@@ -332,7 +332,7 @@ How to validate action parameters using the xref:system:generated:index/applib/a
 
 
 |link:https://www.youtube.com/watch?v=fYJjXAepWAs[032^] +
-How to instantiate/initialize objects using xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`], xref:system:generated:index/applib/services/registry/ServiceRegistry.adoc[`ServiceRegistry`] and/or xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`].
+How to instantiate/initialize objects using xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`], xref:refguide:applib:index/services/registry/ServiceRegistry.adoc[`ServiceRegistry`] and/or xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`].
 |x||||||||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:system:generated:index/applib/annotation/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:refguide:applib:index/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: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.
+How to use xref:refguide:applib:index/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:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] annotation to exclude methods from a domain object
+Using the xref:refguide:applib:index/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:system:generated:index/applib/annotation/HomePage.adoc[home page] view model,
+How to rename various elements (collections, title) of the xref:refguide:applib:index/annotation/HomePage.adoc[home page] view model,
 for an improved initial page.
 ||||||||||x|
 
diff --git a/antora/components/refguide/antora.yml b/antora/components/refguide/antora.yml
index 6e4ac78..60e96cf 100644
--- a/antora/components/refguide/antora.yml
+++ b/antora/components/refguide/antora.yml
@@ -15,12 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-name: system
-title: "System Overview"
+name: refguide
 version: latest
-start_page: generated:system-overview.adoc
 
-nav:
-- modules/generated/nav.adoc
 
 
diff --git a/antora/components/refguide/modules/_overview/nav.adoc b/antora/components/refguide/modules/_overview/nav.adoc
index b250194..8b13789 100644
--- a/antora/components/refguide/modules/_overview/nav.adoc
+++ b/antora/components/refguide/modules/_overview/nav.adoc
@@ -1,3 +1 @@
-* see also:
-** xref:core::about.adoc[Core Framework]
 
diff --git a/antora/components/refguide/modules/_overview/pages/about.adoc b/antora/components/refguide/modules/_overview/pages/about.adoc
index aa080b3..ea8ebb5 100644
--- a/antora/components/refguide/modules/_overview/pages/about.adoc
+++ b/antora/components/refguide/modules/_overview/pages/about.adoc
@@ -33,7 +33,7 @@ package "App\n[Software System]" {
 .Projects/Modules (App)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Starter Parent
 [source,yaml]
@@ -126,7 +126,7 @@ package "Mavendeps\n[Software System]" {
 .Projects/Modules (Mavendeps)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Maven Deps
 [source,yaml]
@@ -408,7 +408,7 @@ package "Testing\n[Software System]" {
 .Projects/Modules (Testing)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Testing
 [source,yaml]
@@ -455,7 +455,7 @@ org.projectlombok:lombok:jar:<managed> +
 
 .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 [...]
+xref:refguide:testing:index/fakedata/applib/IsisModuleTestingFakeDataApplib.adoc[IsisModuleTestingFakeDataApplib], xref:refguide:testing:index/fakedata/applib/services/AbstractRandomValueGenerator.adoc[AbstractRandomValueGenerator], xref:refguide:testing:index/fakedata/applib/services/Addresses.adoc[Addresses], xref:refguide:testing:index/fakedata/applib/services/BigDecimals.adoc[BigDecimals], xref:refguide:testing:index/fakedata/applib/services/BigIntegers.adoc[BigIntegers], xref:refgui [...]
 ****
 
 |Apache Isis Tst - FakeData (fixtures)
@@ -558,7 +558,7 @@ org.apache.isis.core:isis-core-webapp:jar:<managed> +
 
 .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]
+xref:refguide:testing:index/h2console/ui/IsisModuleTestingH2ConsoleUi.adoc[IsisModuleTestingH2ConsoleUi], xref:refguide:testing:index/h2console/ui/services/H2ManagerMenu.adoc[H2ManagerMenu], xref:refguide:testing:index/h2console/ui/webmodule/WebModuleH2Console.adoc[WebModuleH2Console]
 ****
 
 |Apache Isis Tst - HSQLDB Manager (parent)
@@ -587,7 +587,7 @@ org.hsqldb:hsqldb:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc[IsisModuleExtHsqldbMgr], xref:system:generated:index/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc[HsqlDbManagerMenu]
+xref:refguide:extensions:index/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.adoc[IsisModuleExtHsqldbMgr], xref:refguide:extensions:index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc[HsqlDbManagerMenu]
 ****
 
 |Apache Isis Tst - Integ Test Support (parent)
@@ -629,7 +629,7 @@ org.springframework.boot:spring-boot-starter-test:jar:<managed> +
 
 .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/ [...]
+xref:refguide:testing:index/integtestsupport/applib/ExceptionRecognizerTranslate.adoc[ExceptionRecognizerTranslate], xref:refguide:testing:index/integtestsupport/applib/IsisIntegrationTestAbstract.adoc[IsisIntegrationTestAbstract], xref:refguide:testing:index/integtestsupport/applib/IsisInteractionHandler.adoc[IsisInteractionHandler], xref:refguide:testing:index/integtestsupport/applib/ThrowableMatchers.adoc[ThrowableMatchers], xref:refguide:testing:index/integtestsupport/applib/swagger/ [...]
 ****
 
 |Apache Isis Tst - Spec/Cucumber (parent)
@@ -661,7 +661,7 @@ org.junit.jupiter:junit-jupiter-api:jar:<managed> +
 
 .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]
+xref:refguide:testing:index/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc[IsisModuleTestingSpecSupportApplib], xref:refguide:testing:index/specsupport/applib/integration/ObjectFactoryForIntegration.adoc[ObjectFactoryForIntegration], xref:refguide:testing:index/specsupport/applib/specs/V.adoc[V]
 ****
 
 |Apache Isis Tst - Unit Test Support (parent)
@@ -698,7 +698,7 @@ org.springframework.boot:spring-boot-starter-test:jar:<managed> +
 
 .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 [...]
+xref:refguide:testing:index/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.adoc[IsisModuleTestingUnitTestSupportApplib], xref:refguide:testing:index/unittestsupport/applib/bean/AbstractBeanPropertiesTest.adoc[AbstractBeanPropertiesTest], xref:refguide:testing:index/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.adoc[FixtureDatumFactoriesForAnyPojo], xref:refguide:testing:index/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.adoc[FixtureDatumFactorie [...]
 ****
 |===
 
@@ -767,7 +767,7 @@ package "Examples\n[Software System]" {
 .Projects/Modules (Examples)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Demo - Parent
 [source,yaml]
@@ -1134,7 +1134,7 @@ package "Root\n[Software System]" {
 .Projects/Modules (Root)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis (Aggregator)
 [source,yaml]
@@ -1213,7 +1213,7 @@ package "Commons\n[Software System]" {
 .Projects/Modules (Commons)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Commons
 [source,yaml]
@@ -1244,7 +1244,7 @@ org.yaml:snakeyaml:jar:<managed> +
 
 .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 [...]
+xref:refguide:commons:index//collections/Can.adoc[Can], xref:refguide:commons:index//collections/Cardinality.adoc[Cardinality], xref:refguide:commons:index//functional/Result.adoc[Result], xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId], xref:refguide:commons:index//having/HasUpdatedAt.adoc[HasUpdatedAt], xref:refguide:commons:index//having/HasUpdatedBy.adoc[HasUpdatedBy], xref:refguide:commons:index//having/HasUsername.adoc[HasUsername], xref:refguide:commons:index//re [...]
 ****
 |===
 
@@ -1369,7 +1369,7 @@ package "Core\n[Software System]" {
 .Projects/Modules (Core)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Core
 [source,yaml]
@@ -1424,7 +1424,7 @@ org.jmock:jmock:jar:<managed> +
 
 .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 [...]
+xref:refguide:applib:index/AbstractViewModel.adoc[AbstractViewModel], xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:refguide:applib:index/adapters/DefaultsProvider.adoc [...]
 ****
 
 |Apache Isis Core - Code Gen (ByteBuddy)
@@ -1483,7 +1483,7 @@ org.springframework.boot:spring-boot-configuration-processor:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/core/config/datasources/DataSourceIntrospectionService.adoc[DataSourceIntrospectionService]
+xref:refguide:core:index/config/datasources/DataSourceIntrospectionService.adoc[DataSourceIntrospectionService]
 ****
 
 |Apache Isis Core - Interaction
@@ -1512,7 +1512,7 @@ org.apache.isis.core:isis-core-metamodel:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/core/interaction/session/InteractionFactory.adoc[InteractionFactory]
+xref:refguide:core:index/interaction/session/InteractionFactory.adoc[InteractionFactory]
 ****
 
 |Apache Isis Core - Unit Test Support
@@ -1681,7 +1681,7 @@ org.hsqldb:hsqldb:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/core/runtimeservices/transaction/TransactionServiceSpring.adoc[TransactionServiceSpring], xref:system:generated:index/core/runtimeservices/xml/XmlServiceDefault.adoc[XmlServiceDefault]
+xref:refguide:core:index/runtimeservices/transaction/TransactionServiceSpring.adoc[TransactionServiceSpring], xref:refguide:core:index/runtimeservices/xml/XmlServiceDefault.adoc[XmlServiceDefault]
 ****
 
 |Apache Isis Core - Security
@@ -1734,7 +1734,7 @@ org.apache.isis.core:isis-core-metamodel:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/core/transaction/changetracking/EntityChangeTrackerDefault.adoc[EntityChangeTrackerDefault], xref:system:generated:index/core/transaction/events/TransactionAfterCompletionEvent.adoc[TransactionAfterCompletionEvent]
+xref:refguide:core:index/transaction/changetracking/EntityChangeTrackerDefault.adoc[EntityChangeTrackerDefault], xref:refguide:core:index/transaction/events/TransactionAfterCompletionEvent.adoc[TransactionAfterCompletionEvent]
 ****
 
 |Apache Isis Core - WebApp
@@ -1813,7 +1813,7 @@ org.springframework:spring-context:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/schema/IsisModuleSchema.adoc[IsisModuleSchema]
+xref:refguide:schema:index/IsisModuleSchema.adoc[IsisModuleSchema]
 ****
 |===
 
@@ -1891,7 +1891,7 @@ package "JDO\n[Software System]" {
 .Projects/Modules (JDO)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Persistence - JDO
 [source,yaml]
@@ -1923,7 +1923,7 @@ org.datanucleus:javax.jdo:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/persistence/jdo/applib/IsisModulePersistenceJdoApplib.adoc[IsisModulePersistenceJdoApplib], xref:system:generated:index/persistence/jdo/applib/services/JdoSupportService.adoc[JdoSupportService]
+xref:refguide:persistence:index/jdo/applib/IsisModulePersistenceJdoApplib.adoc[IsisModulePersistenceJdoApplib], xref:refguide:persistence:index/jdo/applib/services/JdoSupportService.adoc[JdoSupportService]
 ****
 
 |Apache Isis Persistence - JDO Provider (DataNucleus)
@@ -1962,7 +1962,7 @@ org.springframework.boot:spring-boot-starter-jdbc:jar:<managed> +
 
 .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 [...]
+xref:refguide:persistence:index/jdo/datanucleus/IsisModuleJdoDatanucleus.adoc[IsisModuleJdoDatanucleus], xref:refguide:persistence:index/jdo/datanucleus/changetracking/JdoLifecycleListener.adoc[JdoLifecycleListener], xref:refguide:persistence:index/jdo/datanucleus/dialect/DnJdoDialect.adoc[DnJdoDialect], xref:refguide:persistence:index/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.adoc[Persistable_datanucleusIdLong], xref:refguide:persistence:index/jdo/datanucleus/mixins/Persistab [...]
 ****
 
 |Apache Isis Persistence - JDO (integration)
@@ -2115,7 +2115,7 @@ package "JPA\n[Software System]" {
 .Projects/Modules (JPA)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Persistence - JPA
 [source,yaml]
@@ -2145,7 +2145,7 @@ org.apache.isis.core:isis-applib:jar:<managed> +
 
 .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]
+xref:refguide:persistence:index/jpa/applib/integration/JpaEntityInjectionPointResolver.adoc[JpaEntityInjectionPointResolver], xref:refguide:persistence:index/jpa/applib/services/JpaSupportService.adoc[JpaSupportService]
 ****
 
 |Apache Isis Persistence - JPA EclipseLink
@@ -2168,7 +2168,7 @@ org.springframework.boot:spring-boot-starter-data-jpa:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.adoc[IsisModuleJpaEclipselink]
+xref:refguide:persistence:index/jpa/eclipselink/IsisModuleJpaEclipselink.adoc[IsisModuleJpaEclipselink]
 ****
 
 |Apache Isis Persistence - JPA (integration)
@@ -2250,7 +2250,7 @@ package "Bypass\n[Software System]" {
 .Projects/Modules (Bypass)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Security - Bypass
 [source,yaml]
@@ -2273,7 +2273,7 @@ org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
 
 .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]
+xref:refguide:security:index/bypass/IsisModuleSecurityBypass.adoc[IsisModuleSecurityBypass], xref:refguide:security:index/bypass/authentication/AuthenticatorBypass.adoc[AuthenticatorBypass], xref:refguide:security:index/bypass/authorization/AuthorizorBypass.adoc[AuthorizorBypass]
 ****
 |===
 
@@ -2307,7 +2307,7 @@ package "Keycloak\n[Software System]" {
 .Projects/Modules (Keycloak)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Security - Keycloak
 [source,yaml]
@@ -2336,7 +2336,7 @@ org.apache.isis.core:isis-core-webapp:jar:<managed> +
 
 .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 [...]
+xref:refguide:security:index/keycloak/IsisModuleSecurityKeycloak.adoc[IsisModuleSecurityKeycloak], xref:refguide:security:index/keycloak/authentication/AuthenticatorKeycloak.adoc[AuthenticatorKeycloak], xref:refguide:security:index/keycloak/authorization/AuthorizorKeycloak.adoc[AuthorizorKeycloak], xref:refguide:security:index/keycloak/webmodule/KeycloakFilter.adoc[KeycloakFilter], xref:refguide:security:index/keycloak/webmodule/WebModuleKeycloak.adoc[WebModuleKeycloak]
 ****
 |===
 
@@ -2370,7 +2370,7 @@ package "Shiro\n[Software System]" {
 .Projects/Modules (Shiro)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Security - Shiro
 [source,yaml]
@@ -2401,7 +2401,7 @@ org.apache.shiro:shiro-web:jar:<managed> +
 
 .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 [...]
+xref:refguide:security:index/shiro/IsisModuleSecurityShiro.adoc[IsisModuleSecurityShiro], xref:refguide:security:index/shiro/authentication/AuthenticatorShiro.adoc[AuthenticatorShiro], xref:refguide:security:index/shiro/authorization/AuthorizorShiro.adoc[AuthorizorShiro], xref:refguide:security:index/shiro/authorization/IsisPermission.adoc[IsisPermission], xref:refguide:security:index/shiro/authorization/IsisPermissionResolver.adoc[IsisPermissionResolver], xref:refguide:security:index/sh [...]
 ****
 |===
 
@@ -2435,7 +2435,7 @@ package "Viewer\n[Software System]" {
 .Projects/Modules (Viewer)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Viewer - Common Model
 [source,yaml]
@@ -2526,7 +2526,7 @@ package "Restful Objects\n[Software System]" {
 .Projects/Modules (Restful Objects)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Viewer - RO
 [source,yaml]
@@ -2556,7 +2556,7 @@ org.apache.isis.core:isis-core-internaltestsupport:jar:<managed> +
 
 .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 [...]
+xref:refguide:viewer:index/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.adoc[IsisModuleViewerRestfulObjectsApplib], xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation], xref:refguide:viewer:index/restfulobjects/applib/LinkRepresentation.adoc[LinkRepresentation], xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel], xref:refguide:viewer:index/restfulobjects/applib/RelDefinition.adoc[RelDefinition], xref:refguide:viewer:index [...]
 ****
 
 |Apache Isis Viewer - RO (JAX-RS Resteasy v4)
@@ -2587,7 +2587,7 @@ org.jboss.resteasy:resteasy-spring-boot-starter:jar:<managed> +
 
 .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]
+xref:refguide:viewer:index/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.adoc[IsisModuleViewerRestfulObjectsJaxrsResteasy4], xref:refguide:viewer:index/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.adoc[RestfulObjectsJaxbWriterForXml], xref:refguide:viewer:index/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.adoc[WebModuleJaxrsResteasy4]
 ****
 
 |Apache Isis Viewer - RO (Rendering)
@@ -2625,7 +2625,7 @@ org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:<managed> +
 
 .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 [...]
+xref:refguide:viewer:index/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.adoc[IsisModuleRestfulObjectsRendering], xref:refguide:viewer:index/restfulobjects/rendering/service/RepresentationService.adoc[RepresentationService], xref:refguide:viewer:index/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc[RepresentationServiceContentNegotiator], xref:refguide:viewer:index/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.adoc[Acce [...]
 ****
 
 |Apache Isis Viewer - RO (Testing)
@@ -2679,7 +2679,7 @@ org.datanucleus:javax.jdo:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/viewer/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc[IsisModuleViewerRestfulObjectsViewer]
+xref:refguide:viewer:index/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.adoc[IsisModuleViewerRestfulObjectsViewer]
 ****
 |===
 
@@ -2734,7 +2734,7 @@ package "Wicket\n[Software System]" {
 .Projects/Modules (Wicket)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Viewer - Wicket
 [source,yaml]
@@ -2765,7 +2765,7 @@ org.apache.wicket:wicket-extensions:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/viewer/wicket/model/IsisModuleViewerWicketModel.adoc[IsisModuleViewerWicketModel]
+xref:refguide:viewer:index/wicket/model/IsisModuleViewerWicketModel.adoc[IsisModuleViewerWicketModel]
 ****
 
 |Apache Isis Viewer - Wicket (UI Components)
@@ -2806,7 +2806,7 @@ org.wicketstuff:wicketstuff-select2:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/viewer/wicket/ui/IsisModuleViewerWicketUi.adoc[IsisModuleViewerWicketUi]
+xref:refguide:viewer:index/wicket/ui/IsisModuleViewerWicketUi.adoc[IsisModuleViewerWicketUi]
 ****
 
 |Apache Isis Viewer - Wicket (Viewer)
@@ -2850,7 +2850,7 @@ org.springframework:spring-web:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/viewer/wicket/viewer/IsisModuleViewerWicketViewer.adoc[IsisModuleViewerWicketViewer]
+xref:refguide:viewer:index/wicket/viewer/IsisModuleViewerWicketViewer.adoc[IsisModuleViewerWicketViewer]
 ****
 |===
 
@@ -2919,7 +2919,7 @@ package "Valuetypes\n[Software System]" {
 .Projects/Modules (Valuetypes)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Value types
 [source,yaml]
@@ -2963,7 +2963,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
 
 .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]
+xref:refguide:valuetypes:index/sse/applib/IsisModuleValSseApplib.adoc[IsisModuleValSseApplib], xref:refguide:valuetypes:index/sse/applib/annotations/ServerSentEvents.adoc[ServerSentEvents], xref:refguide:valuetypes:index/sse/applib/annotations/SseSource.adoc[SseSource], xref:refguide:valuetypes:index/sse/applib/service/SseChannel.adoc[SseChannel], xref:refguide:valuetypes:index/sse/applib/service/SseService.adoc[SseService]
 ****
 
 |Apache Isis Val - Server Sent Events (metamodel)
@@ -3023,7 +3023,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
 
 .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]
+xref:refguide:valuetypes:index/sse/ui/wkt/IsisModuleValSseUiWkt.adoc[IsisModuleValSseUiWkt], xref:refguide:valuetypes:index/sse/ui/wkt/services/SseServiceDefault.adoc[SseServiceDefault], xref:refguide:valuetypes:index/sse/ui/wkt/webmodule/WebModuleServerSentEvents.adoc[WebModuleServerSentEvents]
 ****
 |===
 
@@ -3105,7 +3105,7 @@ package "Asciidoc\n[Software System]" {
 .Projects/Modules (Asciidoc)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Val - Asciidoctor (parent)
 [source,yaml]
@@ -3134,7 +3134,7 @@ org.asciidoctor:asciidoctorj-api:jar:${asciidoctorj.version} +
 
 .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]
+xref:refguide:valuetypes:index/asciidoc/applib/IsisModuleValAsciidocApplib.adoc[IsisModuleValAsciidocApplib], xref:refguide:valuetypes:index/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.adoc[AsciiDocJaxbAdapter], xref:refguide:valuetypes:index/asciidoc/applib/value/AsciiDoc.adoc[AsciiDoc]
 ****
 
 |Apache Isis Val - Asciidoctor (MetaModel)
@@ -3159,7 +3159,7 @@ org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/valuetypes/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc[IsisModuleValAsciidocMetaModel]
+xref:refguide:valuetypes:index/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.adoc[IsisModuleValAsciidocMetaModel]
 ****
 
 |Apache Isis Val - Asciidoctor (Persistence)
@@ -3191,7 +3191,7 @@ org.datanucleus:datanucleus-core:jar:<managed> +
 
 .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]
+xref:refguide:valuetypes:index/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.adoc[IsisModuleValAsciidocPersistenceJdoDn5], xref:refguide:valuetypes:index/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.adoc[IsisAsciiDocConverter]
 ****
 
 |Apache Isis Val - Asciidoctor (ui)
@@ -3257,7 +3257,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/valuetypes/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc[IsisModuleValAsciidocUiWkt]
+xref:refguide:valuetypes:index/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.adoc[IsisModuleValAsciidocUiWkt]
 ****
 |===
 
@@ -3333,7 +3333,7 @@ package "Markdown\n[Software System]" {
 .Projects/Modules (Markdown)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Val - Markdown (parent)
 [source,yaml]
@@ -3362,7 +3362,7 @@ org.apache.isis.core:isis-applib:jar:<managed> +
 
 .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]
+xref:refguide:valuetypes:index/markdown/applib/IsisModuleValMarkdownApplib.adoc[IsisModuleValMarkdownApplib], xref:refguide:valuetypes:index/markdown/applib/jaxb/MarkdownJaxbAdapter.adoc[MarkdownJaxbAdapter], xref:refguide:valuetypes:index/markdown/applib/value/Converter.adoc[Converter]
 ****
 
 |Apache Isis Val - Markdown (MetaModel)
@@ -3387,7 +3387,7 @@ org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/valuetypes/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc[IsisModuleValMarkdownMetaModel]
+xref:refguide:valuetypes:index/markdown/metamodel/IsisModuleValMarkdownMetaModel.adoc[IsisModuleValMarkdownMetaModel]
 ****
 
 |Apache Isis Val - Markdown (Persistence)
@@ -3420,7 +3420,7 @@ org.datanucleus:datanucleus-core:jar:<managed> +
 
 .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]
+xref:refguide:valuetypes:index/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.adoc[IsisModuleValMarkdownPersistenceJdoDn5], xref:refguide:valuetypes:index/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.adoc[IsisMarkdownConverter]
 ****
 
 |Apache Isis Val - Markdown (ui)
@@ -3454,7 +3454,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/valuetypes/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc[IsisModuleValMarkdownUiWkt]
+xref:refguide:valuetypes:index/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.adoc[IsisModuleValMarkdownUiWkt]
 ****
 |===
 
@@ -3490,7 +3490,7 @@ package "Mappings\n[Software System]" {
 .Projects/Modules (Mappings)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Mappings
 [source,yaml]
@@ -3553,7 +3553,7 @@ package "JAX-RS Client Library\n[Software System]" {
 .Projects/Modules (JAX-RS Client Library)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Map - JaxRS Client (parent)
 [source,yaml]
@@ -3581,7 +3581,7 @@ org.springframework:spring-context:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.adoc[IsisModuleExtJaxRsClientApplib], xref:refguide:extensions:index/jaxrsclient/applib/client/JaxRsClient.adoc[JaxRsClient], xref:refguide:extensions:index/jaxrsclient/applib/client/JaxRsResponse.adoc[JaxRsResponse]
 ****
 
 |Apache Isis Map - JaxRS Client (impl)
@@ -3635,7 +3635,7 @@ package "REST Client\n[Software System]" {
 .Projects/Modules (REST Client)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Ext - REST Client (parent)
 [source,yaml]
@@ -3665,7 +3665,7 @@ org.springframework:spring-context:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/restclient/ActionParameterListBuilder.adoc[ActionParameterListBuilder], xref:refguide:extensions:index/restclient/IsisModuleExtRestClient.adoc[IsisModuleExtRestClient], xref:refguide:extensions:index/restclient/ResponseDigest.adoc[ResponseDigest], xref:refguide:extensions:index/restclient/RestfulClient.adoc[RestfulClient], xref:refguide:extensions:index/restclient/RestfulClientConfig.adoc[RestfulClientConfig], xref:refguide:extensions:index/restclient/Restf [...]
 ****
 |===
 
@@ -3853,7 +3853,7 @@ package "Extensions\n[Software System]" {
 .Projects/Modules (Extensions)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Extensions
 [source,yaml]
@@ -3899,7 +3899,7 @@ org.springframework:spring-web:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/extensions/cors/impl/IsisModuleExtCorsImpl.adoc[IsisModuleExtCorsImpl]
+xref:refguide:extensions:index/cors/impl/IsisModuleExtCorsImpl.adoc[IsisModuleExtCorsImpl]
 ****
 
 |Apache Isis Ext - Wicket Viewer - Excel Download (parent)
@@ -3934,7 +3934,7 @@ org.apache.poi:poi-ooxml-schemas:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.adoc[IsisModuleExtExcelDownloadUi], xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc[CollectionContentsAsExcel], xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc[CollectionContentsAsExcelFactory]
 ****
 
 |Apache Isis Ext - Flyway
@@ -3990,7 +3990,7 @@ org.apache.isis.core:isis-applib:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/fullcalendar/applib/CalendarEventable.adoc[CalendarEventable], xref:refguide:extensions:index/fullcalendar/applib/Calendarable.adoc[Calendarable], xref:refguide:extensions:index/fullcalendar/applib/IsisModuleExtFullCalendarApplib.adoc[IsisModuleExtFullCalendarApplib], xref:refguide:extensions:index/fullcalendar/applib/spi/CalendarableDereferencingService.adoc[CalendarableDereferencingService], xref:refguide:extensions:index/fullcalendar/applib/value/Calenda [...]
 ****
 
 |Apache Isis Ext - Wicket Viewer - fullcalendar (ui)
@@ -4010,7 +4010,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/extensions/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc[IsisModuleExtFullCalendarUi]
+xref:refguide:extensions:index/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.adoc[IsisModuleExtFullCalendarUi]
 ****
 
 |Apache Isis Ext - Wicket Viewer - pdf.js (parent)
@@ -4039,7 +4039,7 @@ org.apache.isis.core:isis-applib:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.adoc[PdfJsViewer], xref:refguide:extensions:index/viewer/wicket/pdfjs/applib/config/PdfJsConfig.adoc[PdfJsConfig], xref:refguide:extensions:index/viewer/wicket/pdfjs/applib/config/Scale.adoc[Scale], xref:refguide:extensions:index/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc[PdfJsViewerAdvisor]
 ****
 
 |Apache Isis Ext - Wicket Viewer - pdf.js (metamodel)
@@ -4083,7 +4083,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:system:generated:index/extensions/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc[IsisModuleExtPdfjsUi]
+xref:refguide:extensions:index/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.adoc[IsisModuleExtPdfjsUi]
 ****
 
 |Apache Isis Ext - Sec Man
@@ -4110,7 +4110,7 @@ Folder: \extensions\security\secman\api
 ----
 |.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 [...]
+xref:refguide:extensions:index/secman/api/IsisModuleExtSecmanApi.adoc[IsisModuleExtSecmanApi], xref:refguide:extensions:index/secman/api/SecmanConfiguration.adoc[SecmanConfiguration], xref:refguide:extensions:index/secman/api/SecurityRealm.adoc[SecurityRealm], xref:refguide:extensions:index/secman/api/SecurityRealmCharacteristic.adoc[SecurityRealmCharacteristic], xref:refguide:extensions:index/secman/api/SecurityRealmService.adoc[SecurityRealmService], xref:refguide:extensions:index/secm [...]
 ****
 
 |Apache Isis Ext - Sec Man Encryption (Using jbcrypt)
@@ -4135,7 +4135,7 @@ org.mindrot:jbcrypt:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.adoc[IsisModuleExtSecmanEncryptionJbcrypt], xref:refguide:extensions:index/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.adoc[PasswordEncryptionServiceUsingJBcrypt]
 ****
 
 |Apache Isis Ext - Sec Man Model
@@ -4159,7 +4159,7 @@ org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/secman/model/IsisModuleExtSecmanModel.adoc[IsisModuleExtSecmanModel], xref:refguide:extensions:index/secman/model/app/user/MeService.adoc[MeService]
 ****
 
 |Apache Isis Ext - Sec Man Persistence (Using JDO)
@@ -4191,7 +4191,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/secman/jdo/IsisModuleExtSecmanPersistenceJdo.adoc[IsisModuleExtSecmanPersistenceJdo], xref:refguide:extensions:index/secman/jdo/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService], xref:refguide:extensions:index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc[SeedUsersAndRolesFixtureScript], xref:refguide:extensions:index/secman/jdo/seed/scripts/GlobalTenancy.adoc[GlobalTenancy], xref:refguide:extensions:index/secman/jdo/seed/scripts/IsisExtF [...]
 ****
 
 |Apache Isis Ext - Sec Man Persistence (Using JPA)
@@ -4222,7 +4222,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/secman/jpa/IsisModuleExtSecmanPersistenceJpa.adoc[IsisModuleExtSecmanPersistenceJpa], xref:refguide:extensions:index/secman/jpa/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService], xref:refguide:extensions:index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc[SeedUsersAndRolesFixtureScript], xref:refguide:extensions:index/secman/jpa/seed/scripts/GlobalTenancy.adoc[GlobalTenancy], xref:refguide:extensions:index/secman/jpa/seed/scripts/IsisExtF [...]
 ****
 
 |Apache Isis Ext - Sec Man Realm (Using Shiro)
@@ -4247,7 +4247,7 @@ org.apache.isis.security:isis-security-shiro:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc[IsisModuleExtSecmanRealmShiro], xref:refguide:extensions:index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc[IsisModuleExtSecmanShiroRealm], xref:refguide:extensions:index/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc[SecurityRealmServiceUsingShiro], xref:refguide:extensions:index/secman/shiro/util/ShiroUtils.adoc[ShiroUtils]
 ****
 
 |Apache Isis Ext - Security - Shiro LDAP Realm (parent)
@@ -4276,7 +4276,7 @@ org.apache.isis.security:isis-security-shiro:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc[IsisLdapContextFactory], xref:refguide:extensions:index/shirorealmldap/realm/impl/IsisLdapRealm.adoc[IsisLdapRealm], xref:refguide:extensions:index/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.adoc[IsisModuleExtShiroRealmLdapImpl]
 ****
 |===
 
@@ -4317,7 +4317,7 @@ package "Core: Command Log\n[Software System]" {
 .Projects/Modules (Core: Command Log)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Ext - Command Log
 [source,yaml]
@@ -4359,7 +4359,7 @@ org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/commandlog/impl/CommandSubscriberForJdo.adoc[CommandSubscriberForJdo], xref:refguide:extensions:index/commandlog/impl/IsisModuleExtCommandLogImpl.adoc[IsisModuleExtCommandLogImpl], xref:refguide:extensions:index/commandlog/impl/mixins/HasUniqueId_command.adoc[HasUniqueId_command], xref:refguide:extensions:index/commandlog/impl/mixins/HasUsername_recentCommandsByUser.adoc[HasUsername_recentCommandsByUser], xref:refguide:extensions:index/commandlog/impl/ui/Co [...]
 ****
 |===
 
@@ -4407,7 +4407,7 @@ package "Core: Command Replay\n[Software System]" {
 .Projects/Modules (Core: Command Replay)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Ext - Command Replay
 [source,yaml]
@@ -4448,7 +4448,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.adoc[IsisModuleExtCommandReplayPrimary], xref:refguide:extensions:index/commandreplay/primary/config/PrimaryConfig.adoc[PrimaryConfig], xref:refguide:extensions:index/commandreplay/primary/mixins/Object_openOnSecondary.adoc[Object_openOnSecondary], xref:refguide:extensions:index/commandreplay/primary/restapi/CommandRetrievalService.adoc[CommandRetrievalService], xref:refguide:extensions:index/commandre [...]
 ****
 
 |Apache Isis Ext - Command Replay for Secondary
@@ -4487,7 +4487,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.adoc[IsisModuleExtCommandReplaySecondary], xref:refguide:extensions:index/commandreplay/secondary/SecondaryStatus.adoc[SecondaryStatus], xref:refguide:extensions:index/commandreplay/secondary/analyser/CommandReplayAnalyser.adoc[CommandReplayAnalyser], xref:refguide:extensions:index/commandreplay/secondary/analyser/CommandReplayAnalyserException.adoc[CommandReplayAnalyserException], xref:refguide:ex [...]
 ****
 |===
 
@@ -4521,7 +4521,7 @@ package "Core: Model Annotation\n[Software System]" {
 .Projects/Modules (Core: Model Annotation)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Ext - @Model
 [source,yaml]
@@ -4547,7 +4547,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> +
 
 .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 [...]
+xref:refguide:extensions:index/modelannotation/applib/IsisModuleIncModelApplib.adoc[IsisModuleIncModelApplib], xref:refguide:extensions:index/modelannotation/applib/annotation/Model.adoc[Model], xref:refguide:extensions:index/modelannotation/metamodel/IsisModuleExtModelAnnotation.adoc[IsisModuleExtModelAnnotation], xref:refguide:extensions:index/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.adoc[SupportingMethodValidatorRefinerFactory], xref:refguide:extensions [...]
 ****
 |===
 
@@ -4588,7 +4588,7 @@ package "Core: Quartz\n[Software System]" {
 .Projects/Modules (Core: Quartz)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Ext - Quartz
 [source,yaml]
@@ -4618,7 +4618,7 @@ org.springframework.boot:spring-boot-starter-quartz:jar:<managed> +
 
 .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]
+xref:refguide:extensions:index/quartz/IsisModuleExtQuartzImpl.adoc[IsisModuleExtQuartzImpl], xref:refguide:extensions:index/quartz/context/JobExecutionData.adoc[JobExecutionData], xref:refguide:extensions:index/quartz/spring/AutowiringSpringBeanJobFactory.adoc[AutowiringSpringBeanJobFactory]
 ****
 |===
 
@@ -4734,7 +4734,7 @@ package "Subdomains\n[Software System]" {
 .Projects/Modules (Subdomains)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Subdomains
 [source,yaml]
@@ -4914,7 +4914,7 @@ package "Base\n[Software System]" {
 .Projects/Modules (Base)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Sub - Base (parent)
 [source,yaml]
@@ -4950,7 +4950,7 @@ org.datanucleus:javax.jdo:jar:<managed> +
 
 .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],  [...]
+xref:refguide:subdomains:index/base/applib/Chained.adoc[Chained], xref:refguide:subdomains:index/base/applib/Dflt.adoc[Dflt], xref:refguide:subdomains:index/base/applib/IsisModuleSubdomainsBaseApplib.adoc[IsisModuleSubdomainsBaseApplib], xref:refguide:subdomains:index/base/applib/PowerType.adoc[PowerType], xref:refguide:subdomains:index/base/applib/Titled.adoc[Titled], xref:refguide:subdomains:index/base/applib/TitledEnum.adoc[TitledEnum], xref:refguide:subdomains:index/base/applib/servi [...]
 ****
 |===
 
@@ -5012,7 +5012,7 @@ package "Excel\n[Software System]" {
 .Projects/Modules (Excel)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Sub - Excel (parent)
 [source,yaml]
@@ -5052,7 +5052,7 @@ org.apache.poi:poi-ooxml-schemas:jar:<managed> +
 
 .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 [...]
+xref:refguide:subdomains:index/excel/applib/IsisModuleSubdomainsExcelApplib.adoc[IsisModuleSubdomainsExcelApplib], xref:refguide:subdomains:index/excel/applib/dom/AggregationType.adoc[AggregationType], xref:refguide:subdomains:index/excel/applib/dom/ExcelMetaDataEnabled.adoc[ExcelMetaDataEnabled], xref:refguide:subdomains:index/excel/applib/dom/ExcelService.adoc[ExcelService], xref:refguide:subdomains:index/excel/applib/dom/HyperLink.adoc[HyperLink], xref:refguide:subdomains:index/excel/ [...]
 ****
 
 |Apache Isis Sub - Excel (Fixtures)
@@ -5107,7 +5107,7 @@ org.projectlombok:lombok:jar:<managed> +
 
 .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 [...]
+xref:refguide:subdomains:index/excel/testing/ExcelFixture.adoc[ExcelFixture], xref:refguide:subdomains:index/excel/testing/ExcelFixture2.adoc[ExcelFixture2], xref:refguide:subdomains:index/excel/testing/ExcelFixtureRowHandler.adoc[ExcelFixtureRowHandler], xref:refguide:subdomains:index/excel/testing/ExcelFixtureWorkbookHandler.adoc[ExcelFixtureWorkbookHandler], xref:refguide:subdomains:index/excel/testing/FixtureAwareRowHandler.adoc[FixtureAwareRowHandler], xref:refguide:subdomains:index [...]
 ****
 |===
 
@@ -5148,7 +5148,7 @@ package "Spring\n[Software System]" {
 .Projects/Modules (Spring)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Sub - Spring (parent)
 [source,yaml]
@@ -5181,7 +5181,7 @@ org.apache.isis.core:isis-core-runtime:jar:<managed> +
 
 .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]
+xref:refguide:subdomains:index/spring/applib/IsisModuleSubdomainsSpringApplib.adoc[IsisModuleSubdomainsSpringApplib], xref:refguide:subdomains:index/spring/applib/service/BeanDescriptor.adoc[BeanDescriptor], xref:refguide:subdomains:index/spring/applib/service/ContextBeans.adoc[ContextBeans], xref:refguide:subdomains:index/spring/applib/service/SpringBeansService.adoc[SpringBeansService]
 ****
 |===
 
@@ -5222,7 +5222,7 @@ package "XDocReport\n[Software System]" {
 .Projects/Modules (XDocReport)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Sub - XdocReport (parent)
 [source,yaml]
@@ -5261,7 +5261,7 @@ org.projectlombok:lombok:jar:<managed> +
 
 .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]
+xref:refguide:subdomains:index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.adoc[IsisModuleSubdomainsXDocReportApplib], xref:refguide:subdomains:index/xdocreport/applib/service/OutputType.adoc[OutputType], xref:refguide:subdomains:index/xdocreport/applib/service/XDocReportModel.adoc[XDocReportModel], xref:refguide:subdomains:index/xdocreport/applib/service/XDocReportService.adoc[XDocReportService]
 ****
 |===
 
@@ -5337,7 +5337,7 @@ package "Tooling\n[Software System]" {
 .Projects/Modules (Tooling)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis - Tooling
 [source,yaml]
@@ -5516,7 +5516,7 @@ package "Regression Tests\n[Software System]" {
 .Projects/Modules (Regression Tests)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis - Regression Tests
 [source,yaml]
@@ -5618,7 +5618,7 @@ package "Incubator\n[Software System]" {
 .Projects/Modules (Incubator)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Incubator
 [source,yaml]
@@ -5666,7 +5666,7 @@ package "Kroviz Client\n[Software System]" {
 .Projects/Modules (Kroviz Client)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Inc - Client kroViz
 [source,yaml]
@@ -5730,7 +5730,7 @@ package "JavaFX Viewer\n[Software System]" {
 .Projects/Modules (JavaFX Viewer)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Inc - Viewer JavaFX
 [source,yaml]
@@ -5863,7 +5863,7 @@ package "Vaadin Viewer\n[Software System]" {
 .Projects/Modules (Vaadin Viewer)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Inc - Viewer Vaadin
 [source,yaml]
@@ -6003,7 +6003,7 @@ package "Legacy\n[Software System]" {
 .Projects/Modules (Legacy)
 [cols="3a,5a", options="header"]
 |===
-|Coordinates |Description 
+|Coordinates |Description
 
 |Apache Isis Legacy
 [source,yaml]
diff --git a/antora/components/refguide/modules/applib/pages/index/RecreatableDomainObject.adoc b/antora/components/refguide/modules/applib/pages/index/RecreatableDomainObject.adoc
index 36a8bdb..61fc698 100644
--- a/antora/components/refguide/modules/applib/pages/index/RecreatableDomainObject.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/RecreatableDomainObject.adoc
@@ -2,7 +2,7 @@
 
 Indicates that the domain object can be recreated from a string.
 
-Objects that are view models (logically belonging to the UI/application layer) should instead implement xref:system:generated:index/applib/ViewModel.adoc[ViewModel] .
+Objects that are view models (logically belonging to the UI/application layer) should instead implement xref:refguide:applib:index/ViewModel.adoc[ViewModel] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/ViewModel.adoc b/antora/components/refguide/modules/applib/pages/index/ViewModel.adoc
index c143231..7e7d5df 100644
--- a/antora/components/refguide/modules/applib/pages/index/ViewModel.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/ViewModel.adoc
@@ -2,7 +2,7 @@
 
 Indicates that an object belongs to the UI/application layer, and is intended to be used as a view model.
 
-Objects that are part of the domain object layer should instead implement xref:system:generated:index/applib/RecreatableDomainObject.adoc[RecreatableDomainObject] .
+Objects that are part of the domain object layer should instead implement xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/adapters/Parser.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/Parser.adoc
index 81301ed..1af52ee 100644
--- a/antora/components/refguide/modules/applib/pages/index/adapters/Parser.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/adapters/Parser.adoc
@@ -8,7 +8,7 @@ Specifically, this interface embodies three related capabilities:
 * to provide a string representation of the object, for use as its title.
 * to indicate the typical length of such a string representation.
 
-For custom-written (as opposed to third-party) value types, the ability for the xref:system:generated:index/applib/adapters/Parser.adoc[Parser] to provide a title responsibilities overlap with other conventions for domain objects. Specifically, normally we write a `title()` method to return a title. In such cases a typical implementation of xref:system:generated:index/applib/adapters/Parser.adoc[Parser] would just delegate to the value type itself to obtain the title (ie invoking the `ti [...]
+For custom-written (as opposed to third-party) value types, the ability for the xref:refguide:applib:index/adapters/Parser.adoc[Parser] to provide a title responsibilities overlap with other conventions for domain objects. Specifically, normally we write a `title()` method to return a title. In such cases a typical implementation of xref:refguide:applib:index/adapters/Parser.adoc[Parser] would just delegate to the value type itself to obtain the title (ie invoking the `title()` method di [...]
 
 For third-party value types, eg seeTime-and-Moneythere is no ability to write `title()` methods; so this is the main reason that this interface has to deal with titles and lengths.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/adapters/ValueSemanticsProvider.adoc b/antora/components/refguide/modules/applib/pages/index/adapters/ValueSemanticsProvider.adoc
index bbbd564..7ff0a86 100644
--- a/antora/components/refguide/modules/applib/pages/index/adapters/ValueSemanticsProvider.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/adapters/ValueSemanticsProvider.adoc
@@ -2,7 +2,7 @@
 
 Provides a mechanism for providing a set of value semantics.
 
-This interface is used by xref:system:generated:index/applib/annotation/Value.adoc[Value] to allow these semantics to be provided through a single point. Alternatively, xref:system:generated:index/applib/annotation/Value.adoc[Value] supports this information being provided via the configuration files.
+This interface is used by xref:refguide:applib:index/annotation/Value.adoc[Value] to allow these semantics to be provided through a single point. Alternatively, xref:refguide:applib:index/annotation/Value.adoc[Value] supports this information being provided via the configuration files.
 
 Whatever the class that implements this interface, it must also expose either a `public` no-arg constructor, or (for implementations that also are `Facet` s) a `public` constructor that accepts a `FacetHolder` , and `IsisConfiguration` and a `ValueSemanticsProviderContext` . This constructor is then used by the framework to instantiate the object reflectively.
 
@@ -21,17 +21,17 @@ interface ValueSemanticsProvider<T> {
 <.> xref:#getParser__[getParser()]
 +
 --
-The xref:system:generated:index/applib/adapters/Parser.adoc[Parser] , if any.
+The xref:refguide:applib:index/adapters/Parser.adoc[Parser] , if any.
 --
 <.> xref:#getEncoderDecoder__[getEncoderDecoder()]
 +
 --
-The xref:system:generated:index/applib/adapters/EncoderDecoder.adoc[EncoderDecoder] , if any.
+The xref:refguide:applib:index/adapters/EncoderDecoder.adoc[EncoderDecoder] , if any.
 --
 <.> xref:#getDefaultsProvider__[getDefaultsProvider()]
 +
 --
-The xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider] , if any.
+The xref:refguide:applib:index/adapters/DefaultsProvider.adoc[DefaultsProvider] , if any.
 --
 
 == Members
@@ -39,16 +39,16 @@ The xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsPr
 [#getParser__]
 === getParser()
 
-The xref:system:generated:index/applib/adapters/Parser.adoc[Parser] , if any.
+The xref:refguide:applib:index/adapters/Parser.adoc[Parser] , if any.
 
 [#getEncoderDecoder__]
 === getEncoderDecoder()
 
-The xref:system:generated:index/applib/adapters/EncoderDecoder.adoc[EncoderDecoder] , if any.
+The xref:refguide:applib:index/adapters/EncoderDecoder.adoc[EncoderDecoder] , if any.
 
 [#getDefaultsProvider__]
 === getDefaultsProvider()
 
-The xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider] , if any.
+The xref:refguide:applib:index/adapters/DefaultsProvider.adoc[DefaultsProvider] , if any.
 
 If not `null` , implies that the value has (or may have) a default.
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Action.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Action.adoc
index 6c459dc..c90514a 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Action.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Action.adoc
@@ -35,22 +35,22 @@ Specifies the sequence/order in the UI for an action that's been associated with
 <.> xref:#commandDtoProcessor[commandDtoProcessor]
 +
 --
-The xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
+The xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
 --
 <.> xref:#commandPublishing[commandPublishing]
 +
 --
-Whether action invocations, captured as xref:system:generated:index/applib/services/command/Command.adoc[Command] s, should be published to xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
+Whether action invocations, captured as xref:refguide:applib:index/services/command/Command.adoc[Command] s, should be published to xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
 --
 <.> xref:#domainEvent[domainEvent]
 +
 --
-Indicates that an invocation of the action should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
+Indicates that an invocation of the action should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService_ using a custom (subclass of) xref:refguide:applib:index/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
 --
 <.> xref:#executionPublishing[executionPublishing]
 +
 --
-Whether xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] s (triggered by action invocations), should be published to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
+Whether xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] s (triggered by action invocations), should be published to xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
 --
 <.> xref:#hidden[hidden]
 +
@@ -75,7 +75,7 @@ If the action returns a collection, then this hints as to the run-time type of t
 <.> xref:#fileAccept[fileAccept]
 +
 --
-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` ).
+For downloading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ).
 --
 
 == Members
@@ -87,7 +87,7 @@ Associates this action with a property or collection, specifying its id.
 
 This is an alternative to using _MemberOrder#name()_ . To specify the order (equivalent to _MemberOrder#sequence()_ }), use _#associateWithSequence()_ .
 
-For example `@Action(associateWith="items", associateWithSequence="2.1")` 
+For example `@Action(associateWith="items", associateWithSequence="2.1")`
 
 If an action is associated with a collection, then any matching parameters will have their choices automatically inferred from the collection (if not otherwise specified) and any collection parameter defaults can be specified using checkboxes (in the Wicket UI, at least).
 
@@ -98,24 +98,24 @@ Specifies the sequence/order in the UI for an action that's been associated with
 
 This is an alternative to using _MemberOrder#sequence()_ , but is ignored if _Action#associateWith()_ isn't also specified.
 
-For example: `@Action(associateWith="items", associateWithSequence="2.1")` 
+For example: `@Action(associateWith="items", associateWithSequence="2.1")`
 
 [#commandDtoProcessor]
 === commandDtoProcessor
 
-The xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
+The xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
 
-The processor itself is used by xref:system:generated:index/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc[ContentMappingServiceForCommandDto] and xref:system:generated:index/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc[ContentMappingServiceForCommandsDto] to dynamically transform the DTOs.
+The processor itself is used by xref:refguide:applib:index/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc[ContentMappingServiceForCommandDto] and xref:refguide:applib:index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc[ContentMappingServiceForCommandsDto] to dynamically transform the DTOs.
 
 [#commandPublishing]
 === commandPublishing
 
-Whether action invocations, captured as xref:system:generated:index/applib/services/command/Command.adoc[Command] s, should be published to xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
+Whether action invocations, captured as xref:refguide:applib:index/services/command/Command.adoc[Command] s, should be published to xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
 
 [#domainEvent]
 === domainEvent
 
-Indicates that an invocation of the action should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
+Indicates that an invocation of the action should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService_ using a custom (subclass of) xref:refguide:applib:index/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
 
 Subscribers of this event can interact with the business rule checking (hide, disable, validate) and its modification (before and after).
 
@@ -137,7 +137,7 @@ This subclass must provide a no-arg constructor; the fields are set reflectively
 [#executionPublishing]
 === executionPublishing
 
-Whether xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] s (triggered by action invocations), should be published to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
+Whether xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] s (triggered by action invocations), should be published to xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
 
 [#hidden]
 === hidden
@@ -146,7 +146,7 @@ Indicates where (in the UI) the action is not visible to the user.
 
 It is also possible to suppress an action's visibility using _ActionLayout#hidden()_ .
 
-For xref:system:generated:index/applib/annotation/DomainService.adoc[DomainService] actions, the action's visibility is dependent upon its _DomainService#nature() nature_ .
+For xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] actions, the action's visibility is dependent upon its _DomainService#nature() nature_ .
 
 [#restrictTo]
 === restrictTo
@@ -174,7 +174,7 @@ This is only provided as a fallback; usually the framework can infer the element
 [#fileAccept]
 === fileAccept
 
-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` ).
+For downloading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/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".
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Collection.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Collection.adoc
index 2ec2c90..c34528f 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Collection.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Collection.adoc
@@ -17,7 +17,7 @@ Domain semantics for domain object collection.
 <.> xref:#domainEvent[domainEvent]
 +
 --
-Indicates that changes to the collection that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
+Indicates that changes to the collection that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
 --
 <.> xref:#hidden[hidden]
 +
@@ -35,7 +35,7 @@ The type-of the elements held within the collection.
 [#domainEvent]
 === domainEvent
 
-Indicates that changes to the collection that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
+Indicates that changes to the collection that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
 
 Subscribers of this event can interact with the business rule checking (hide, disable, validate) and its modification (before and after).
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Defaulted.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Defaulted.adoc
index a483701..a2f9e7e 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Defaulted.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Defaulted.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Indicates that the class should have a default, by providing a link to a xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider] , or some externally-configured mechanism.
+Indicates that the class should have a default, by providing a link to a xref:refguide:applib:index/adapters/DefaultsProvider.adoc[DefaultsProvider] , or some externally-configured mechanism.
 
-This possibly seems a little tortuous. The more obvious means to provide a default would seem to be a simple `@DefaultsTo(new SomeObject())` . However, Java only allows primitives, strings and class literals to be used in annotations. We therefore need delegate to an external implementation. (This more complex design is also more flexible of course; the implementation of xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider] could adjust the default it provid [...]
+This possibly seems a little tortuous. The more obvious means to provide a default would seem to be a simple `@DefaultsTo(new SomeObject())` . However, Java only allows primitives, strings and class literals to be used in annotations. We therefore need delegate to an external implementation. (This more complex design is also more flexible of course; the implementation of xref:refguide:applib:index/adapters/DefaultsProvider.adoc[DefaultsProvider] could adjust the default it provides accor [...]
 
 == API
 
@@ -18,7 +18,7 @@ This possibly seems a little tortuous. The more obvious means to provide a defau
 <.> xref:#defaultsProviderName[defaultsProviderName]
 +
 --
-The fully qualified name of a class that implements the xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider] interface.
+The fully qualified name of a class that implements the xref:refguide:applib:index/adapters/DefaultsProvider.adoc[DefaultsProvider] interface.
 --
 <.> xref:#defaultsProviderClass[defaultsProviderClass]
 +
@@ -31,7 +31,7 @@ As per _#defaultsProviderName()_ , but specifying a class literal rather than a
 [#defaultsProviderName]
 === defaultsProviderName
 
-The fully qualified name of a class that implements the xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider] interface.
+The fully qualified name of a class that implements the xref:refguide:applib:index/adapters/DefaultsProvider.adoc[DefaultsProvider] interface.
 
 This is optional because some implementations may pick up the defaults provider via a configuration file, or via the equivalent _#defaultsProviderClass()_ .
 
@@ -42,4 +42,4 @@ Implementation note: the default value provided here is simply an empty string b
 
 As per _#defaultsProviderName()_ , but specifying a class literal rather than a fully qualified class name.
 
-Implementation note: the default value provided here is simply the xref:system:generated:index/applib/annotation/Defaulted.adoc[Defaulted] 's own class, because `null` is not a valid default.
+Implementation note: the default value provided here is simply the xref:refguide:applib:index/annotation/Defaulted.adoc[Defaulted] 's own class, because `null` is not a valid default.
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/DomainObject.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/DomainObject.adoc
index 7185ba6..51c7620 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/DomainObject.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/DomainObject.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Domain semantics for domain objects (entities and view models; for services see xref:system:generated:index/applib/annotation/DomainService.adoc[DomainService] ).
+Domain semantics for domain objects (entities and view models; for services see xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] ).
 
 == API
 
@@ -78,52 +78,52 @@ Provides a unique abbreviation for the object type's, eg "customer.Customer" for
 <.> xref:#createdLifecycleEvent[createdLifecycleEvent]
 +
 --
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectCreatedEvent.adoc[ObjectCreatedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectCreatedEvent.adoc[ObjectCreatedEvent] .
 --
 <.> xref:#persistingLifecycleEvent[persistingLifecycleEvent]
 +
 --
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectPersistingEvent.adoc[ObjectPersistingEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectPersistingEvent.adoc[ObjectPersistingEvent] .
 --
 <.> xref:#persistedLifecycleEvent[persistedLifecycleEvent]
 +
 --
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectPersistedEvent.adoc[ObjectPersistedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectPersistedEvent.adoc[ObjectPersistedEvent] .
 --
 <.> xref:#loadedLifecycleEvent[loadedLifecycleEvent]
 +
 --
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectLoadedEvent.adoc[ObjectLoadedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectLoadedEvent.adoc[ObjectLoadedEvent] .
 --
 <.> xref:#updatingLifecycleEvent[updatingLifecycleEvent]
 +
 --
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectUpdatingEvent.adoc[ObjectUpdatingEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectUpdatingEvent.adoc[ObjectUpdatingEvent] .
 --
 <.> xref:#updatedLifecycleEvent[updatedLifecycleEvent]
 +
 --
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectUpdatedEvent.adoc[ObjectUpdatedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectUpdatedEvent.adoc[ObjectUpdatedEvent] .
 --
 <.> xref:#removingLifecycleEvent[removingLifecycleEvent]
 +
 --
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectRemovingEvent.adoc[ObjectRemovingEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectRemovingEvent.adoc[ObjectRemovingEvent] .
 --
 <.> xref:#actionDomainEvent[actionDomainEvent]
 +
 --
-Indicates that an invocation of _any_ action of the domain object (that do not themselves specify their own `@Action(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:system:generated:index/applib/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
+Indicates that an invocation of _any_ action of the domain object (that do not themselves specify their own `@Action(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:refguide:applib:index/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
 --
 <.> xref:#propertyDomainEvent[propertyDomainEvent]
 +
 --
-Indicates that changes to _any_ property of the domain object (that do not themselves specify their own `@Property(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:system:generated:index/applib/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
+Indicates that changes to _any_ property of the domain object (that do not themselves specify their own `@Property(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:refguide:applib:index/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
 --
 <.> xref:#collectionDomainEvent[collectionDomainEvent]
 +
 --
-Indicates that changes to _any_ collection of the domain object (that do not themselves specify their own `@Collection(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
+Indicates that changes to _any_ collection of the domain object (that do not themselves specify their own `@Collection(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
 --
 
 == Members
@@ -192,56 +192,56 @@ This value, if specified, is used in the serialized form of the object's OID. An
 [#createdLifecycleEvent]
 === createdLifecycleEvent
 
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectCreatedEvent.adoc[ObjectCreatedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectCreatedEvent.adoc[ObjectCreatedEvent] .
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#persistingLifecycleEvent]
 === persistingLifecycleEvent
 
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectPersistingEvent.adoc[ObjectPersistingEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectPersistingEvent.adoc[ObjectPersistingEvent] .
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#persistedLifecycleEvent]
 === persistedLifecycleEvent
 
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectPersistedEvent.adoc[ObjectPersistedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectPersistedEvent.adoc[ObjectPersistedEvent] .
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#loadedLifecycleEvent]
 === loadedLifecycleEvent
 
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectLoadedEvent.adoc[ObjectLoadedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectLoadedEvent.adoc[ObjectLoadedEvent] .
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#updatingLifecycleEvent]
 === updatingLifecycleEvent
 
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectUpdatingEvent.adoc[ObjectUpdatingEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectUpdatingEvent.adoc[ObjectUpdatingEvent] .
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#updatedLifecycleEvent]
 === updatedLifecycleEvent
 
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectUpdatedEvent.adoc[ObjectUpdatedEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectUpdatedEvent.adoc[ObjectUpdatedEvent] .
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#removingLifecycleEvent]
 === removingLifecycleEvent
 
-Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/lifecycle/ObjectRemovingEvent.adoc[ObjectRemovingEvent] .
+Indicates that the loading of the domain object should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/lifecycle/ObjectRemovingEvent.adoc[ObjectRemovingEvent] .
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#actionDomainEvent]
 === actionDomainEvent
 
-Indicates that an invocation of _any_ action of the domain object (that do not themselves specify their own `@Action(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:system:generated:index/applib/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
+Indicates that an invocation of _any_ action of the domain object (that do not themselves specify their own `@Action(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:refguide:applib:index/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] .
 
 For example:
 
@@ -263,7 +263,7 @@ This subclass must provide a no-arg constructor; the fields are set reflectively
 [#propertyDomainEvent]
 === propertyDomainEvent
 
-Indicates that changes to _any_ property of the domain object (that do not themselves specify their own `@Property(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:system:generated:index/applib/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
+Indicates that changes to _any_ property of the domain object (that do not themselves specify their own `@Property(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using the specified custom (subclass of) xref:refguide:applib:index/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
 
 For example:
 
@@ -281,7 +281,7 @@ This subclass must provide a no-arg constructor; the fields are set reflectively
 [#collectionDomainEvent]
 === collectionDomainEvent
 
-Indicates that changes to _any_ collection of the domain object (that do not themselves specify their own `@Collection(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
+Indicates that changes to _any_ collection of the domain object (that do not themselves specify their own `@Collection(domainEvent=...)` should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
 
 For example:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/DomainObjectLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
index 87867c7..ddeb2db 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
@@ -66,22 +66,22 @@ The plural name of the class.
 <.> xref:#cssClassUiEvent[cssClassUiEvent]
 +
 --
-Which subclass of xref:system:generated:index/applib/events/ui/CssClassUiEvent.adoc[CssClassUiEvent] should be used to obtain a CSS class.
+Which subclass of xref:refguide:applib:index/events/ui/CssClassUiEvent.adoc[CssClassUiEvent] should be used to obtain a CSS class.
 --
 <.> xref:#iconUiEvent[iconUiEvent]
 +
 --
-Which subclass of xref:system:generated:index/applib/events/ui/IconUiEvent.adoc[IconUiEvent] should be used to obtain an icon.
+Which subclass of xref:refguide:applib:index/events/ui/IconUiEvent.adoc[IconUiEvent] should be used to obtain an icon.
 --
 <.> xref:#layoutUiEvent[layoutUiEvent]
 +
 --
-Which subclass of xref:system:generated:index/applib/events/ui/LayoutUiEvent.adoc[LayoutUiEvent] should be used to obtain a layout.
+Which subclass of xref:refguide:applib:index/events/ui/LayoutUiEvent.adoc[LayoutUiEvent] should be used to obtain a layout.
 --
 <.> xref:#titleUiEvent[titleUiEvent]
 +
 --
-Which subclass of xref:system:generated:index/applib/events/ui/TitleUiEvent.adoc[TitleUiEvent] should be used to obtain a title.
+Which subclass of xref:refguide:applib:index/events/ui/TitleUiEvent.adoc[TitleUiEvent] should be used to obtain a title.
 --
 
 == Members
@@ -137,28 +137,28 @@ The plural name of the class.
 [#cssClassUiEvent]
 === cssClassUiEvent
 
-Which subclass of xref:system:generated:index/applib/events/ui/CssClassUiEvent.adoc[CssClassUiEvent] should be used to obtain a CSS class.
+Which subclass of xref:refguide:applib:index/events/ui/CssClassUiEvent.adoc[CssClassUiEvent] should be used to obtain a CSS class.
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#iconUiEvent]
 === iconUiEvent
 
-Which subclass of xref:system:generated:index/applib/events/ui/IconUiEvent.adoc[IconUiEvent] should be used to obtain an icon.
+Which subclass of xref:refguide:applib:index/events/ui/IconUiEvent.adoc[IconUiEvent] should be used to obtain an icon.
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#layoutUiEvent]
 === layoutUiEvent
 
-Which subclass of xref:system:generated:index/applib/events/ui/LayoutUiEvent.adoc[LayoutUiEvent] should be used to obtain a layout.
+Which subclass of xref:refguide:applib:index/events/ui/LayoutUiEvent.adoc[LayoutUiEvent] should be used to obtain a layout.
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
 [#titleUiEvent]
 === titleUiEvent
 
-Which subclass of xref:system:generated:index/applib/events/ui/TitleUiEvent.adoc[TitleUiEvent] should be used to obtain a title.
+Which subclass of xref:refguide:applib:index/events/ui/TitleUiEvent.adoc[TitleUiEvent] should be used to obtain a title.
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/EqualByContent.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/EqualByContent.adoc
index 30779af..6de72a2 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/EqualByContent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/EqualByContent.adoc
@@ -1,12 +1,12 @@
 :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 [...]
 
-Indicates that the class follows the equal-by-content contract, usually associated with xref:system:generated:index/applib/annotation/Value.adoc[Value] types.
+Indicates that the class follows the equal-by-content contract, usually associated with xref:refguide:applib:index/annotation/Value.adoc[Value] types.
 
 If a class claims to be equal-by-content then its _#equals(Object)_ should return `true` if its content (as opposed to identity) is the same. For example, _String_ , _BigDecimal_ and _Date_ follow this contract.
 
 Note also that the Java Language Specification requires that two objects that are _#equals(Object) equal_ must return the same value from _#hashCode()_ . Failure to do this means that that the object will not behave correctly when used as a key into a hashing structure (eg a _HashMap_ ).
 
-By default any xref:system:generated:index/applib/annotation/Value.adoc[Value] types are assumed to follow the equal-by-content rule, though this can be overridden if required. Value types are usually also immutable (though there are some classic exceptions to this, such as _Date_ ).
+By default any xref:refguide:applib:index/annotation/Value.adoc[Value] types are assumed to follow the equal-by-content rule, though this can be overridden if required. Value types are usually also immutable (though there are some classic exceptions to this, such as _Date_ ).
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Module.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Module.adoc
index c69a3fa..0e7fc2f 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Module.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Module.adoc
@@ -2,9 +2,9 @@
 
 Intended to be annotated on the root marker class of a (Maven) module which contains a single coherent set of functionality, possibly including domain services.
 
-A xref:system:generated:index/applib/annotation/Module.adoc[Module] (because it's a meta-annotation) is also a Spring _Configuration @Configuration_ , which means that the functionality can be depended upon transitively using Spring's _Import @Import_ annotation. Normally the import graph mirrors the dependencies in Maven.
+A xref:refguide:applib:index/annotation/Module.adoc[Module] (because it's a meta-annotation) is also a Spring _Configuration @Configuration_ , which means that the functionality can be depended upon transitively using Spring's _Import @Import_ annotation. Normally the import graph mirrors the dependencies in Maven.
 
-Also, a xref:system:generated:index/applib/annotation/Module.adoc[Module] also declares the Spring _ComponentScan @ComponentScan_ (with no parameters), which means that any domain services in the same package or subpackages are automatically found and registered.
+Also, a xref:refguide:applib:index/annotation/Module.adoc[Module] also declares the Spring _ComponentScan @ComponentScan_ (with no parameters), which means that any domain services in the same package or subpackages are automatically found and registered.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Nature.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Nature.adoc
index df919aa..1a0b800 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Nature.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Nature.adoc
@@ -20,7 +20,7 @@ enum Nature {
 <.> xref:#NOT_SPECIFIED[NOT_SPECIFIED]
 +
 --
-The default; allows the programmer to combine `@DomainObject` annotation with the xref:system:generated:index/applib/ViewModel.adoc[ViewModel] annotation, or the _XmlRootElement_ annotation, or by implementing the xref:system:generated:index/applib/ViewModel.adoc[ViewModel] interface.
+The default; allows the programmer to combine `@DomainObject` annotation with the xref:refguide:applib:index/ViewModel.adoc[ViewModel] annotation, or the _XmlRootElement_ annotation, or by implementing the xref:refguide:applib:index/ViewModel.adoc[ViewModel] interface.
 --
 <.> xref:#ENTITY[ENTITY]
 +
@@ -48,7 +48,7 @@ An object that is entirely managed by the underlying IoC container.
 [#NOT_SPECIFIED]
 === NOT_SPECIFIED
 
-The default; allows the programmer to combine `@DomainObject` annotation with the xref:system:generated:index/applib/ViewModel.adoc[ViewModel] annotation, or the _XmlRootElement_ annotation, or by implementing the xref:system:generated:index/applib/ViewModel.adoc[ViewModel] interface.
+The default; allows the programmer to combine `@DomainObject` annotation with the xref:refguide:applib:index/ViewModel.adoc[ViewModel] annotation, or the _XmlRootElement_ annotation, or by implementing the xref:refguide:applib:index/ViewModel.adoc[ViewModel] interface.
 
 [#ENTITY]
 === ENTITY
@@ -64,7 +64,7 @@ Currently implies no additional semantics other than documentation.
 
 An object that is conceptually part of the application layer, and which surfaces behavior and/or state that is aggregate of one or more domain entity.
 
-The identity of a view model is determined solely by the state of object's properties. Using this nature should be considered exactly equivalent to annotating with xref:system:generated:index/applib/ViewModel.adoc[ViewModel] .
+The identity of a view model is determined solely by the state of object's properties. Using this nature should be considered exactly equivalent to annotating with xref:refguide:applib:index/ViewModel.adoc[ViewModel] .
 
 Note that collections are ignored; if their state is required to fully identify the view model, define the view model using the JAXB _XmlRootElement_ annotation instead (where the object's state is serialized to an arbitrarily deep graph of data, with references to persistent entities transparently resolved to `<oid-dto>` elements).
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Parameter.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Parameter.adoc
index 3a754c9..d9eb1b6 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Parameter.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Parameter.adoc
@@ -21,7 +21,7 @@ Collects together all domain semantics of an action parameter within a single an
 <.> xref:#fileAccept[fileAccept]
 +
 --
-For uploading 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` ).
+For uploading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ).
 --
 <.> xref:#maxLength[maxLength]
 +
@@ -31,7 +31,7 @@ The maximum entry length of a string parameter (it is ignored for other types).
 <.> xref:#mustSatisfy[mustSatisfy]
 +
 --
-The xref:system:generated:index/applib/spec/Specification.adoc[Specification] (s) to be satisfied by this parameter.
+The xref:refguide:applib:index/spec/Specification.adoc[Specification] (s) to be satisfied by this parameter.
 --
 <.> xref:#optionality[optionality]
 +
@@ -59,7 +59,7 @@ Replacement text for the pattern in generated error message.
 [#fileAccept]
 === fileAccept
 
-For uploading 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` ).
+For uploading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/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".
 
@@ -75,7 +75,7 @@ The default value ( `-1` ) indicates that no maxLength has been specified.
 [#mustSatisfy]
 === mustSatisfy
 
-The xref:system:generated:index/applib/spec/Specification.adoc[Specification] (s) to be satisfied by this parameter.
+The xref:refguide:applib:index/spec/Specification.adoc[Specification] (s) to be satisfied by this parameter.
 
 If more than one is provided, then all must be satisfied (in effect "AND"ed together).
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Property.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Property.adoc
index d8e5e97..26d0002 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Property.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Property.adoc
@@ -30,17 +30,17 @@ Collects together all the domain semantics for the property of a domain object.
 <.> xref:#commandDtoProcessor[commandDtoProcessor]
 +
 --
-The xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
+The xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
 --
 <.> xref:#commandPublishing[commandPublishing]
 +
 --
-Whether property edits, captured as xref:system:generated:index/applib/services/command/Command.adoc[Command] s, should be published to xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
+Whether property edits, captured as xref:refguide:applib:index/services/command/Command.adoc[Command] s, should be published to xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
 --
 <.> xref:#domainEvent[domainEvent]
 +
 --
-Indicates that changes to the property that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
+Indicates that changes to the property that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
 --
 <.> xref:#editing[editing]
 +
@@ -55,12 +55,12 @@ If _#editing()_ is set to _Editing#DISABLED_ , then the reason to provide to the
 <.> xref:#executionPublishing[executionPublishing]
 +
 --
-Whether xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] s (triggered property edits), should be dispatched to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
+Whether xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] s (triggered property edits), should be dispatched to xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
 --
 <.> xref:#fileAccept[fileAccept]
 +
 --
-For uploading 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` ).
+For uploading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ).
 --
 <.> xref:#hidden[hidden]
 +
@@ -80,7 +80,7 @@ Indicates whether the property should be included or excluded from mementos.
 <.> xref:#mustSatisfy[mustSatisfy]
 +
 --
-The xref:system:generated:index/applib/spec/Specification.adoc[Specification] (s) to be satisfied by this property.
+The xref:refguide:applib:index/spec/Specification.adoc[Specification] (s) to be satisfied by this property.
 --
 <.> xref:#optionality[optionality]
 +
@@ -113,19 +113,19 @@ Replacement text for the pattern in generated error message.
 [#commandDtoProcessor]
 === commandDtoProcessor
 
-The xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
+The xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] to process this command's DTO.
 
-The processor itself is used by xref:system:generated:index/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc[ContentMappingServiceForCommandDto] and xref:system:generated:index/applib/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc[ContentMappingServiceForCommandsDto] to dynamically transform the DTOs.
+The processor itself is used by xref:refguide:applib:index/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc[ContentMappingServiceForCommandDto] and xref:refguide:applib:index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc[ContentMappingServiceForCommandsDto] to dynamically transform the DTOs.
 
 [#commandPublishing]
 === commandPublishing
 
-Whether property edits, captured as xref:system:generated:index/applib/services/command/Command.adoc[Command] s, should be published to xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
+Whether property edits, captured as xref:refguide:applib:index/services/command/Command.adoc[Command] s, should be published to xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] s.
 
 [#domainEvent]
 === domainEvent
 
-Indicates that changes to the property that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:system:generated:index/applib/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
+Indicates that changes to the property that should be posted to the _org.apache.isis.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/domain/PropertyDomainEvent.adoc[PropertyDomainEvent] .
 
 Subscribers of this event can interact with the business rule checking (hide, disable, validate) and its modification (before and after).
 
@@ -156,12 +156,12 @@ If _#editing()_ is set to _Editing#DISABLED_ , then the reason to provide to the
 [#executionPublishing]
 === executionPublishing
 
-Whether xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] s (triggered property edits), should be dispatched to xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
+Whether xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] s (triggered property edits), should be dispatched to xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
 
 [#fileAccept]
 === fileAccept
 
-For uploading 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` ).
+For uploading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/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".
 
@@ -186,12 +186,12 @@ NOTE: this will usually be supplemented by a JDO or JPA-specific annotation to i
 
 Indicates whether the property should be included or excluded from mementos.
 
-To ensure that the property is actually not persisted in the objectstore, also annotate with the JDO annotation `javax.jdo.annotations.NotPersistent` 
+To ensure that the property is actually not persisted in the objectstore, also annotate with the JDO annotation `javax.jdo.annotations.NotPersistent`
 
 [#mustSatisfy]
 === mustSatisfy
 
-The xref:system:generated:index/applib/spec/Specification.adoc[Specification] (s) to be satisfied by this property.
+The xref:refguide:applib:index/spec/Specification.adoc[Specification] (s) to be satisfied by this property.
 
 If more than one is provided, then all must be satisfied (in effect "AND"ed together).
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/PropertyLayout.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/PropertyLayout.adoc
index 394817c..7d8436d 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/PropertyLayout.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/PropertyLayout.adoc
@@ -167,7 +167,7 @@ Setting this attribute to `RepaintPolicy.NO_REPAINT` is used as a hint to the vi
 
 Note that for this to work, the viewer will also ensure that none of the property's parent component (such as a tab group panel) are re-rendered.
 
-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.
+Design note: we considered implementing this an "immutable" flag on the xref:refguide:applib:index/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.
 
 [#typicalLength]
 === typicalLength
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Publishing.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Publishing.adoc
index 5acda2a..6b73fb5 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Publishing.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Publishing.adoc
@@ -2,18 +2,18 @@
 
 The available policies as to whether data should be published to corresponding subscribers. The framework supports several kinds of data that are available for publishing:
 
-* *xref:system:generated:index/applib/services/publishing/spi/EntityChanges.adoc[EntityChanges] ... subscribed to via xref:system:generated:index/applib/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber]*
+* *xref:refguide:applib:index/services/publishing/spi/EntityChanges.adoc[EntityChanges] ... subscribed to via xref:refguide:applib:index/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber]*
 
  *
-* *xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange] ... subscribed to via xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber]*
+* *xref:refguide:applib:index/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange] ... subscribed to via xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber]*
 
  *
-* *xref:system:generated:index/applib/services/command/Command.adoc[Command] ... subscribed to via xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber]*
+* *xref:refguide:applib:index/services/command/Command.adoc[Command] ... subscribed to via xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber]*
 
  *
-* *xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] ... subscribed to via xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]*
+* *xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] ... subscribed to via xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]*
 
- ** * * * 
+ ** * * *
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Title.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Title.adoc
index aca8251..54233d0 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Title.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Title.adoc
@@ -20,7 +20,7 @@ If more than one property is used, the order can be specified (using the same De
 <.> xref:#sequence[sequence]
 +
 --
-The order (in Dewey decimal notation) that the property annotated with xref:system:generated:index/applib/annotation/Title.adoc[Title] appears with respect to other properties also annotated with xref:system:generated:index/applib/annotation/Title.adoc[Title] .
+The order (in Dewey decimal notation) that the property annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] appears with respect to other properties also annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] .
 --
 <.> xref:#prepend[prepend]
 +
@@ -43,7 +43,7 @@ The length to abbreviate this title element to.
 [#sequence]
 === sequence
 
-The order (in Dewey decimal notation) that the property annotated with xref:system:generated:index/applib/annotation/Title.adoc[Title] appears with respect to other properties also annotated with xref:system:generated:index/applib/annotation/Title.adoc[Title] .
+The order (in Dewey decimal notation) that the property annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] appears with respect to other properties also annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] .
 
 [#prepend]
 === prepend
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/Value.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/Value.adoc
index a97c2c9..3fb6122 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/Value.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/Value.adoc
@@ -7,10 +7,10 @@ By "value semantics" all we actually mean that the class is aggregated (or embed
 * it may be parseable
 * it may be encodeable
 * it may be immutable, and by default is presumed that it is
-* it may follow the equal-by-content contract (as per xref:system:generated:index/applib/annotation/EqualByContent.adoc[EqualByContent] ), and by default is presumed that it does.
+* it may follow the equal-by-content contract (as per xref:refguide:applib:index/annotation/EqualByContent.adoc[EqualByContent] ), and by default is presumed that it does.
 +
 --
-Note also that though a value is conceptually not shared, if it is also immutable then it is in fact safe to share objects (as in the flyweight pattern). In addition, the xref:system:generated:index/applib/annotation/EqualByContent.adoc[EqualByContent] semantic means that we needn't care whether value types are being shared or not.
+Note also that though a value is conceptually not shared, if it is also immutable then it is in fact safe to share objects (as in the flyweight pattern). In addition, the xref:refguide:applib:index/annotation/EqualByContent.adoc[EqualByContent] semantic means that we needn't care whether value types are being shared or not.
 --
 
 == API
@@ -27,7 +27,7 @@ Note also that though a value is conceptually not shared, if it is also immutabl
 <.> xref:#semanticsProviderName[semanticsProviderName]
 +
 --
-The fully qualified name of a class that implements the xref:system:generated:index/applib/adapters/ValueSemanticsProvider.adoc[ValueSemanticsProvider] interface.
+The fully qualified name of a class that implements the xref:refguide:applib:index/adapters/ValueSemanticsProvider.adoc[ValueSemanticsProvider] interface.
 --
 <.> xref:#semanticsProviderClass[semanticsProviderClass]
 +
@@ -40,11 +40,11 @@ As per _#semanticsProviderName()_ , but specifying a class literal rather than a
 [#semanticsProviderName]
 === semanticsProviderName
 
-The fully qualified name of a class that implements the xref:system:generated:index/applib/adapters/ValueSemanticsProvider.adoc[ValueSemanticsProvider] interface.
+The fully qualified name of a class that implements the xref:refguide:applib:index/adapters/ValueSemanticsProvider.adoc[ValueSemanticsProvider] interface.
 
 This is optional because some implementations may pick up encodeability via a configuration file, or via the equivalent _#semanticsProviderClass()_ .
 
-It is possible for value classes to act as their own semantics providers, and may in particular implement the xref:system:generated:index/applib/adapters/EncoderDecoder.adoc[EncoderDecoder] interface. The framework requires that the nominated class provides a `public` no-arg constructor on the class, and will instantiates an instance of the class to interact with it. In the case of encoding, the framework uses the result of discards the instantiated object. What that means in particular  [...]
+It is possible for value classes to act as their own semantics providers, and may in particular implement the xref:refguide:applib:index/adapters/EncoderDecoder.adoc[EncoderDecoder] interface. The framework requires that the nominated class provides a `public` no-arg constructor on the class, and will instantiates an instance of the class to interact with it. In the case of encoding, the framework uses the result of discards the instantiated object. What that means in particular is that  [...]
 
 Implementation note: the default value provided here is simply an empty string because `null` is not a valid default.
 
@@ -53,4 +53,4 @@ Implementation note: the default value provided here is simply an empty string b
 
 As per _#semanticsProviderName()_ , but specifying a class literal rather than a fully qualified class name.
 
-Implementation note: the default value provided here is simply the xref:system:generated:index/applib/annotation/Value.adoc[Value] 's own class, because `null` is not a valid default.
+Implementation note: the default value provided here is simply the xref:refguide:applib:index/annotation/Value.adoc[Value] 's own class, because `null` is not a valid default.
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_011-bookmarking.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_011-bookmarking.adoc
index 3c830ee..1ac52d0 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_011-bookmarking.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_011-bookmarking.adoc
@@ -1,6 +1,6 @@
 === Bookmarking
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#bookmarking[bookmarking()] element indicates if an action (with safe xref:system:generated:index/applib/annotation/Action.adoc#semantics[action semantics]) is automatically bookmarked.
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#bookmarking[bookmarking()] element indicates if an action (with safe xref:refguide:applib:index/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.
 
@@ -30,7 +30,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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#bookmarking[domain object]s.
+The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmarked xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#bookmarking[domain object]s.
 ====
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_012-cssClass.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_012-cssClass.adoc
index d16e598..6f9d559 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_012-cssClass.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_012-cssClass.adoc
@@ -1,6 +1,6 @@
 === CSS Styling
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[cssClass()] element can be used to render additional CSS classes in the HTML (a wrapping `<div>`) that represents the action.
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#cssClass[cssClass()] element can be used to render additional CSS classes in the HTML (a wrapping `<div>`) that represents the action.
 xref:refguide:config:application-specific/application-css.adoc[Application-specific CSS] can then be used to target and adjust the UI representation of that particular element.
 
 For example:
@@ -16,7 +16,7 @@ public class ToDoItem {
 
 [NOTE]
 ====
-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.
+The similar xref:refguide:applib:index/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
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_013-cssClassFa.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_013-cssClassFa.adoc
index 6e4cc34..78fde79 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_013-cssClassFa.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_013-cssClassFa.adoc
@@ -1,9 +1,9 @@
 === Font Icons
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClassFa[cssClassFa()] element 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 xref:system:generated:index/applib/annotation/ActionLayout.adoc#cssClassFaPosition[cssClassFaPosition()] element specifies the positioning of the icon, to the left or the right of the text.
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#cssClassFa[cssClassFa()] element 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 xref:refguide:applib:index/annotation/ActionLayout.adoc#cssClassFaPosition[cssClassFaPosition()] element specifies the positioning of the icon, to the left or the right of the text.
 
-These attributes can also be applied to xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[domain objects] to specify the object's icon.
+These attributes can also be applied to xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassFa[domain objects] to specify the object's icon.
 
 For example:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_014-describedAs.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_014-describedAs.adoc
index 0c165f4..d31f016 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_014-describedAs.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_014-describedAs.adoc
@@ -1,6 +1,6 @@
 === Descriptions
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#describedAs[describedAs()] attribute is used to provide a short description of the action to the user.
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#describedAs[describedAs()] attribute is used to provide a short description of the action to the user.
 In the xref:vw:ROOT:about.adoc[Wicket viewer] it is displayed as a 'tool tip'.
 
 For example:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_015-hidden.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_015-hidden.adoc
index d63df60..ac932a9 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_015-hidden.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_015-hidden.adoc
@@ -1,10 +1,10 @@
 === Hiding actions
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#hidden[hidden()] attribute indicates where (in the UI) the action should be hidden from the user.
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#hidden[hidden()] attribute indicates where (in the UI) the action should be hidden from the user.
 
 [TIP]
 ====
-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.
+It is also possible to use xref:refguide:applib:index/annotation/Action.adoc#hidden[`@Action#hidden`] to hide an action at the domain layer.
 ====
 
 For example:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_016-named.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_016-named.adoc
index 043dff7..686c529 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_016-named.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_016-named.adoc
@@ -1,6 +1,6 @@
 === Names
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[named()] element explicitly specifies the action's name, overriding the name that would normally be inferred from the Java source code.
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#named[named()] element explicitly specifies the action's name, overriding the name that would normally be inferred from the Java source code.
 
 [TIP]
 ====
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_017-position.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_017-position.adoc
index 26281cb..051cd0f 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_017-position.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_017-position.adoc
@@ -1,6 +1,6 @@
 === Positioning
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#position[position()] element pertains only to actions that have been associated with properties using xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder#named`].
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#position[position()] element pertains only to actions that have been associated with properties using xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_018-promptStyle.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_018-promptStyle.adoc
index e379931..4618339 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_018-promptStyle.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_018-promptStyle.adoc
@@ -4,7 +4,7 @@
 :page-partial:
 
 
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#promptStyle[promptStyle()] element is used to specify whether, when invoking an action associated with a domain object property, the parameters for the action are prompted either in modal dialog box, a (non-modal) sidebar dialog box, or is prompted using an inline panel (replacing the property on the page).
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#promptStyle[promptStyle()] element is used to specify whether, when invoking an action associated with a domain object property, the parameters for the action are prompted either in modal dialog box, a (non-modal) sidebar dialog box, or is prompted using an inline panel (replacing the property on the page).
 For more on sidebar vs modal dialogs, see xref:vw:ROOT:features.adoc#sidebar-vs-modal-dialogs[Wicket viewer features].
 
 The prompt style is influenced by two xref:vw:ROOT:configuration-properties.adoc[configuration properties]:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_019-redirect.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_019-redirect.adoc
index d785954..ab9758b 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_019-redirect.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/ActionLayout_019-redirect.adoc
@@ -1,7 +1,7 @@
 === Smoother UI
 
 Often an action, when invoked, will return the target (in other words, will "return this").
-The xref:system:generated:index/applib/annotation/ActionLayout.adoc#redirectPolicy[redirectPolicy()] element is used to control how the object is re-rendered.
+The xref:refguide:applib:index/annotation/ActionLayout.adoc#redirectPolicy[redirectPolicy()] element is used to control how the object is re-rendered.
 
 There are three options:
 
@@ -11,7 +11,7 @@ This makes for a smoother UI.
 +
 [NOTE]
 ====
-Any properties with xref:system:generated:index/applib/annotation/PropertyLayout.adoc#repainting[`@PropertyLayout#repainting`] set to `NO_REPAINT` are then _not_ updated.
+Any properties with xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Action_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Action_010-examples-and-usage.adoc
index 1f8ec23..5b4699f 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Action_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Action_010-examples-and-usage.adoc
@@ -114,17 +114,17 @@ The Wicket viewer will then render the "items" collection with checkboxes, and a
 
 === Command Processing
 
-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 xref:schema:cmd.adoc[CommandDto] that also captures some timing metrics about the execution as well as the outcome.
+Every action invocation (and xref:refguide:applib:index/annotation/Property.adoc#commandPublishing[property edit] for that matter) is normally reified into a concrete `Command` object, basically a wrapper around the xref:schema:cmd.adoc[CommandDto] that also captures some timing metrics about the execution as well as the outcome.
 
 The main uses cases are:
 
-* as a means to allow asynchronous child commands to be executed, using the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service;
+* as a means to allow asynchronous child commands to be executed, using the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] service;
 
-* as a means to audit (persist) commands, by implementing the xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] SPI.
+* as a means to audit (persist) commands, by implementing the xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] SPI.
 +
 The xref:extensions:command-log:about.adoc[Command Log] extension _does_ provide such an implementation.
 +
-TIP: Another option to achieve this is to use the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI.
+TIP: Another option to achieve this is to use the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI.
 
 * to replay commands onto a secondary system, for regression testing.
 +
@@ -147,7 +147,7 @@ public interface CommandDtoProcessor {
 This will typically be the `CommandDto` passed in, but may be supplemented in some way.
 <.> The `CommandDto` obtained already from the `Command`.
 
-This interface is used by the framework-provided implementations of xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[ContentMappingService] for the REST API, allowing ``Command``s implementations that also implement `CommandWithDto` to be further customised as they are serialized out.
+This interface is used by the framework-provided implementations of xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[ContentMappingService] for the REST API, allowing ``Command``s implementations that also implement `CommandWithDto` to be further customised as they are serialized out.
 The primary use case for this capability is in support of primary/secondary replication.
 
 * on the primary, ``Command``s are serialized to XML.
@@ -254,7 +254,7 @@ In the cases of the domain object's actions, the events that are fired are:
 * pre-execute phase: before the invocation of the action
 * post-execute: after the invocation of the action
 
-Subscribers subscribe through the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`] and can influence each of these phases.
+Subscribers subscribe through the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`] and can influence each of these phases.
 
 By default the event raised is `ActionDomainEvent.Default`.
 For example:
@@ -271,7 +271,7 @@ public class ToDoItem {
 }
 ----
 
-The xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[domainEvent()] element allows a custom subclass to be emitted allowing more precise subscriptions (to those subclasses) to be defined instead.
+The xref:refguide:applib:index/annotation/Action.adoc#domainEvent[domainEvent()] element allows a custom subclass to be emitted allowing more precise subscriptions (to those subclasses) to be defined instead.
 
 For example:
 
@@ -294,7 +294,7 @@ This substantially reduces the boilerplate required in subclasses because no exp
 
 ==== Subscribers
 
-Subscribers (which must be domain services) subscribe to events posted through the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`].
+Subscribers (which must be domain services) subscribe to events posted through the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`].
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
 
@@ -378,7 +378,7 @@ If the exception is a subtype of `RecoverableException` then the exception will
 
 ==== Default, Doop and Noop events
 
-If the xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[domainEvent()] element is not explicitly specified (is left as its default value, `ActionDomainEvent.Default`), then the framework will, by default, post an event.
+If the xref:refguide:applib:index/annotation/Action.adoc#domainEvent[domainEvent()] element is not explicitly specified (is left as its default value, `ActionDomainEvent.Default`), then the framework will, by default, post an event.
 
 If this is not required, then the `isis.reflector.facet.actionAnnotation.domainEvent.postForDefault` configuration property can be set to "false"; this will disable posting.
 
@@ -415,13 +415,13 @@ public class ToDoItem {
 ==== Raising events programmatically
 
 Normally events are only raised for interactions through the UI.
-However, events can be raised programmatically either by calling the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[EventBusService] API directly, or by emulating the UI by wrapping the target object using the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] domain service.
+However, events can be raised programmatically either by calling the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[EventBusService] API directly, or by emulating the UI by wrapping the target object using the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] domain service.
 
 
 
 === Execution Publishing
 
-The xref:system:generated:index/applib/annotation/Action.adoc#executionPublishing[executionPublishing()] element determines whether and how an action invocation is published via the registered implementation of xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
+The xref:refguide:applib:index/annotation/Action.adoc#executionPublishing[executionPublishing()] element determines whether and how an action invocation is published via the registered implementation of xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
 
 A common use case is to notify external "downstream" systems of changes in the state of the Apache Isis application.
 
@@ -462,7 +462,7 @@ public class Order {
 === Deployment modes
 
 By default actions are available irrespective of the xref:refguide:config:about.adoc#deployment-types[deployment mode].
-The xref:system:generated:index/applib/annotation/Action.adoc#restrictTo[restrictTo()] element specifies whether the action should instead be restricted to only available in prototyping mode.
+The xref:refguide:applib:index/annotation/Action.adoc#restrictTo[restrictTo()] element specifies whether the action should instead be restricted to only available in prototyping mode.
 
 For example:
 
@@ -496,7 +496,7 @@ However, it would be useful to disaply how for a test or demo system where there
 === Action Semantics
 
 
-The xref:system:generated:index/applib/annotation/Action.adoc#semantics[semantics()] element describes whether the invocation modifies state of the system, and if so whether it does so idempotently.
+The xref:refguide:applib:index/annotation/Action.adoc#semantics[semantics()] element describes whether the invocation modifies state of the system, and if so whether it does so idempotently.
 If the action invocation does _not_ modify the state of the system, in other words is safe, then it also can beused to specify whether the results of the action can be cached automatically for the remainder of the request.
 
 The `semantics` element was originally introduced for the xref:vro:ROOT:about.adoc[RestfulObjects viewer] in order that action invocations could be using the appropriate `HTTP` verb (`GET`, `PUT` and `POST`).
@@ -564,13 +564,13 @@ public class Customer {
 }
 ----
 
-Actions that are safe and request-cacheable automatically use the xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`] service to cache the result of the method.
-Note though that the results of this caching will only be apparent if the action is invoked from another method using the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service.
+Actions that are safe and request-cacheable automatically use the xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`] service to cache the result of the method.
+Note though that the results of this caching will only be apparent if the action is invoked from another method using the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] service.
 
 
 === Collection type
 
-The xref:system:generated:index/applib/annotation/Action.adoc#typeOf[typeOf()] element specifies the expected type of an element returned by the action (returning a collection), when for whatever reason the type cannot be inferred from the generic type, or to provide a hint about the actual run-time (as opposed to compile-time) type.
+The xref:refguide:applib:index/annotation/Action.adoc#typeOf[typeOf()] element specifies the expected type of an element returned by the action (returning a collection), when for whatever reason the type cannot be inferred from the generic type, or to provide a hint about the actual run-time (as opposed to compile-time) type.
 
 For example:
 
@@ -595,9 +595,9 @@ In general we recommend that you use generics instead, eg `List<Customer>`.
 
 == Related SPIs
 
-* xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] SPI
+* xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] SPI
 +
-foractions with xref:system:generated:index/applib/annotation/Action.adoc#commandPublishing[commandPublishing] enabled
+foractions with xref:refguide:applib:index/annotation/Action.adoc#commandPublishing[commandPublishing] enabled
 
 ** xref:extensions:command-log:about.adoc[Command Log] extension
 +
@@ -607,14 +607,14 @@ provides an implementation that simply logs actions for
 +
 provides an implementation to replicate commands from a primary to a secondary system.
 +
-This implementation also leverages xref:system:generated:index/applib/annotation/Action.adoc#commandDtoProcessor[commandDtoProcessor()] to process ``CommandDto``s before being replciated
+This implementation also leverages xref:refguide:applib:index/annotation/Action.adoc#commandDtoProcessor[commandDtoProcessor()] to process ``CommandDto``s before being replciated
 
-* xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI
+* xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI
 +
-for actions where xref:system:generated:index/applib/annotation/Action.adoc#executionPublishing[executionPublishing] is enabled
+for actions where xref:refguide:applib:index/annotation/Action.adoc#executionPublishing[executionPublishing] is enabled
 
 == See also
 
-* xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[EventBusService]
+* xref:refguide:applib:index/services/eventbus/EventBusService.adoc[EventBusService]
 +
-which broadcast the action's domain event -- as specified by xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[domainEvent()] --  for business rule checking (hide, disable, validate) and its invocation (pre-execute and post-execute).
+which broadcast the action's domain event -- as specified by xref:refguide:applib:index/annotation/Action.adoc#domainEvent[domainEvent()] --  for business rule checking (hide, disable, validate) and its invocation (pre-execute and post-execute).
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
index c9ced1f..e3b7ab5 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_010-examples-and-usage.adoc
@@ -26,7 +26,7 @@ As an alternative to using the `@CollectionLayout` annotation, a xref:userguide:
 
 [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/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.
+The annotation is one of a handful (others including xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`], xref:refguide:applib:index/annotation/Property.adoc[`@Property`] and xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_011-cssClass.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_011-cssClass.adoc
index ebe9ad5..1630cf5 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_011-cssClass.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_011-cssClass.adoc
@@ -1,6 +1,6 @@
 === CSS Styling
 
-The xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[cssClass()] element can be used to render additional CSS classes in the HTML (a wrapping `<div>`) that represents the collection.
+The xref:refguide:applib:index/annotation/CollectionLayout.adoc#cssClass[cssClass()] element can be used to render additional CSS classes in the HTML (a wrapping `<div>`) that represents the collection.
 xref:refguide:config:application-specific/application-css.adoc[Application-specific CSS] can then be used to target and adjust the UI representation of that particular element.
 
 For example:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_012-defaultView.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_012-defaultView.adoc
index 706477b..09abed2 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_012-defaultView.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_012-defaultView.adoc
@@ -1,6 +1,6 @@
 === Default view
 
-The xref:system:generated:index/applib/annotation/CollectionLayout.adoc#defaultView[`defaultView()] element is used to select which of views should be used by default for a given collection.
+The xref:refguide:applib:index/annotation/CollectionLayout.adoc#defaultView[`defaultView()] element is used to select which of views should be used by default for a given collection.
 Without any hint the collection is shown collapsed (to save real estate and reduce load time).
 
 For example:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_013-describedAs.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_013-describedAs.adoc
index 4426ff0..b777e36 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_013-describedAs.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_013-describedAs.adoc
@@ -1,6 +1,6 @@
 === Descriptions
 
-The xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[describedAs()] element is used to provide a short description of the collection to the user.
+The xref:refguide:applib:index/annotation/CollectionLayout.adoc#describedAs[describedAs()] element 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'.
 
 For example:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_014-hidden.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_014-hidden.adoc
index 08754c4..e56cc25 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_014-hidden.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_014-hidden.adoc
@@ -1,10 +1,10 @@
 === Hiding collections
 
-The xref:system:generated:index/applib/annotation/CollectionLayout.adoc#hidden[hidden()] element indicates where (in the UI) the collection should be hidden from the user.
+The xref:refguide:applib:index/annotation/CollectionLayout.adoc#hidden[hidden()] element indicates where (in the UI) the collection should be hidden from the user.
 
 [TIP]
 ====
-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.
+It is also possible to use xref:refguide:applib:index/annotation/Collection.adoc#hidden[`@Collection#hidden`] to hide an action at the domain layer.
 ====
 
 For example:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_015-named.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_015-named.adoc
index 137e308..83ddb9f 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_015-named.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_015-named.adoc
@@ -1,6 +1,6 @@
 === Names
 
-The xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[named()] element explicitly specifies the collection's name, overriding the name that would normally be inferred from the Java source code.
+The xref:refguide:applib:index/annotation/CollectionLayout.adoc#named[named()] element explicitly specifies the collection's name, overriding the name that would normally be inferred from the Java source code.
 
 [TIP]
 ====
@@ -9,7 +9,7 @@ Examples of that include a name that would be a reserved Java keyword (eg "packa
 ====
 
 By default the name is HTML escaped.
-To allow HTML markup, set the related xref:system:generated:index/applib/annotation/CollectionLayout.adoc#namedEscaped[namedEscaped()] element to `false`.
+To allow HTML markup, set the related xref:refguide:applib:index/annotation/CollectionLayout.adoc#namedEscaped[namedEscaped()] element to `false`.
 
 For example:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_016-paged.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_016-paged.adoc
index 5e7d875..f42321e 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_016-paged.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_016-paged.adoc
@@ -1,6 +1,6 @@
 === Paging
 
-The xref:system:generated:index/applib/annotation/CollectionLayout.adoc#paged[paged()] element specifies the number of rows to display in a (parented) collection.
+The xref:refguide:applib:index/annotation/CollectionLayout.adoc#paged[paged()] element specifies the number of rows to display in a (parented) collection.
 
 [WARNING]
 ====
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_017-sortedBy.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_017-sortedBy.adoc
index 69a6ba0..f862599 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_017-sortedBy.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/CollectionLayout_017-sortedBy.adoc
@@ -1,6 +1,6 @@
 === Client-side Sorting
 
-The xref:system:generated:index/applib/annotation/CollectionLayout.adoc#sortedBy[sortedBy()] element specifies that the collection be ordered using the specified comparator, rather than the natural ordering of the entity (as would usually be the case).
+The xref:refguide:applib:index/annotation/CollectionLayout.adoc#sortedBy[sortedBy()] element specifies that the collection be ordered using the specified comparator, rather than the natural ordering of the entity (as would usually be the case).
 
 For example:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_010-examples-and-usage.adoc
index 21ea3c9..7c4dbc0 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_010-examples-and-usage.adoc
@@ -30,7 +30,7 @@ public class ToDoItem {
 
 [TIP]
 ====
-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.
+The annotation is one of a handful (others including xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`], xref:refguide:applib:index/annotation/Property.adoc[`@Property`] and xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_011_domainEvent.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_011_domainEvent.adoc
index 04d447d..d27d828 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_011_domainEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_011_domainEvent.adoc
@@ -9,14 +9,14 @@ In the cases of the domain object's collections, the events that are fired are:
 * pre-execute phase: before the modification of the collection
 * post-execute: after the modification of the collection
 
-Subscribers (which must be domain services) subscribe to events posted through the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`], and can influence each of these phases.
+Subscribers (which must be domain services) subscribe to events posted through the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`], and can influence each of these phases.
 
 [WARNING]
 ====
 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:system:generated:index/applib/annotation/MemberOrder.adoc[UI hints] to render them close to the collection.
+The workaround is to create add/remove actions and use xref:refguide:applib:index/annotation/MemberOrder.adoc[UI hints] to render them close to the collection.
 ====
 
 By default the event raised is `CollectionDomainEvent.Default`.
@@ -37,7 +37,7 @@ public class ToDoItem {
 }
 ----
 
-The xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[domainEvent()] element allows a custom subclass to be emitted allowing more precise subscriptions (to those subclasses) to be defined instead.
+The xref:refguide:applib:index/annotation/Collection.adoc#domainEvent[domainEvent()] element allows a custom subclass to be emitted allowing more precise subscriptions (to those subclasses) to be defined instead.
 
 For example:
 
@@ -70,7 +70,7 @@ This substantially reduces the boilerplate in the subclasses because no explicit
 
 ==== Subscribers
 
-Subscribers (which must be domain services) subscribe to events posted through the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`].
+Subscribers (which must be domain services) subscribe to events posted through the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`].
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
 
@@ -154,7 +154,7 @@ If the exception is a subtype of `RecoverableException` then the exception will
 
 ==== Default, Doop and Noop events
 
-If the xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`domainEvent()] element is not explicitly specified (is left as its default value, `CollectionDomainEvent.Default`), then the framework will, by default, post an event.
+If the xref:refguide:applib:index/annotation/Collection.adoc#domainEvent[`domainEvent()] element is not explicitly specified (is left as its default value, `CollectionDomainEvent.Default`), then the framework will, by default, post an event.
 
 If this is not required, then the `isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault` configuration collection can be set to "false"; this will disable posting.
 
@@ -166,5 +166,5 @@ And, conversely, the framework also provides `CollectionDomainEvent.Noop`; if `d
 ==== Raising events programmatically
 
 Normally events are only raised for interactions through the UI.
-However, events can be raised programmatically either by calling the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`] API directly, or by emulating the UI by wrapping the target object using the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] domain service.
+However, events can be raised programmatically either by calling the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`] API directly, or by emulating the UI by wrapping the target object using the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] domain service.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_012_hidden.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_012_hidden.adoc
index 1b82dfe..35858bf 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_012_hidden.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_012_hidden.adoc
@@ -4,7 +4,7 @@ Collections can be hidden at the domain-level, indicating that they are not visi
 
 [TIP]
 ====
-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.
+It is also possible to use xref:refguide:applib:index/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:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_013_typeOf.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_013_typeOf.adoc
index 83e2ec8..ee7ba27 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_013_typeOf.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Collection_013_typeOf.adoc
@@ -24,4 +24,4 @@ In general we recommend that you use generics instead, eg `SortedSet<Order>`.
 
 == See also
 
-This attribute can also be specified for xref:system:generated:index/applib/annotation/Action.adoc#typeOf[actions].
+This attribute can also be specified for xref:refguide:applib:index/annotation/Action.adoc#typeOf[actions].
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
index e5e4b4c..1315f2f 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.adoc
@@ -6,15 +6,15 @@
 //----
 //include::refguide:applib-ant:example$annotation/DomainObjectLayout.java[tags="refguide"]
 //----
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#bookmarking[`bookmarking`]
+//<.> xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#bookmarking[`bookmarking`]
 //+
 //Whether (and how) this domain object should be automatically bookmarked
 //
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[`cssClass`]
+//<.> xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[`cssClassFa`]
+//<.> xref:refguide:applib:index/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. +
 //
@@ -24,22 +24,22 @@
 //
 //
 //
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#describedAs[`describedAs`]
+//<.> xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#describedAs[`describedAs`]
 //+
 //Description of this class, eg to be rendered in a tooltip.
 //
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[`named`]
+//<.> xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#paged[`paged`]
+//<.> xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#plural[`plural`]
+//<.> xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#plural[`plural`]
 //+
 //The plural name of the class
 //
@@ -52,19 +52,19 @@
 //----
 //include::refguide:applib-ant:example$annotation/DomainObjectLayout.java[tags="refguide-ui-events"]
 //----
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`cssClassUiEvent`]
+//<.> xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`cssClassUiEvent`]
 //+
-//The event type to be posted to the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`] to obtain a CSS class for the domain object.
+//The event type to be posted to the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`] to obtain a CSS class for the domain object.
 //
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#iconUiEvent[`iconUiEvent`]
+//<.> xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#iconUiEvent[`iconUiEvent`]
 //+
 //The event type to be posted to obtain the icon (name) for the domain object.
 //
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#layoutUiEvent[`layoutUiEvent`]
+//<.> xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#layoutUiEvent[`layoutUiEvent`]
 //+
 //The event type to be posted to obtain the layout (name) for the domain object.
 //
-//<.> xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`titleUiEvent`]
+//<.> xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#titleUiEvent[`titleUiEvent`]
 //+
 //The event type to be posted to obtain the title for the domain object.
 //
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_010-examples-and-usage.adoc
index 25a9b01..54ea0e0 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_010-examples-and-usage.adoc
@@ -45,7 +45,7 @@ public class CustomerViewModel {
 ----
 
 Although there are several ways to instantiate a view model, we recommend that they are instantiated using an N-arg constructor that initializes all relevant state.
-The xref:system:generated:index/applib/services/registry/ServiceRegistry.adoc[`ServiceRegistry`] can then be used to inject dependencies into the view model.
+The xref:refguide:applib:index/services/registry/ServiceRegistry.adoc[`ServiceRegistry`] can then be used to inject dependencies into the view model.
 For example:
 
 [source,java]
@@ -63,8 +63,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: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.
+Any properties annotated with xref:refguide:applib:index/annotation/Programmatic.adoc[`@Programmatic`] will be excluded from the memento.
+Properties that are merely xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_011-domain-events.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_011-domain-events.adoc
index e323374..7064dff 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_011-domain-events.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_011-domain-events.adoc
@@ -2,7 +2,7 @@
 
 Whenever an member 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).
 
-For each of the three types of members (action, property and collection), the xref:system:generated:index/applib/annotation/DomainObject.adoc[DomainObject] provides an element that defines a common event domain class to be fired whenever interating with members of that type.
+For each of the three types of members (action, property and collection), the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] provides an element that defines a common event domain class to be fired whenever interating with members of that type.
 This default event type can be overridden with a more specific event type if necessary.
 
 [cols="3a,6a,7a"]
@@ -12,21 +12,21 @@ This default event type can be overridden with a more specific event type if nec
 | Overridden with
 
 |Actions
-|xref:system:generated:index/applib/annotation/DomainObject.adoc#actionDomainEvent[actionDomainEvent()]
+|xref:refguide:applib:index/annotation/DomainObject.adoc#actionDomainEvent[actionDomainEvent()]
 
-|xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[@Action#domainEvent].
+|xref:refguide:applib:index/annotation/Action.adoc#domainEvent[@Action#domainEvent].
 
 |Properties
-|xref:system:generated:index/applib/annotation/DomainObject.adoc#propertyDomainEvent[propertyDomainEvent()]
+|xref:refguide:applib:index/annotation/DomainObject.adoc#propertyDomainEvent[propertyDomainEvent()]
 
 
-|xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[@Property#domainEvent()].
+|xref:refguide:applib:index/annotation/Property.adoc#domainEvent[@Property#domainEvent()].
 
 |Collections
 
-|xref:system:generated:index/applib/annotation/DomainObject.adoc#collectionDomainEvent[collectionDomainEvent()]
+|xref:refguide:applib:index/annotation/DomainObject.adoc#collectionDomainEvent[collectionDomainEvent()]
 
-|xref:system:generated:index/applib/annotation/Collection.adoc#domainEvent[@Collection#domainEvent()].
+|xref:refguide:applib:index/annotation/Collection.adoc#domainEvent[@Collection#domainEvent()].
 
 |===
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_012-_lifecycle-events.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_012-_lifecycle-events.adoc
index 4ebd059..89d0964 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_012-_lifecycle-events.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_012-_lifecycle-events.adoc
@@ -3,7 +3,7 @@
 Whenever the framework interacts with a domain entity, lifecycle events are fired.
 These are:
 
-* instantiated through xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`]
+* instantiated through xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`]
 +
 An event is also fired for view models
 
@@ -32,20 +32,20 @@ an already persistent entity has just been saved (``UPDATE``d) to the database
 an already persistent entity is about to be removed (``DELETE``d) from the database
 
 
-Subscribers subscribe through the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`] and can use the event to obtain a reference to the object just created.
+Subscribers subscribe through the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`] and can use the event to obtain a reference to the object just created.
 The subscriber could then, for example, update the object, eg looking up state from some external datastore.
 
 This basic model can be influenced in a couple of ways:
 
 * first, it is also possible to suppress any events from being emitted using a configuration property (a different config property exists each lifecycle hook).
 
-* second, an element on xref:system:generated:index/applib/annotation/DomainObject.adoc[DomainObject] annotation (for each lifecycle hook) allows a different subtype event types to be emitted instead
+* second, an element on xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation (for each lifecycle hook) allows a different subtype event types to be emitted instead
 +
 This allows subscribers to more targeted as to the events that they subscribe to.
 
 The framework also provides convenience "Doop" and a "Noop" event classes, that provoke these behaviours:
 
-* if the appropriate xref:system:generated:index/applib/annotation/DomainObject.adoc[DomainObject]' element is set to the "Doop" subclass, then this will event will be fired
+* if the appropriate xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject]' element is set to the "Doop" subclass, then this will event will be fired
 +
 this is a convenient way of ensuring an event is fired even if the hook has been disabled globally, but without the hassle of defining a custom event type
 
@@ -59,54 +59,54 @@ The table below summarises all the lifecycle hooks:
 |===
 | Lifecycle event
 | Config property
-| xref:system:generated:index/applib/annotation/DomainObject.adoc[@DomainObject] override
+| xref:refguide:applib:index/annotation/DomainObject.adoc[@DomainObject] override
 | Framework event types
 
 |created
 |xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.created-lifecycle-event.post-for-default[isis.applib.annotation.domain-object.created-lifecycle-event.post-for-default]
-| xref:system:generated:index/applib/annotation/DomainObject.adoc#createdLifecycleEvent[createdLifecycleEvent()]
+| xref:refguide:applib:index/annotation/DomainObject.adoc#createdLifecycleEvent[createdLifecycleEvent()]
 m|ObjectCreatedEvent.Default +
 ObjectCreatedEvent.Doop +
 ObjectCreatedEvent.Noop
 
 |loaded
 |xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.loaded-lifecycle-event.post-for-default[isis.applib.annotation.domain-object.loaded-lifecycle-event.post-for-default]
-| xref:system:generated:index/applib/annotation/DomainObject.adoc#loadedLifecycleEvent[loadedLifecycleEvent()]
+| xref:refguide:applib:index/annotation/DomainObject.adoc#loadedLifecycleEvent[loadedLifecycleEvent()]
 m|ObjectLoadedEvent.Default +
 ObjectLoadedEvent.Doop +
 ObjectLoadedEvent.Noop
 
 |persisting
 |xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.persisting-lifecycle-event.post-for-default[isis.applib.annotation.domain-object.persisting-lifecycle-event.post-for-default]
-| xref:system:generated:index/applib/annotation/DomainObject.adoc#persistingLifecycleEvent[persistingLifecycleEvent()]
+| xref:refguide:applib:index/annotation/DomainObject.adoc#persistingLifecycleEvent[persistingLifecycleEvent()]
 m|ObjectPersistingEvent.Default +
 ObjectPersistingEvent.Doop +
 ObjectPersistingEvent.Noop
 
 |persisted
 |xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.persisted-lifecycle-event.post-for-default[isis.applib.annotation.domain-object.persisted-lifecycle-event.post-for-default]
-| xref:system:generated:index/applib/annotation/DomainObject.adoc#persistedLifecycleEvent[persistedLifecycleEvent()]
+| xref:refguide:applib:index/annotation/DomainObject.adoc#persistedLifecycleEvent[persistedLifecycleEvent()]
 m|ObjectPersistedEvent.Default +
 ObjectPersistedEvent.Doop +
 ObjectPersistedEvent.Noop
 
 |updating
 |xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.updating-lifecycle-event.post-for-default[isis.applib.annotation.domain-object.updating-lifecycle-event.post-for-default]
-| xref:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[updatingLifecycleEvent()]
+| xref:refguide:applib:index/annotation/DomainObject.adoc#updatingLifecycleEvent[updatingLifecycleEvent()]
 m|ObjectUpdatingEvent.Default +
 ObjectUpdatingEvent.Doop +
 ObjectUpdatingEvent.Noop
 
 |updated
 |xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.updated-lifecycle-event.post-for-default[isis.applib.annotation.domain-object.updated-lifecycle-event.post-for-default]
-| xref:system:generated:index/applib/annotation/DomainObject.adoc#updatedLifecycleEvent[updatedLifecycleEvent()]
+| xref:refguide:applib:index/annotation/DomainObject.adoc#updatedLifecycleEvent[updatedLifecycleEvent()]
 m|ObjectUpdatedEvent.Default +
 ObjectUpdatedEvent.Doop +
 ObjectUpdatedEvent.Noop
 
 |removing
 |xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.removing-lifecycle-event.post-for-default[isis.applib.annotation.domain-object.removing-lifecycle-event.post-for-default]
-| xref:system:generated:index/applib/annotation/DomainObject.adoc#removingLifecycleEvent[removingLifecycleEvent()]
+| xref:refguide:applib:index/annotation/DomainObject.adoc#removingLifecycleEvent[removingLifecycleEvent()]
 m|ObjectRemovingEvent.Default +
 ObjectRemovingEvent.Doop +
 ObjectRemovingEvent.Noop
@@ -172,7 +172,7 @@ public class ToDoItem {
 [NOTE]
 ====
 It's possible to instantiate objects without firing this lifecycle; just instantiate using its regular constructor, and then use the ``ServiceInjector``'s
-xref:system:generated:index/applib/services/inject/ServiceInjector.adoc[`injectServicesInto(...)`] to manually inject any required domain services.
+xref:refguide:applib:index/services/inject/ServiceInjector.adoc[`injectServicesInto(...)`] to manually inject any required domain services.
 ====
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc
index d48f979..8900b3a 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_013-autoCompleteRepository.adoc
@@ -1,6 +1,6 @@
 === Auto-complete
 
-The xref:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteRepository[autoCompleteRepository()] element nominates a single method on a domain service as the fallback means for looking up instances of the domain object using a simple string.
+The xref:refguide:applib:index/annotation/DomainObject.adoc#autoCompleteRepository[autoCompleteRepository()] element nominates a single method on a domain service as the fallback means for looking up instances of the domain object using a simple string.
 
 For example, this might search for a customer by their name or number.
 Or it could search for a country based on its ISO-3 code or user-friendly name.
@@ -36,7 +36,7 @@ public class CustomerRepository {
 
 
 (As noted above) the method invoked on the repository is assumed to be called "autoComplete".
-The optional xref:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteAction[autoCompleteAction()] element allows the name of this method to be overridden.
+The optional xref:refguide:applib:index/annotation/DomainObject.adoc#autoCompleteAction[autoCompleteAction()] element allows the name of this method to be overridden.
 
 For example:
 
@@ -68,7 +68,7 @@ public class Customers {
 ----
 <.> end-user must enter minimum number of characters to trigger the query
 
-NOTE: The autocomplete "action" can also be a regular method, annotated using xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`].
+NOTE: The autocomplete "action" can also be a regular method, annotated using xref:refguide:applib:index/annotation/Programmatic.adoc[`@Programmatic`].
 That is, it does not need to be part of the metamodel:
 +
 [source,java]
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_014-bounding.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_014-bounding.adoc
index 8f1e321..5e66967 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_014-bounding.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_014-bounding.adoc
@@ -4,7 +4,7 @@ Some domain classes are immutable to the user, and moreover have only a fixed nu
 Often these are "reference" ("standing") data, or lookup data/pick lists.
 Typical examples could include categories, countries, states, and tax or interest rate tables.
 
-Where the number of instances is relatively small, ie bounded, then the xref:system:generated:index/applib/annotation/DomainObject.adoc#bounding[bounding()] element can be used as a hint.
+Where the number of instances is relatively small, ie bounded, then the xref:refguide:applib:index/annotation/DomainObject.adoc#bounding[bounding()] element can be used as a hint.
 For such domain objects the framework will automatically allow instances to be selected; xref:vw:ROOT:about.adoc[Wicket viewer] displays these as a drop-down list.
 
 For example:
@@ -24,7 +24,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:system:generated:index/applib/annotation/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:refguide:applib:index/annotation/DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`] attribute instead.
 ====
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_015-editing.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_015-editing.adoc
index 4f110ff..7e6305e 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_015-editing.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_015-editing.adoc
@@ -1,7 +1,7 @@
 === Editing
 
 
-The xref:system:generated:index/applib/annotation/DomainObject.adoc#editing[editing()] element determines whether a domain object's properties and collections are not editable (are read-only).
+The xref:refguide:applib:index/annotation/DomainObject.adoc#editing[editing()] element determines whether a domain object's properties and collections are not editable (are read-only).
 
 The default is `AS_CONFIGURED`, meaning that the xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.editing[`isis.applib.annotation.domain-object.editing`]
 configuration property is used to determine the whether the object is modifiable:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_016-entityChangePublishing.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_016-entityChangePublishing.adoc
index a23dd0c..05b7ada 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_016-entityChangePublishing.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_016-entityChangePublishing.adoc
@@ -1,6 +1,6 @@
 === Auditing
 
-The xref:system:generated:index/applib/annotation/DomainObject.adoc#entityChangePublishing[entityChangePublishing()] element indicates that if the object is modified, then each of its changed properties should be submitted to the registered xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[`EntityPropertyChangeSubscriber`](s).
+The xref:refguide:applib:index/annotation/DomainObject.adoc#entityChangePublishing[entityChangePublishing()] element indicates that if the object is modified, then each of its changed properties should be submitted to the registered xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[`EntityPropertyChangeSubscriber`](s).
 
 The default value for the element is `AS_CONFIGURED`, meaning that the xref:refguide:config:sections/isis.applib.adoc#isis.applib.annotation.domain-object.entity-change-publishing[`isis.applib.annotation.domain-object.entity-change-publishing`] configuration property is used to determine the whether the action is audited:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_017-mixinMethod.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_017-mixinMethod.adoc
index a2bff96..e035aab 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_017-mixinMethod.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_017-mixinMethod.adoc
@@ -1,6 +1,6 @@
 === Mixin method
 
-The xref:system:generated:index/applib/annotation/DomainObject.adoc#mixinMethod[mixinMethod()] element specifies the name of the method to be treated as a "reserved" method name, meaning that the mixin's name should instead be inferred from the mixin's type.
+The xref:refguide:applib:index/annotation/DomainObject.adoc#mixinMethod[mixinMethod()] element specifies the name of the method to be treated as a "reserved" method name, meaning that the mixin's name should instead be inferred from the mixin's type.
 
 For example:
 
@@ -28,11 +28,11 @@ public class Customer {
 )
 ----
 <.> This is a mixin. +
-Alternatively, could have used xref:system:generated:index/applib/annotation/Action.adoc[`@Action`].
+Alternatively, could have used xref:refguide:applib:index/annotation/Action.adoc[`@Action`].
 <.> This mixin is using a non-standard method.
 <.> a trick - this is not a `static` class, so the java compiler will create the 1-arg constructor automatically
 <.> Same name as the specified mixinMethod.
-Alternatively, when using xref:system:generated:index/applib/annotation/Action.adoc[`@Action`] then method's name defaults to `act`.
+Alternatively, when using xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_018-nature.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_018-nature.adoc
index 6ddd22d..3acb897 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_018-nature.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_018-nature.adoc
@@ -1,6 +1,6 @@
 === Nature
 
-The xref:system:generated:index/applib/annotation/DomainObject.adoc#nature[nature()] element is used to characterize the domain object as either an entity (part of the domain layer) or as a view model (part of the application layer).
+The xref:refguide:applib:index/annotation/DomainObject.adoc#nature[nature()] element is used to characterize the domain object as either an entity (part of the domain layer) or as a view model (part of the application layer).
 If the domain object should be thought of as an entity, it also captures how the persistence of that entity is managed.
 
 For example:
@@ -62,7 +62,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:system:generated:index/applib/annotation/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:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_019-objectType.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_019-objectType.adoc
index 0e182e0..4d2254d 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_019-objectType.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_019-objectType.adoc
@@ -1,16 +1,16 @@
 === Object aliases
 
-The xref:system:generated:index/applib/annotation/DomainObject.adoc#objectType[objectType()] element is used to provide a unique alias for the object's class name.
+The xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[objectType()] element is used to provide a unique alias for the object's class name.
 
 This value is used internally to generate a string representation of an objects identity (the `Oid`).
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
-(see xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`])
+(see xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`])
 * in the serialization of `OidDto` in the xref:refguide:schema:cmd[command] and xref:refguide:schema:ixn.adoc[interaction] schemas
 * in the URLs of the xref:vro:ROOT:about.adoc[RestfulObjects viewer]
 * in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer]
-* in XML snapshots generated by the xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[`XmlSnapshotService`]
+* in XML snapshots generated by the xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService.adoc[`XmlSnapshotService`]
 
 == Examples
 
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_030-see-also.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_030-see-also.adoc
index e448151..6da612e 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_030-see-also.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/DomainObject_030-see-also.adoc
@@ -1,9 +1,9 @@
 === See also
 
-* xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] SPI
+* xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] SPI
 +
 (only applies to entity objects)
 
-* xref:system:generated:index/applib/services/publishing/spi/EntityChangesSubscriber.adoc[`EntityChangesSubscriber`] SPI
+* xref:refguide:applib:index/services/publishing/spi/EntityChangesSubscriber.adoc[`EntityChangesSubscriber`] SPI
 +
 (only applies to entity objects)
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/InteractionScope_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/InteractionScope_010-examples-and-usage.adoc
index 812d979..9935a85 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/InteractionScope_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/InteractionScope_010-examples-and-usage.adoc
@@ -2,8 +2,8 @@
 
 // TODO: v2 - this may no longer be true.
 
-//A number of the built-in domain services uses this annotation, including xref:system:generated:index/applib/services/scratchpad/Scratchpad.adoc[`Scratchpad`] and
-//xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`].
+//A number of the built-in domain services uses this annotation, including xref:refguide:applib:index/services/scratchpad/Scratchpad.adoc[`Scratchpad`] and
+//xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`].
 //
 //One small wrinkle: these session-scoped services must be injected using the `Provider` idiom, not directly.
 //For example:
diff --git a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/MemberOrder_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
index 5c3a266..6121ecf 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/MemberOrder_010-examples-and-usage.adoc
@@ -7,6 +7,6 @@ As this is an important topic, there is xref:userguide:fun:ui.adoc#object-layout
 
 [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.
+The annotation is one of a handful (others including xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`], xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`], xref:refguide:applib:index/annotation/Property.adoc[`@Property`]) and xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
index e79c91a..ac465c2 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/PropertyLayout_010-examples-and-usage.adoc
@@ -33,7 +33,7 @@ As an alternative to using the `@PropertyLayout` annotation, a xref:userguide:fu
 
 [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`] 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
+The annotation is one of a handful (others including xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`], xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`] and xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Property_010-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Property_010-examples-and-usage.adoc
index 78f4ef7..95fa97d 100644
--- a/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Property_010-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/annotation/hooks/Property_010-examples-and-usage.adoc
@@ -34,6 +34,6 @@ public class Customer {
 
 [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`] 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
+The annotation is one of a handful (others including xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`], xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`] and xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/clock/VirtualClock.adoc b/antora/components/refguide/modules/applib/pages/index/clock/VirtualClock.adoc
index ed57c07..d9d82bf 100644
--- a/antora/components/refguide/modules/applib/pages/index/clock/VirtualClock.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/clock/VirtualClock.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Works in connection with _org.apache.isis.core.interaction.session.InteractionFactory_ , such that it allows an xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] to run with its own simulated (or actual) time.
+Works in connection with _org.apache.isis.core.interaction.session.InteractionFactory_ , such that it allows an xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] to run with its own simulated (or actual) time.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/domain/DomainObjectList.adoc b/antora/components/refguide/modules/applib/pages/index/domain/DomainObjectList.adoc
index 785c167..5c0c677 100644
--- a/antora/components/refguide/modules/applib/pages/index/domain/DomainObjectList.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/domain/DomainObjectList.adoc
@@ -1,10 +1,10 @@
 :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 initial idea of xref:system:generated:index/applib/domain/DomainObjectList.adoc[DomainObjectList] was to simplify restful clients.
+The initial idea of xref:refguide:applib:index/domain/DomainObjectList.adoc[DomainObjectList] was to simplify restful clients.
 
 In the original Restful Objects specification, invoking an action that returned a list meant that the RO client needed to handle this collection, which didn't have any identity. That made for special case logic in the client.
 
-Instead, if the RO client invokes the action but uses the _Accept Header_ to request an object, then the RO viewer would automatically wrap the returned list in this xref:system:generated:index/applib/domain/DomainObjectList.adoc[DomainObjectList] view model.
+Instead, if the RO client invokes the action but uses the _Accept Header_ to request an object, then the RO viewer would automatically wrap the returned list in this xref:refguide:applib:index/domain/DomainObjectList.adoc[DomainObjectList] view model.
 
 Thus, the RO client then only ever needs to know how to render an object, in all cases.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/events/domain/AbstractDomainEvent.adoc b/antora/components/refguide/modules/applib/pages/index/events/domain/AbstractDomainEvent.adoc
index 104d703..a852a28 100644
--- a/antora/components/refguide/modules/applib/pages/index/events/domain/AbstractDomainEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/events/domain/AbstractDomainEvent.adoc
@@ -85,7 +85,7 @@ Set user-data, for the use of a subsequent _#getEventPhase() phase_ .
 
 If used then the framework will set state via (non-API) setters.
 
-Because the xref:system:generated:index/applib/events/EventObjectBase.adoc[EventObjectBase] superclass prohibits a null source, a dummy value is temporarily used.
+Because the xref:refguide:applib:index/events/EventObjectBase.adoc[EventObjectBase] superclass prohibits a null source, a dummy value is temporarily used.
 
 [#setMixedIn__Object]
 === setMixedIn(Object)
diff --git a/antora/components/refguide/modules/applib/pages/index/exceptions/TranslatableException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/TranslatableException.adoc
index 275165e..6cfaa0c 100644
--- a/antora/components/refguide/modules/applib/pages/index/exceptions/TranslatableException.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/exceptions/TranslatableException.adoc
@@ -18,7 +18,7 @@ interface TranslatableException {
 <.> xref:#getTranslatableMessage__[getTranslatableMessage()]
 +
 --
-In the spirit of _Exception#getLocalizedMessage()_ , but using xref:system:generated:index/applib/services/i18n/TranslatableString.adoc[TranslatableString] instead.
+In the spirit of _Exception#getLocalizedMessage()_ , but using xref:refguide:applib:index/services/i18n/TranslatableString.adoc[TranslatableString] instead.
 --
 <.> xref:#getTranslationContext__[getTranslationContext()]
 +
@@ -31,9 +31,9 @@ The context to use when translating the _#getTranslatableMessage() translatable
 [#getTranslatableMessage__]
 === getTranslatableMessage()
 
-In the spirit of _Exception#getLocalizedMessage()_ , but using xref:system:generated:index/applib/services/i18n/TranslatableString.adoc[TranslatableString] instead.
+In the spirit of _Exception#getLocalizedMessage()_ , but using xref:refguide:applib:index/services/i18n/TranslatableString.adoc[TranslatableString] instead.
 
-If returns `null` , then _Exception#getMessage()_ will be used as a fallback. This design allows the Isis-provided xref:system:generated:index/applib/exceptions/RecoverableException.adoc[RecoverableException] and xref:system:generated:index/applib/exceptions/UnrecoverableException.adoc[UnrecoverableException] to provide constructors that accept a xref:system:generated:index/applib/services/i18n/TranslatableString.adoc[TranslatableString] , but can be left as null for any existing code.
+If returns `null` , then _Exception#getMessage()_ will be used as a fallback. This design allows the Isis-provided xref:refguide:applib:index/exceptions/RecoverableException.adoc[RecoverableException] and xref:refguide:applib:index/exceptions/UnrecoverableException.adoc[UnrecoverableException] to provide constructors that accept a xref:refguide:applib:index/services/i18n/TranslatableString.adoc[TranslatableString] , but can be left as null for any existing code.
 
 [#getTranslationContext__]
 === getTranslationContext()
diff --git a/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/PersistFailedException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/PersistFailedException.adoc
index f2a5daa..d1ca97a 100644
--- a/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/PersistFailedException.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/PersistFailedException.adoc
@@ -2,7 +2,7 @@
 
 Indicates that the persistence of an object failed.
 
-This exception is intended to represent an unexpected and non-recoverable condition (eg a unique/primary key/ foreign key constaint has been violated), and so is a subclass of xref:system:generated:index/applib/exceptions/UnrecoverableException.adoc[UnrecoverableException] . Throwing this exception will therefore result in (some sort of) error page being displayed to the user.
+This exception is intended to represent an unexpected and non-recoverable condition (eg a unique/primary key/ foreign key constaint has been violated), and so is a subclass of xref:refguide:applib:index/exceptions/UnrecoverableException.adoc[UnrecoverableException] . Throwing this exception will therefore result in (some sort of) error page being displayed to the user.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/RepositoryException.adoc b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/RepositoryException.adoc
index 845594c..a35a957 100644
--- a/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/RepositoryException.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/exceptions/unrecoverable/RepositoryException.adoc
@@ -2,7 +2,7 @@
 
 Indicates that a repository method has failed.
 
-This exception is intended to represent an unexpected and non-recoverable condition (eg a syntax error in some JDOQL query syntax or similar), and so is a subclass of xref:system:generated:index/applib/exceptions/UnrecoverableException.adoc[UnrecoverableException] . Throwing this exception will therefore result in (some sort of) error page being displayed to the user.
+This exception is intended to represent an unexpected and non-recoverable condition (eg a syntax error in some JDOQL query syntax or similar), and so is a subclass of xref:refguide:applib:index/exceptions/UnrecoverableException.adoc[UnrecoverableException] . Throwing this exception will therefore result in (some sort of) error page being displayed to the user.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/component/FieldSet.adoc b/antora/components/refguide/modules/applib/pages/index/layout/component/FieldSet.adoc
index 66b67cd..4da60b0 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/component/FieldSet.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/component/FieldSet.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-A xref:system:generated:index/applib/layout/component/MemberRegion.adoc[MemberRegion] of the page containing a set of related xref:system:generated:index/applib/layout/component/PropertyLayoutData.adoc[PropertyLayoutData] and associated xref:system:generated:index/applib/layout/component/ActionLayoutData.adoc[ActionLayoutData] .
+A xref:refguide:applib:index/layout/component/MemberRegion.adoc[MemberRegion] of the page containing a set of related xref:refguide:applib:index/layout/component/PropertyLayoutData.adoc[PropertyLayoutData] and associated xref:refguide:applib:index/layout/component/ActionLayoutData.adoc[ActionLayoutData] .
 
 == API
 
@@ -73,7 +73,7 @@ As per <div id="...">...</div> : must be unique across entire page.
 
 Whether this fieldset should be used to hold any unreferenced actions (contributed or "native").
 
-Any layout must have precisely one fieldset or xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] that has this attribute set.
+Any layout must have precisely one fieldset or xref:refguide:applib:index/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] that has this attribute set.
 
 [#isUnreferencedProperties__]
 === isUnreferencedProperties()
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/grid/Grid.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/Grid.adoc
index 50e3b0b..9760e9b 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/grid/Grid.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/grid/Grid.adoc
@@ -2,7 +2,7 @@
 
 All top-level page layout classes should implement this interface.
 
-It is used by the xref:system:generated:index/applib/services/layout/LayoutService.adoc[LayoutService] as a common based type for any layouts read in from XML.
+It is used by the xref:refguide:applib:index/services/layout/LayoutService.adoc[LayoutService] as a common based type for any layouts read in from XML.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/grid/GridAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/GridAbstract.adoc
index 5a930b8..33e7759 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/grid/GridAbstract.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/grid/GridAbstract.adoc
@@ -2,7 +2,7 @@
 
 All top-level page layout classes should implement this interface.
 
-It is used by the xref:system:generated:index/applib/services/layout/LayoutService.adoc[LayoutService] as a common based type for any layouts read in from XML.
+It is used by the xref:refguide:applib:index/services/layout/LayoutService.adoc[LayoutService] as a common based type for any layouts read in from XML.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc
index cd4efa6..269b1fc 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc
@@ -2,7 +2,7 @@
 
 A column within a row which, depending on its _#getSpan()_ , could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
 
-Pretty much other content can be contained within a column, though most commonly it will be xref:system:generated:index/applib/layout/component/FieldSet.adoc[FieldSet] s (a group of properties) or xref:system:generated:index/applib/layout/component/CollectionLayoutData.adoc[CollectionLayoutData] s. However, columns can also be used to contain further xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Row.adoc[BS3Row] s (creating a nested grid of rows/cols/rows/cols) and xref:sy [...]
+Pretty much other content can be contained within a column, though most commonly it will be xref:refguide:applib:index/layout/component/FieldSet.adoc[FieldSet] s (a group of properties) or xref:refguide:applib:index/layout/component/CollectionLayoutData.adoc[CollectionLayoutData] s. However, columns can also be used to contain further xref:refguide:applib:index/layout/grid/bootstrap3/BS3Row.adoc[BS3Row] s (creating a nested grid of rows/cols/rows/cols) and xref:refguide:applib:index/layo [...]
 
 It is rendered as a (eg) <div class="col-md-4 ...">
 
@@ -79,14 +79,14 @@ As per <div id="...">...</div> : must be unique across entire page.
 
 Whether this column should be used to hold any unreferenced actions (contributed or "native").
 
-Any layout must have precisely one column or xref:system:generated:index/applib/layout/component/FieldSet.adoc[FieldSet] that has this attribute set.
+Any layout must have precisely one column or xref:refguide:applib:index/layout/component/FieldSet.adoc[FieldSet] that has this attribute set.
 
 [#isUnreferencedCollections__]
 === isUnreferencedCollections()
 
 Whether this column should be used to hold any unreferenced collections (contributed or "native").
 
-Any layout must have precisely one column or xref:system:generated:index/applib/layout/grid/bootstrap3/BS3TabGroup.adoc[BS3TabGroup] that has this attribute set.
+Any layout must have precisely one column or xref:refguide:applib:index/layout/grid/bootstrap3/BS3TabGroup.adoc[BS3TabGroup] that has this attribute set.
 
 [#getDomainObject__]
 === getDomainObject()
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc
index 75b5968..8219184 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Contains a row of content, either on the top-level xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Grid.adoc[BS3Grid] or at any other lower-level element that can contain rows, eg xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Tab.adoc[BS3Tab] .
+Contains a row of content, either on the top-level xref:refguide:applib:index/layout/grid/bootstrap3/BS3Grid.adoc[BS3Grid] or at any other lower-level element that can contain rows, eg xref:refguide:applib:index/layout/grid/bootstrap3/BS3Tab.adoc[BS3Tab] .
 
 It is rendered as a <div class="row ...">
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc
index 0af00ee..b13b672 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc
@@ -2,7 +2,7 @@
 
 Common superclass for any content of a row.
 
-Most commonly the content of a row is xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] umns, but it may be either of the xref:system:generated:index/applib/layout/grid/bootstrap3/BS3ClearFix.adoc[BS3ClearFix] classes.
+Most commonly the content of a row is xref:refguide:applib:index/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] umns, but it may be either of the xref:refguide:applib:index/layout/grid/bootstrap3/BS3ClearFix.adoc[BS3ClearFix] classes.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc
index 64901f4..2ad3fa5 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Represents a tab within a xref:system:generated:index/applib/layout/grid/bootstrap3/BS3TabGroup.adoc[BS3TabGroup] .
+Represents a tab within a xref:refguide:applib:index/layout/grid/bootstrap3/BS3TabGroup.adoc[BS3TabGroup] .
 
-They simply contain one or more xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Row.adoc[BS3Row] s.
+They simply contain one or more xref:refguide:applib:index/layout/grid/bootstrap3/BS3Row.adoc[BS3Row] s.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc
index e11b17a..8568e3c 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Represents a tab group containing one or more xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Tab.adoc[BS3Tab] s.
+Represents a tab group containing one or more xref:refguide:applib:index/layout/grid/bootstrap3/BS3Tab.adoc[BS3Tab] s.
 
 == API
 
@@ -50,7 +50,7 @@ For diagnostics; populated by the framework if and only if a metadata error.
 
 Whether this tab group should be used to hold any unreferenced collections (contributed or "native").
 
-Any layout must have precisely one tab group or xref:system:generated:index/applib/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] that has this attribute set.
+Any layout must have precisely one tab group or xref:refguide:applib:index/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] that has this attribute set.
 
 [#isCollapseIfOne__]
 === isCollapseIfOne()
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
index cf059fa..10a0e77 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
+Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
index 8d9e7c2..4381c70 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
+Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
index 51d1187..ffa8b4c 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[DomainServiceLayout] .
+Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc
index f3f88de..a0fc00a 100644
--- a/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Corresponds to a domain service that contributes its serviceActions under a particular xref:system:generated:index/applib/layout/menubars/bootstrap3/BS3MenuBar.adoc[BS3MenuBar] .
+Corresponds to a domain service that contributes its serviceActions under a particular xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBar.adoc[BS3MenuBar] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/query/Query.adoc b/antora/components/refguide/modules/applib/pages/index/query/Query.adoc
index 37e8603..d958698 100644
--- a/antora/components/refguide/modules/applib/pages/index/query/Query.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/query/Query.adoc
@@ -6,7 +6,7 @@ The implementations of these objects are be provided by the underlying persistor
 
 Implementations are expected to implement the _#getRange()_ method, which is used to support range / paging the data. Returned result sets are expected to start from index "start", and no more than "count" items are expected.
 
- *Note:* not every object store will necessarily support this interface. In particular, the in-memory object store does not. For this, you can use the _Predicate_ interface to similar effect, for example in _RepositoryService#allMatches(Class, Predicate, long, long)_ ). *Note:* that the predicate is applied within the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[RepositoryService] (ie client-side) rather than being pushed back to the object store.
+ *Note:* not every object store will necessarily support this interface. In particular, the in-memory object store does not. For this, you can use the _Predicate_ interface to similar effect, for example in _RepositoryService#allMatches(Class, Predicate, long, long)_ ). *Note:* that the predicate is applied within the xref:refguide:applib:index/services/repository/RepositoryService.adoc[RepositoryService] (ie client-side) rather than being pushed back to the object store.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/DomainChangeRecord.adoc b/antora/components/refguide/modules/applib/pages/index/services/DomainChangeRecord.adoc
index 11b2b7b..edc43af 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/DomainChangeRecord.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/DomainChangeRecord.adoc
@@ -48,7 +48,7 @@ The object type of the domain object being changed.
 <.> xref:#getTarget__[getTarget()]
 +
 --
-The xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] identifying the domain object that has changed.
+The xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] identifying the domain object that has changed.
 --
 <.> xref:#getTargetMember__[getTargetMember()]
 +
@@ -96,7 +96,7 @@ The object type of the domain object being changed.
 [#getTarget__]
 === getTarget()
 
-The xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] identifying the domain object that has changed.
+The xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] identifying the domain object that has changed.
 
 [#getTargetMember__]
 === getTargetMember()
diff --git a/antora/components/refguide/modules/applib/pages/index/services/RepresentsInteractionMemberExecution.adoc b/antora/components/refguide/modules/applib/pages/index/services/RepresentsInteractionMemberExecution.adoc
index a7c6f8d..84e2660 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/RepresentsInteractionMemberExecution.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/RepresentsInteractionMemberExecution.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Extends xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] , where the _HasUniqueId#getUniqueId()_ is interpreted as an interaction (cf _InteractionDto_ ) that has at least one member execution (cf _MemberExecutionDto_ ) and may (by way of xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] ) contain several.
+Extends xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId] , where the _HasUniqueId#getUniqueId()_ is interpreted as an interaction (cf _InteractionDto_ ) that has at least one member execution (cf _MemberExecutionDto_ ) and may (by way of xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] ) contain several.
 
 Examples could include SPI services that persist published events and status messages.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
index b720b71..b5be8a3 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/acceptheader/hooks/AcceptHeaderService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/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:system:generated:index/applib/annotation/DomainService.adoc#nature[nature] of `VIEW_REST_ONLY` (`MyRestApi` in the diagram).
+The REST request is submitted to a domain service with a xref:refguide:applib:index/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).
 
@@ -26,6 +26,6 @@ The option is to use the media type's type/subtype, eg `application/vnd.myrestap
 
 == Alternatives
 
-As an alternative to performing content negotiation within the domain classes, the xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[`ContentMappingService`] SPI domain service allows the framework to perform the content negotiation responsibility.
+As an alternative to performing content negotiation within the domain classes, the xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[`ContentMappingService`] SPI domain service allows the framework to perform the content negotiation responsibility.
 
-The Restful Objects specification supports this with its own `x-ro-domain-type` media type parameter; this is used by the xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[`ContentMappingService`] to determine how to map domain objects to view models/DTOs.
+The Restful Objects specification supports this with its own `x-ro-domain-type` media type parameter; this is used by the xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[`ContentMappingService`] to determine how to map domain objects to view models/DTOs.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/bookmark/Bookmark.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/Bookmark.adoc
index a5b1849..6873483 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/bookmark/Bookmark.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/bookmark/Bookmark.adoc
@@ -28,7 +28,7 @@ Round-trip with _#toString()_ representation.
 <.> xref:#toString__[toString()]
 +
 --
-The canonical form of the xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] , that is " _#getObjectType() objectType_ _#SEPARATOR_ _#getIdentifier()_ ".
+The canonical form of the xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] , that is " _#getObjectType() objectType_ _#SEPARATOR_ _#getIdentifier()_ ".
 --
 
 == Members
@@ -41,6 +41,6 @@ Round-trip with _#toString()_ representation.
 [#toString__]
 === toString()
 
-The canonical form of the xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] , that is " _#getObjectType() objectType_ _#SEPARATOR_ _#getIdentifier()_ ".
+The canonical form of the xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] , that is " _#getObjectType() objectType_ _#SEPARATOR_ _#getIdentifier()_ ".
 
 This is parseable by the _#parse(String)_ .
diff --git a/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkService.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
index 35e8512..f3428a4 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
@@ -20,17 +20,17 @@ interface BookmarkService {
 <.> xref:#bookmarkFor__Object[bookmarkFor(Object)]
 +
 --
-Returns the xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] for the given domain object.
+Returns the xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] for the given domain object.
 --
 <.> xref:#bookmarkForElseThrow__Object[bookmarkForElseThrow(Object)]
 +
 --
-As per _#bookmarkFor(Object)_ , but requires that a non-null xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] is returned.
+As per _#bookmarkFor(Object)_ , but requires that a non-null xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] is returned.
 --
 <.> xref:#bookmarkFor__Class_String[bookmarkFor(Class, String)]
 +
 --
-Utility method that creates a xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] from the constituent parts.
+Utility method that creates a xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] from the constituent parts.
 --
 <.> xref:#lookup__BookmarkHolder[lookup(BookmarkHolder)]
 <.> xref:#lookup__Bookmark[lookup(Bookmark)]
@@ -49,19 +49,19 @@ As _#lookup(Bookmark)_ , but down-casting to the specified type.
 [#bookmarkFor__Object]
 === bookmarkFor(Object)
 
-Returns the xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] for the given domain object.
+Returns the xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] for the given domain object.
 
  *Note* : Not every domain object is bookmark-able: only entities, view models and services (NOT values or collections)
 
 [#bookmarkForElseThrow__Object]
 === bookmarkForElseThrow(Object)
 
-As per _#bookmarkFor(Object)_ , but requires that a non-null xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] is returned.
+As per _#bookmarkFor(Object)_ , but requires that a non-null xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] is returned.
 
 [#bookmarkFor__Class_String]
 === bookmarkFor(Class, String)
 
-Utility method that creates a xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] from the constituent parts.
+Utility method that creates a xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] from the constituent parts.
 
 [#lookup__BookmarkHolder]
 === lookup(BookmarkHolder)
diff --git a/antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
index 06d1836..b8baec5 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
@@ -8,11 +8,11 @@
 
 There are two mixins that will contribute to this interface:
 
-* xref:system:generated:index/applib/services/bookmark/BookmarkHolder_lookup.adoc[BookmarkHolder_lookup]
+* xref:refguide:applib:index/services/bookmark/BookmarkHolder_lookup.adoc[BookmarkHolder_lookup]
 +
 which contributes a `lookup` action to return the referenced object
 
-* xref:system:generated:index/applib/services/bookmark/BookmarkHolder_object.adoc[BookmarkHolder_object]
+* xref:refguide:applib:index/services/bookmark/BookmarkHolder_object.adoc[BookmarkHolder_object]
 +
 which contributes instead an `object` property, being the referenced object.
 
@@ -23,19 +23,19 @@ Either of these can be suppressed, if required, using a vetoing subscriber that
 
 //== Examples
 //
-//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
+//For example, a `Customer` object with an xref:refguide:applib:index/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:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] uses bookmarks to identify the object that is being modified.
+//For example the xref:refguide:applib:index/services/publishing/spi/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:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
+//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:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
 
 
 == See Also
 
-* xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark]
-* xref:system:generated:index/applib/services/bookmark/BookmarkHolder.adoc[BookmarkHolder]
+* xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark]
+* xref:refguide:applib:index/services/bookmark/BookmarkHolder.adoc[BookmarkHolder]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_020-examples-and-usage.adoc
index 98c143c..950c8ed 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/clock/hooks/ClockService_020-examples-and-usage.adoc
@@ -19,4 +19,4 @@ Apache Isis provides such a facade through the `ClockService`.
 
 == See also
 
-* xref:system:generated:index/applib/clock/VirtualClock.adoc[VirtualClock]
+* xref:refguide:applib:index/clock/VirtualClock.adoc[VirtualClock]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/command/Command.adoc b/antora/components/refguide/modules/applib/pages/index/services/command/Command.adoc
index 9580bf3..24f24aa 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/command/Command.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/command/Command.adoc
@@ -4,11 +4,11 @@ Represents the _intention to_ invoke either an action or modify a property. Ther
 
 Each Command holds a _CommandDto_ (see Apache Isiscmdschema) which reifies all the details in a serializable form.
 
-It also captures details of the corresponding action invocation (or property edit), specifically when that action/edit _Command#getStartedAt() started_ or _Command#getCompletedAt() completed_ , and its result, either a _Command#getResult() return value_ or an _Command#getException() exception_ . Also captures a stack of xref:system:generated:index/applib/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] s.
+It also captures details of the corresponding action invocation (or property edit), specifically when that action/edit _Command#getStartedAt() started_ or _Command#getCompletedAt() completed_ , and its result, either a _Command#getResult() return value_ or an _Command#getException() exception_ . Also captures a stack of xref:refguide:applib:index/events/domain/ActionDomainEvent.adoc[ActionDomainEvent] s.
 
-Note that when invoking an action, other actions may be invoked courtesy of the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] . These "sub-actions" do _not_ modify the contents of the current command object; in other words think of the command object as representing the outer-most originating action.
+Note that when invoking an action, other actions may be invoked courtesy of the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] . These "sub-actions" do _not_ modify the contents of the current command object; in other words think of the command object as representing the outer-most originating action.
 
-That said, if the sub-action is invoked asynchronously (using _WrapperFactory#asyncWrap(Object, AsyncControl)_ or _WrapperFactory#asyncWrapMixin(Class, Object, AsyncControl)_ ), then a separate xref:system:generated:index/applib/services/command/Command.adoc[Command] object is created, and the originating xref:system:generated:index/applib/services/command/Command.adoc[Command] is set to be its _Command#getParent() parent_ .
+That said, if the sub-action is invoked asynchronously (using _WrapperFactory#asyncWrap(Object, AsyncControl)_ or _WrapperFactory#asyncWrapMixin(Class, Object, AsyncControl)_ ), then a separate xref:refguide:applib:index/services/command/Command.adoc[Command] object is created, and the originating xref:refguide:applib:index/services/command/Command.adoc[Command] is set to be its _Command#getParent() parent_ .
 
 == API
 
@@ -37,7 +37,7 @@ The date/time at which this command was created.
 <.> xref:#getTarget__[getTarget()]
 +
 --
-Derived from _#getCommandDto()_ , is the xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] of the target object (entity or service) on which this action/edit was performed.
+Derived from _#getCommandDto()_ , is the xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] of the target object (entity or service) on which this action/edit was performed.
 --
 <.> xref:#getLogicalMemberIdentifier__[getLogicalMemberIdentifier()]
 +
@@ -69,7 +69,7 @@ Derived from _#getCommandDto()_ 's _CommandDto#getTimestamp()_ .
 [#getTarget__]
 === getTarget()
 
-Derived from _#getCommandDto()_ , is the xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] of the target object (entity or service) on which this action/edit was performed.
+Derived from _#getCommandDto()_ , is the xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] of the target object (entity or service) on which this action/edit was performed.
 
 [#getLogicalMemberIdentifier__]
 === getLogicalMemberIdentifier()
diff --git a/antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc
index c744984..0d37961 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/commanddto/conmap/ContentMappingServiceForCommandsDto.adoc
@@ -16,7 +16,7 @@ ContentMappingServiceForCommandDto contentMappingServiceForCommandDto;
 <.> xref:#map__Object[map(Object)]
 +
 --
-Not part of the xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[ContentMappingService] API.
+Not part of the xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[ContentMappingService] API.
 --
 
 == Members
@@ -24,4 +24,4 @@ Not part of the xref:system:generated:index/applib/services/conmap/ContentMappin
 [#map__Object]
 === map(Object)
 
-Not part of the xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[ContentMappingService] API.
+Not part of the xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[ContentMappingService] API.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
index 92b81dc..aa54a72 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/hooks/CommandDtoProcessorService_020-examples-and-usage.adoc
@@ -6,7 +6,7 @@
 
 Having a DTO representation of ``Command``s (or more precisely, any object implementing `HasCommandDto` offers the ability to move or copy it across the network, for example to support replay scenarios.
 This is used for example by xref:extensions:command-log:about.adoc[Command Log] extension to return persisted representations of commands.
-The conversion is performed by an in-built implementation of the xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[`ContentMappingService`] SPI.
+The conversion is performed by an in-built implementation of the xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[`ContentMappingService`] SPI.
 
 The `CommandDtoProcessorService` SPI provides a mechanism to post-process the `CommandDto` of any objects being serialized across the network.
 
@@ -16,4 +16,4 @@ Another use case is to strip out large blobs for performance reasons.
 
 == See also
 
-* xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor]
+* xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorService.adoc b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorService.adoc
index 7c750a0..59a5349 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/commanddto/processor/spi/CommandDtoProcessorService.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Service used to convert a domain object into a _CommandDto_ , called by xref:system:generated:index/applib/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc[ContentMappingServiceForCommandDto] .
+Service used to convert a domain object into a _CommandDto_ , called by xref:refguide:applib:index/services/commanddto/conmap/ContentMappingServiceForCommandDto.adoc[ContentMappingServiceForCommandDto] .
 
-The service is used as a fallback if an xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] , hasn't been explicitly specified using _Action#commandDtoProcessor()_ or _Property#commandDtoProcessor()_ .
+The service is used as a fallback if an xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] , hasn't been explicitly specified using _Action#commandDtoProcessor()_ or _Property#commandDtoProcessor()_ .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
index 1292d36..e15c83a 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Simply provides a UI in order to access the configuration properties available from xref:system:generated:index/applib/services/confview/ConfigurationViewService.adoc[ConfigurationViewService] .
+Simply provides a UI in order to access the configuration properties available from xref:refguide:applib:index/services/confview/ConfigurationViewService.adoc[ConfigurationViewService] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationViewService.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationViewService.adoc
index 580d6c5..cee2ddb 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationViewService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/confview/ConfigurationViewService.adoc
@@ -2,7 +2,7 @@
 
 Returns the configuration properties (as view models) such that they can be rendered into the UI (in the Wicket Viewer, under the "Configuration" menu).
 
-This is the backing service used by xref:system:generated:index/applib/services/confview/ConfigurationMenu.adoc[ConfigurationMenu] .
+This is the backing service used by xref:refguide:applib:index/services/confview/ConfigurationMenu.adoc[ConfigurationMenu] .
 
 == API
 
@@ -17,7 +17,7 @@ interface ConfigurationViewService {
 <.> xref:#allProperties__[allProperties()]
 +
 --
-Returns all properties, each as an instance of xref:system:generated:index/applib/services/confview/ConfigurationProperty.adoc[ConfigurationProperty] (a view model). Mask sensitive values if required.
+Returns all properties, each as an instance of xref:refguide:applib:index/services/confview/ConfigurationProperty.adoc[ConfigurationProperty] (a view model). Mask sensitive values if required.
 --
 
 == Members
@@ -25,7 +25,7 @@ Returns all properties, each as an instance of xref:system:generated:index/appli
 [#allProperties__]
 === allProperties()
 
-Returns all properties, each as an instance of xref:system:generated:index/applib/services/confview/ConfigurationProperty.adoc[ConfigurationProperty] (a view model). Mask sensitive values if required.
+Returns all properties, each as an instance of xref:refguide:applib:index/services/confview/ConfigurationProperty.adoc[ConfigurationProperty] (a view model). Mask sensitive values if required.
 
 include::hooks/ConfigurationViewService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
index 52e00eb..23ce071 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc
@@ -4,4 +4,4 @@
 
 == Related Services
 
-This service is the front-end UI (and delegates to) xref:system:generated:index/applib/services/confview/ConfigurationViewService.adoc[`ConfigurationViewService`].
+This service is the front-end UI (and delegates to) xref:refguide:applib:index/services/confview/ConfigurationViewService.adoc[`ConfigurationViewService`].
diff --git a/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
index aa94be0..3a65634 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/confview/hooks/ConfigurationViewService_020-examples-and-usage.adoc
@@ -22,5 +22,5 @@ To use it therefore requires this dependency:
 ----
 ====
 
-* The xref:system:generated:index/applib/services/confview/ConfigurationMenu.adoc[ `ConfigurationMenu`] provides a UI to access this service.
+* The xref:refguide:applib:index/services/confview/ConfigurationMenu.adoc[ `ConfigurationMenu`] provides a UI to access this service.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_010-implementation.adoc
index 405509a..28dc922 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_010-implementation.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/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: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.
+If the action invocation or property edit represent provides an implementation of a `CommandDtoProcessor` (by way of xref:refguide:applib:index/annotation/Action.adoc#commandDtoProcessor[`@Action#commandDtoProcessor()`] or xref:refguide:applib:index/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/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
index ffbdfa5b..a5c17c4 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/conmap/hooks/ContentMappingService_020-examples-and-usage.adoc
@@ -17,4 +17,4 @@ The mapped object used will be the first non-`null` result returned by an implem
 
 This service is a companion to the default implementation of the xref:core:runtime-services:ContentNegotiationService.adoc[`ContentNegotiationService`].
 
-The framework implementations of `ContentMappingService` use the xref:system:generated:index/applib/services/metamodel/MetaModelService.adoc[`MetaModelService`] to lookup any custom implementations of `CommandDtoProcessor`.
+The framework implementations of `ContentMappingService` use the xref:refguide:applib:index/services/metamodel/MetaModelService.adoc[`MetaModelService`] to lookup any custom implementations of `CommandDtoProcessor`.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_020-examples-and-usage.adoc
index 4e912d8..2d49785 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/email/hooks/EmailService_020-examples-and-usage.adoc
@@ -9,4 +9,4 @@ If you wish to write an alternative implementation, be aware that it should proc
 
 == Related Services
 
-The email service is used by the xref:system:generated:index/applib/services/userreg/EmailNotificationService.adoc[`EmailNotificationService`] which is, in turn, used by xref:system:generated:index/applib/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`].
+The email service is used by the xref:refguide:applib:index/services/userreg/EmailNotificationService.adoc[`EmailNotificationService`] which is, in turn, used by xref:refguide:applib:index/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`].
diff --git a/antora/components/refguide/modules/applib/pages/index/services/error/ErrorDetails.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/ErrorDetails.adoc
index 8a5d55e..4b52dd2 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/error/ErrorDetails.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/error/ErrorDetails.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Details of the error (obtained from the thrown exception), passed as part of the request to the xref:system:generated:index/applib/services/error/ErrorReportingService.adoc[ErrorReportingService] .
+Details of the error (obtained from the thrown exception), passed as part of the request to the xref:refguide:applib:index/services/error/ErrorReportingService.adoc[ErrorReportingService] .
 
 Implementation note: a class has been used here so that additional fields might be added in the future.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/error/SimpleTicket.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/SimpleTicket.adoc
index 55cb76d..c878708 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/error/SimpleTicket.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/error/SimpleTicket.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Response from the xref:system:generated:index/applib/services/error/ErrorReportingService.adoc[ErrorReportingService] , containing information to show to the end-user.
+Response from the xref:refguide:applib:index/services/error/ErrorReportingService.adoc[ErrorReportingService] , containing information to show to the end-user.
 
 Implementation notes:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/error/Ticket.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/Ticket.adoc
index 82431d2..058517d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/error/Ticket.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/error/Ticket.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Response from the xref:system:generated:index/applib/services/error/ErrorReportingService.adoc[ErrorReportingService] , containing information to show to the end-user.
+Response from the xref:refguide:applib:index/services/error/ErrorReportingService.adoc[ErrorReportingService] , containing information to show to the end-user.
 
 Implementation notes:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
index 6af0723..039153c 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/error/hooks/ErrorReportingService_020-examples-and-usage.adoc
@@ -4,9 +4,9 @@
 
 == See also:
 
-* xref:system:generated:index/applib/services/error/ErrorDetails.adoc[ErrorDetails]
-* xref:system:generated:index/applib/services/error/Ticket.adoc[Ticket]
-* xref:system:generated:index/applib/services/error/SimpleTicket.adoc[SimpleTicket]
+* xref:refguide:applib:index/services/error/ErrorDetails.adoc[ErrorDetails]
+* xref:refguide:applib:index/services/error/Ticket.adoc[Ticket]
+* xref:refguide:applib:index/services/error/SimpleTicket.adoc[SimpleTicket]
 +
 a convenience implementation of `Ticket` for use by implementations.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
index fd58cb9..f0b2efa 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/eventbus/hooks/EventBusService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/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: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].
+The primary user of the service is the framework itself, which automatically emit events for xref:refguide:applib:index/annotation/Action.adoc#domainEvent[actions], xref:refguide:applib:index/annotation/Property.adoc#domainEvent[properties] and xref:refguide:applib:index/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: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()`].
+For more on this topic, see xref:refguide:applib:index/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`], xref:refguide:applib:index/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`] and xref:refguide:applib:index/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.
@@ -71,7 +71,7 @@ public class LibraryMember {
     ...
 }
 ----
-<1> `LibraryMemberLeaveEvent` is a subclass of `o.a.i.applib.eventbus.ActionDomainEvent`.The topic of subclassing is discussed in more detail xref:system:generated:index/applib/services/eventbus/EventBusService.adoc#event-hierarchy[below].
+<1> `LibraryMemberLeaveEvent` is a subclass of `o.a.i.applib.eventbus.ActionDomainEvent`.The topic of subclassing is discussed in more detail xref:refguide:applib:index/services/eventbus/EventBusService.adoc#event-hierarchy[below].
 
 Meanwhile, in the `BookRepository` domain service, we subscribe to the event and act upon it.
 For example:
@@ -192,7 +192,7 @@ This then allows for other classes - in particular domain services contributing
 
 == Programmatic posting
 
-To programmatically post an event, simply call xref:system:generated:index/applib/services/eventbus/EventBusService.adoc#post[EventBusService#post].
+To programmatically post an event, simply call xref:refguide:applib:index/services/eventbus/EventBusService.adoc#post[EventBusService#post].
 
 The `LibraryMember` example described above could for example be rewritten into:
 
@@ -209,13 +209,13 @@ 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:system:generated:index/applib/annotation/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:refguide:applib:index/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`] et al.
 
 
 == Using `WrapperFactory`
 
 Using the declarative approach does require that the method to emit the event is an action called directly by the framework (rather than a helper method programmatically called by that action).
-However by using the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] we can invoke that helper method "through" the framework, thereby allowing the framework to emit events.
+However by using the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] we can invoke that helper method "through" the framework, thereby allowing the framework to emit events.
 (It can also optionally perform validation checks and other concerns associated with the UI).
 
 Another use case for the `WrapperFactory` is when you wish to enforce a (lack-of-) trust boundary between the caller and the callee.
@@ -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: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`]).
+These events apply to actions annotated with xref:refguide:applib:index/annotation/Action.adoc#commandPublishing[`@Action#commandPublishing()`]) and to properties properties annotated with xref:refguide:applib:index/annotation/Property.adoc#commandPublishing[`@Property#commandPublishing`]).
 +
-The events are received by any/all xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[`CommandSubscriber`]s.
+The events are received by any/all xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[`CommandSubscriber`]s.
 
 * Execution publishing, representing the _completion_ of an action invocation or property edit.
 +
-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`]).
+These events apply to actions annotated with xref:refguide:applib:index/annotation/Action.adoc#executionPublishing[`@Action#executionPublishing()`]) and properties annotated with xref:refguide:applib:index/annotation/Property.adoc#executionPublishing[`@Property#executionPublishing`]).
 +
-The events are received by any/all xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[`ExecutionSubscriber`]s
+The events are received by any/all xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[`ExecutionSubscriber`]s
 
 * Entity change publishing, representing an entity that has changed its state.
 +
-These events apply to objects annotated with xref:system:generated:index/applib/annotation/DomainObject.adoc#entityChangePublishing[`@DomainObject#entityChangePublishing()`]).
+These events apply to objects annotated with xref:refguide:applib:index/annotation/DomainObject.adoc#entityChangePublishing[`@DomainObject#entityChangePublishing()`]).
 +
-The events are received by any/all xref:system:generated:index/applib/services/publishing/spi/EntityChangesSubscriber.adoc[`EntityChangesSubscriber`]s
+The events are received by any/all xref:refguide:applib:index/services/publishing/spi/EntityChangesSubscriber.adoc[`EntityChangesSubscriber`]s
diff --git a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizer.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizer.adoc
index c6fdb43..8fd9e09 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizer.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizer.adoc
@@ -6,7 +6,7 @@ Rather than redirecting to a general-purpose error page, the message (correspond
 
 For example, a set of recognizers are provided for the JPA and JDO persistence mechanisms in order to recognize and handle SQL constraint exceptions such as uniqueness violations. These can then be rendered back to the user as expected errors, rather than fatal stacktraces.
 
-More than one implementation of xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] can be registered; they will all be consulted (in the order as specified by Spring's _org.springframework.core.annotation.Order_ annotation) to determine if they recognize the exception. The message returned by the first service recognizing the exception is used.
+More than one implementation of xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] can be registered; they will all be consulted (in the order as specified by Spring's _org.springframework.core.annotation.Order_ annotation) to determine if they recognize the exception. The message returned by the first service recognizing the exception is used.
 
 The framework also provides a default implementation of this service that recognizes any _org.apache.isis.applib.exceptions.RecoverableException_ , simply returning the exception's _org.apache.isis.applib.exceptions.RecoverableException#getMessage() message_ . This allows any component or domain object to throw this exception with the knowledge that it will be handled appropriately.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerAbstract.adoc
index cc1c585..d371bd1 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerAbstract.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerAbstract.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Abstract implementation of xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] that looks exceptions meeting the _Predicate_ supplied in the constructor and, if found anywhere in the causal chain, then returns a non-null message indicating that the exception has been recognized.
+Abstract implementation of xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] that looks exceptions meeting the _Predicate_ supplied in the constructor and, if found anywhere in the causal chain, then returns a non-null message indicating that the exception has been recognized.
 
 If a messaging-parsing _Function_ is provided through the constructor, then the message can be altered. Otherwise the exception's _Throwable#getMessage() message_ is returned as-is.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerForType.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerForType.adoc
index 24e48e2..8b3aa89 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerForType.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerForType.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-A specific implementation of xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] that looks for an exception of the type provided in the constructor and, if found anywhere in the causal chain, then returns a non-null message indicating that the exception has been recognized.
+A specific implementation of xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] that looks for an exception of the type provided in the constructor and, if found anywhere in the causal chain, then returns a non-null message indicating that the exception has been recognized.
 
 If a messaging-parsing _Function_ is provided through the constructor, then the message can be altered. Otherwise the exception's _Throwable#getMessage() message_ is returned as-is.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerService.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerService.adoc
index c6fdd29..a0a9f5a 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/ExceptionRecognizerService.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Used by the framework to iterate over all registered xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] s in the correct order.
+Used by the framework to iterate over all registered xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] s in the correct order.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/Recognition.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/Recognition.adoc
index e056721..056593c 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/Recognition.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/Recognition.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Represents a user-friendly representation of an exception that has been recognised by an available implementation of an xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] .
+Represents a user-friendly representation of an exception that has been recognised by an available implementation of an xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer] .
 
 Returned by _ExceptionRecognizer#recognize(Throwable)_ when the exception recognizer has recognised the exception
 
@@ -23,7 +23,7 @@ String reason;     // <.>
 <.> xref:#category[category]
 +
 --
-Categorises the exception as per xref:system:generated:index/applib/services/exceprecog/Category.adoc[Category] .
+Categorises the exception as per xref:refguide:applib:index/services/exceprecog/Category.adoc[Category] .
 --
 <.> xref:#reason[reason]
 +
@@ -34,12 +34,12 @@ The untranslated user-friendly reason for the exception.
 <.> xref:#toMessage__TranslationService[toMessage(TranslationService)]
 +
 --
-Translates the _#getReason() reason_ and prepends with a translation of _#getCategory() category_ , using the provided xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] ..
+Translates the _#getReason() reason_ and prepends with a translation of _#getCategory() category_ , using the provided xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] ..
 --
 <.> xref:#toMessageNoCategory__TranslationService[toMessageNoCategory(TranslationService)]
 +
 --
-Translates the _#getReason() reason_ alone (ignoring the _#getCategory() category_ , using the provided xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] ..
+Translates the _#getReason() reason_ alone (ignoring the _#getCategory() category_ , using the provided xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] ..
 --
 
 == Members
@@ -47,7 +47,7 @@ Translates the _#getReason() reason_ alone (ignoring the _#getCategory() categor
 [#category]
 === category
 
-Categorises the exception as per xref:system:generated:index/applib/services/exceprecog/Category.adoc[Category] .
+Categorises the exception as per xref:refguide:applib:index/services/exceprecog/Category.adoc[Category] .
 
 In essence, if an exception is recognized then it is also categorized. This lets the viewer act accordingly. If the implementation recognizes the exception then it returns a user-friendly message to be rendered (by the viewer) back to the user; otherwise it returns `null`. There is no need for the implementation to check for exception causes; the casual chain is unwrapped by Apache Isis core and each exception in the chain will also be passed through to the recognizer (from most specific [...]
 
@@ -66,9 +66,9 @@ The reason can also be translated (prepended or not by the translation of the _#
 [#toMessage__TranslationService]
 === toMessage(TranslationService)
 
-Translates the _#getReason() reason_ and prepends with a translation of _#getCategory() category_ , using the provided xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] ..
+Translates the _#getReason() reason_ and prepends with a translation of _#getCategory() category_ , using the provided xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] ..
 
 [#toMessageNoCategory__TranslationService]
 === toMessageNoCategory(TranslationService)
 
-Translates the _#getReason() reason_ alone (ignoring the _#getCategory() category_ , using the provided xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] ..
+Translates the _#getReason() reason_ alone (ignoring the _#getCategory() category_ , using the provided xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] ..
diff --git a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
index b945680..8285c91 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/exceprecog/hooks/ExceptionRecognizer_020-examples-and-usage.adoc
@@ -4,22 +4,22 @@
 
 == Usage
 
-If you want to recognize and handle additional exceptions (for example to capture error messages specific to the JDBC driver you might be using), then create an implementation of this SPI for the particular error message, and annotate your implementation as a xref:system:generated:index/applib/annotation/DomainService.adoc[DomainService].
+If you want to recognize and handle additional exceptions (for example to capture error messages specific to the JDBC driver you might be using), then create an implementation of this SPI for the particular error message, and annotate your implementation as a xref:refguide:applib:index/annotation/DomainService.adoc[DomainService].
 
 There are some convenience implementations of the interface to subclass from if required.
 
 
 == See also
 
-* xref:system:generated:index/applib/services/exceprecog/Recognition.adoc[Recognition]
+* xref:refguide:applib:index/services/exceprecog/Recognition.adoc[Recognition]
 +
-Part of the SPI for xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]
+Part of the SPI for xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]
 
-* xref:system:generated:index/applib/services/exceprecog/Category.adoc[Category]
+* xref:refguide:applib:index/services/exceprecog/Category.adoc[Category]
 +
-Part of the SPI for xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]
+Part of the SPI for xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]
 
-* xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizerService.adoc[ExceptionRecognizerService]
+* xref:refguide:applib:index/services/exceprecog/ExceptionRecognizerService.adoc[ExceptionRecognizerService]
 +
-mediates access to xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]s in the correct order.
+mediates access to xref:refguide:applib:index/services/exceprecog/ExceptionRecognizer.adoc[ExceptionRecognizer]s in the correct order.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
index b61927b..af01e26 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/factory/hooks/FactoryService_020-examples-and-usage.adoc
@@ -6,11 +6,11 @@
 
 The benefits of using this method (instead of simply using the Java `new` keyword) are:
 
-* any services will be injected into the object immediately (otherwise they will not be injected until the framework becomes aware of the object, typically when it is persisted through the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]
+* any services will be injected into the object immediately (otherwise they will not be injected until the framework becomes aware of the object, typically when it is persisted through the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`]
 
 * the default value for any properties (usually as specified by `defaultXxx()` supporting methods) or from the value type itself will be set and the `created()` callback will be called.
 
-An alternative idiom is to just `new` up the object and then use xref:system:generated:index/applib/services/inject/ServiceInjector.adoc[ServiceInjector] domain service can be used to inject services into the domain object.
+An alternative idiom is to just `new` up the object and then use xref:refguide:applib:index/services/inject/ServiceInjector.adoc[ServiceInjector] domain service can be used to inject services into the domain object.
 Note though that no default values will be set on the created object.
 
 
@@ -31,4 +31,4 @@ repositoryService.persist(cust);
 
 See also:
 
-* The xref:system:generated:index/applib/services/repository/RepositoryService.adoc[RepositoryService] is often used in conjunction with the `FactoryService`, to persist domain objects after they have been instantiated and populated.
+* The xref:refguide:applib:index/services/repository/RepositoryService.adoc[RepositoryService] is often used in conjunction with the `FactoryService`, to persist domain objects after they have been instantiated and populated.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/grid/GridLoaderService.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/GridLoaderService.adoc
index 4bf8569..971471c 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/grid/GridLoaderService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/grid/GridLoaderService.adoc
@@ -34,12 +34,12 @@ Whether any persisted layout metadata (eg a `.layout.xml` file) exists for this
 <.> xref:#load__Class[load(Class)]
 +
 --
-Returns a new instance of a xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] for the specified domain class, eg from a `layout.xml` file, else `null` .
+Returns a new instance of a xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] for the specified domain class, eg from a `layout.xml` file, else `null` .
 --
 <.> xref:#load__Class_String[load(Class, String)]
 +
 --
-Loads a specic alternative xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] layout for the specified domain class.
+Loads a specic alternative xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] layout for the specified domain class.
 --
 
 == Members
@@ -63,17 +63,17 @@ This is called by the _org.apache.isis.applib.mixins.layout.Object_rebuildMetamo
 
 Whether any persisted layout metadata (eg a `.layout.xml` file) exists for this domain class.
 
-If none exists, will return null (and the calling xref:system:generated:index/applib/services/grid/GridService.adoc[GridService] will use xref:system:generated:index/applib/services/grid/GridSystemService.adoc[GridSystemService] to obtain a default grid for the domain class).
+If none exists, will return null (and the calling xref:refguide:applib:index/services/grid/GridService.adoc[GridService] will use xref:refguide:applib:index/services/grid/GridSystemService.adoc[GridSystemService] to obtain a default grid for the domain class).
 
 [#load__Class]
 === load(Class)
 
-Returns a new instance of a xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] for the specified domain class, eg from a `layout.xml` file, else `null` .
+Returns a new instance of a xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] for the specified domain class, eg from a `layout.xml` file, else `null` .
 
 [#load__Class_String]
 === load(Class, String)
 
-Loads a specic alternative xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] layout for the specified domain class.
+Loads a specic alternative xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] layout for the specified domain class.
 
 The layout alternative will typically be specified through a `layout()` method on the domain object, the value of which is used for the suffix of the layout file (eg "Customer-layout.archived.xml" to use a different layout for customers that have been archived).
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/grid/GridService.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/GridService.adoc
index cdb1ca6..82086ab 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/grid/GridService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/grid/GridService.adoc
@@ -38,7 +38,7 @@ Whether any persisted layout metadata (eg a `.layout.xml` file) exists for this
 <.> xref:#load__Class[load(Class)]
 +
 --
-Returns a new instance of a xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] for the specified domain class, for example as loaded from a `layout.xml` file.
+Returns a new instance of a xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] for the specified domain class, for example as loaded from a `layout.xml` file.
 --
 <.> xref:#load__Class_String[load(Class, String)]
 +
@@ -58,12 +58,12 @@ Returns a normalized grid for the domain class obtained previously using _#load(
 <.> xref:#complete__Grid[complete(Grid)]
 +
 --
-Modifies the provided xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:system:generated:index/applib/annotation/ActionLayout.adoc[ActionLayout] , xref:system:generated:index/applib/annotation/PropertyLayout.adoc[PropertyLayout] and xref:system:generated:index/applib/annotation/CollectionLayout.adoc[CollectionLayout] .
+Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayout] and xref:refguide:applib:index/annotation/CollectionLayout.adoc[CollectionLayout] .
 --
 <.> xref:#minimal__Grid[minimal(Grid)]
 +
 --
-Modifies the provided xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] , removing all metadata except the basic grid structure.
+Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] , removing all metadata except the basic grid structure.
 --
 
 == Members
@@ -73,30 +73,30 @@ Modifies the provided xref:system:generated:index/applib/layout/grid/Grid.adoc[G
 
 Whether dynamic reloading of layouts is enabled.
 
-The default implementation just delegates to the configured xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[GridLoaderService] ; the default implementation of _that_ service enables reloading wihle prototyping, disables in production.
+The default implementation just delegates to the configured xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService] ; the default implementation of _that_ service enables reloading wihle prototyping, disables in production.
 
 [#remove__Class]
 === remove(Class)
 
 To support metamodel invalidation/rebuilding of spec.
 
-The default implementation just delegates to the configured xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[GridLoaderService] .
+The default implementation just delegates to the configured xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService] .
 
 [#existsFor__Class]
 === existsFor(Class)
 
 Whether any persisted layout metadata (eg a `.layout.xml` file) exists for this domain class.
 
-The default implementation just delegates to the configured xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[GridLoaderService] .
+The default implementation just delegates to the configured xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService] .
 
 [#load__Class]
 === load(Class)
 
-Returns a new instance of a xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] for the specified domain class, for example as loaded from a `layout.xml` file.
+Returns a new instance of a xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] for the specified domain class, for example as loaded from a `layout.xml` file.
 
 If non exists, returns `null` . (The caller can then use _GridService#defaultGridFor(Class)_ to obtain a default grid if necessary).
 
-The default implementation just delegates to the configured xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[GridLoaderService] .
+The default implementation just delegates to the configured xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService] .
 
 [#load__Class_String]
 === load(Class, String)
@@ -105,7 +105,7 @@ Returns an alternative layout for the domain class.
 
 The alternative layout name can for example be returned by the domain object's `layout()` method, whereby - based on the state of the domain object - it requests a different layout be used.
 
-The default implementation just delegates to the configured xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[GridLoaderService] ; the default implementation of _that_ service uses the layout name to search for a differently named layout file, `[domainClass].layout.[layout].xml` .
+The default implementation just delegates to the configured xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService] ; the default implementation of _that_ service uses the layout name to search for a differently named layout file, `[domainClass].layout.[layout].xml` .
 
 [#defaultGridFor__Class]
 === defaultGridFor(Class)
@@ -114,28 +114,28 @@ Returns a default grid; eg where none can be loaded using _#load(Class)_ .
 
 Used when no existing grid layout exists for a domain class.
 
-The default implementation searches through all available xref:system:generated:index/applib/services/grid/GridSystemService.adoc[GridSystemService] s and asks each in turn for a _GridSystemService#defaultGrid(Class) default grid_ .
+The default implementation searches through all available xref:refguide:applib:index/services/grid/GridSystemService.adoc[GridSystemService] s and asks each in turn for a _GridSystemService#defaultGrid(Class) default grid_ .
 
 [#normalize__Grid]
 === normalize(Grid)
 
 Returns a normalized grid for the domain class obtained previously using _#load(Class)_ .
 
-If a "normalized" grid is persisted as the `layout.xml` , then the expectation is that the xref:system:generated:index/applib/annotation/MemberOrder.adoc[MemberOrder] annotation can be removed from the domain class because the binding of properties/collections/actions will be within the XML. However, the layout annotations ( xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:system:generated:index/applib/annotation/ActionLayout.adoc[ActionLay [...]
+If a "normalized" grid is persisted as the `layout.xml` , then the expectation is that the xref:refguide:applib:index/annotation/MemberOrder.adoc[MemberOrder] annotation can be removed from the domain class because the binding of properties/collections/actions will be within the XML. However, the layout annotations ( xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:app [...]
 
 [#complete__Grid]
 === complete(Grid)
 
-Modifies the provided xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:system:generated:index/applib/annotation/ActionLayout.adoc[ActionLayout] , xref:system:generated:index/applib/annotation/PropertyLayout.adoc[PropertyLayout] and xref:system:generated:index/applib/annotation/CollectionLayout.adoc[CollectionLayout] .
+Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayout] and xref:refguide:applib:index/annotation/CollectionLayout.adoc[CollectionLayout] .
 
-If a "completed" grid is persisted as the `layout.xml` , then there should be no need for any of the layout annotations, nor the xref:system:generated:index/applib/annotation/MemberOrder.adoc[MemberOrder] annotations, to be required in the domain class itself.
+If a "completed" grid is persisted as the `layout.xml` , then there should be no need for any of the layout annotations, nor the xref:refguide:applib:index/annotation/MemberOrder.adoc[MemberOrder] annotations, to be required in the domain class itself.
 
 [#minimal__Grid]
 === minimal(Grid)
 
-Modifies the provided xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] , removing all metadata except the basic grid structure.
+Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] , removing all metadata except the basic grid structure.
 
-If a "minimal" grid is persisted as the `layout.xml` , then the expectation is that most of the layout annotations ( xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , 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] , but also xref:system:generated: [...]
+If a "minimal" grid is persisted as the `layout.xml` , then the expectation is that most of the layout annotations ( xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayout] , xref:refguide:applib:index/annotation/CollectionLayout.adoc[CollectionLayout] , but also xref:refguide:applib:index/annotation/MemberOrder.adoc [...]
 
 include::hooks/GridService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/grid/GridSystemService.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/GridSystemService.adoc
index 0b4a835..abe22c0 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/grid/GridSystemService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/grid/GridSystemService.adoc
@@ -23,7 +23,7 @@ interface GridSystemService<G> {
 <.> xref:#gridImplementation__[gridImplementation()]
 +
 --
-The concrete subclass of xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] supported by this implementation.
+The concrete subclass of xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] supported by this implementation.
 --
 <.> xref:#tns__[tns()]
 +
@@ -61,7 +61,7 @@ Takes a normalized grid and strips out removes all members, leaving only the gri
 [#gridImplementation__]
 === gridImplementation()
 
-The concrete subclass of xref:system:generated:index/applib/layout/grid/Grid.adoc[Grid] supported by this implementation.
+The concrete subclass of xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] supported by this implementation.
 
 There can be multiple implementations of this service, this indicates the base class used by the implementation.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
index 46ed3c2..7433b9f 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridLoaderService_020-examples-and-usage.adoc
@@ -6,5 +6,5 @@
 
 Related services:
 
-* xref:system:generated:index/applib/services/grid/GridService.adoc[GridService]
-* xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[GridLoaderService]
+* xref:refguide:applib:index/services/grid/GridService.adoc[GridService]
+* xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_020-examples-and-usage.adoc
index b845506..8d174f5 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridService_020-examples-and-usage.adoc
@@ -12,14 +12,14 @@ Dynamic reloading is disabled in production mode.
 
 == See also
 
-This service is called by xref:system:generated:index/applib/services/layout/LayoutService.adoc[`LayoutService`], exposed in the UI through `LayoutServiceMenu` (to download the layout XML as a zip file for all domain objects) and the xref:applib-classes:roles-mixins-contributees/mixins.adoc#Object[`downloadLayoutXml()`] mixin (to download the layout XML for a single domain
+This service is called by xref:refguide:applib:index/services/layout/LayoutService.adoc[`LayoutService`], exposed in the UI through `LayoutServiceMenu` (to download the layout XML as a zip file for all domain objects) and the xref:applib-classes:roles-mixins-contributees/mixins.adoc#Object[`downloadLayoutXml()`] mixin (to download the layout XML for a single domain
 object).
 
 This service delegates to:
 
-* to xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[`GridLoaderService`] to load a pre-existing layout for the domain class, if possible
+* to xref:refguide:applib:index/services/grid/GridLoaderService.adoc[`GridLoaderService`] to load a pre-existing layout for the domain class, if possible
 
-* to xref:system:generated:index/applib/services/grid/GridSystemService.adoc[`GridSystemService`] to normalize the grid with respect to Apache Isis' internal metamodel, in other words to ensure that all of the domain objects' properties, collections and actions are associated with regions of the grid.
+* to xref:refguide:applib:index/services/grid/GridSystemService.adoc[`GridSystemService`] to normalize the grid with respect to Apache Isis' internal metamodel, in other words to ensure that all of the domain objects' properties, collections and actions are associated with regions of the grid.
 
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
index aff3623..44a98d2 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/grid/hooks/GridSystemService_020-examples-and-usage.adoc
@@ -11,4 +11,4 @@ This is therefore a highly specialized and very deep customisation of the framew
 
 == See also
 
-This service is used by xref:system:generated:index/applib/services/grid/GridService.adoc[`GridService`].
+This service is used by xref:refguide:applib:index/services/grid/GridService.adoc[`GridService`].
diff --git a/antora/components/refguide/modules/applib/pages/index/services/hint/HintStore.adoc b/antora/components/refguide/modules/applib/pages/index/services/hint/HintStore.adoc
index 8b330e6..1b0c8c0e6 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/hint/HintStore.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/hint/HintStore.adoc
@@ -51,7 +51,7 @@ The keys of all available hints for the domain object.
 
 Obtain a hint (eg which tab to open) for a particular object.
 
-Object identity is represented by xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] so that alternative implementations can easily serialize this state to a string.
+Object identity is represented by xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] so that alternative implementations can easily serialize this state to a string.
 
 [#set__Bookmark_String_String]
 === set(Bookmark, String, String)
diff --git a/antora/components/refguide/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc b/antora/components/refguide/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
index 22d431b..dd6f67b 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-This service simply provides access to the home page object (if any) annotated with xref:system:generated:index/applib/annotation/HomePage.adoc[HomePage] .
+This service simply provides access to the home page object (if any) annotated with xref:refguide:applib:index/annotation/HomePage.adoc[HomePage] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
index 6f4ec0b..d1c5f70 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/homepage/hooks/HomePageResolverService_020-examples-and-usage.adoc
@@ -4,4 +4,4 @@
 
 == Notes
 
-This service was originally introduced to support the default implementation of xref:system:generated:index/applib/services/routing/RoutingService.adoc[`RoutingService`], but was factored out to support alternative implementations of that service (and may be useful for other use cases).
+This service was originally introduced to support the default implementation of xref:refguide:applib:index/services/routing/RoutingService.adoc[`RoutingService`], but was factored out to support alternative implementations of that service (and may be useful for other use cases).
diff --git a/antora/components/refguide/modules/applib/pages/index/services/i18n/Mode.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/Mode.adoc
index 98e8e60..dfa4019 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/i18n/Mode.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/i18n/Mode.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Controls whether the xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] is enabled or disabled, and if enabled whether it is in write (learn) mode or read mode.
+Controls whether the xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] is enabled or disabled, and if enabled whether it is in write (learn) mode or read mode.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslatableString.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslatableString.adoc
index 2944f8b..435f028 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslatableString.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslatableString.adoc
@@ -50,7 +50,7 @@ The arguments; excluded from _#equals(Object)_ comparison.
 <.> xref:#translate__TranslationService_String[translate(TranslationService, String)]
 +
 --
-Translates this string using the provided xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] , selecting either the single or plural form as per _#getPattern()_ .
+Translates this string using the provided xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] , selecting either the single or plural form as per _#getPattern()_ .
 --
 <.> xref:#getPattern__[getPattern()]
 +
@@ -88,7 +88,7 @@ The arguments; excluded from _#equals(Object)_ comparison.
 [#translate__TranslationService_String]
 === translate(TranslationService, String)
 
-Translates this string using the provided xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] , selecting either the single or plural form as per _#getPattern()_ .
+Translates this string using the provided xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] , selecting either the single or plural form as per _#getPattern()_ .
 
 [#getPattern__]
 === getPattern()
diff --git a/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationsResolver.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationsResolver.adoc
index 52371dd..5f5672e 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationsResolver.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/i18n/TranslationsResolver.adoc
@@ -2,7 +2,7 @@
 
 Locates and return translations.
 
-This is one of the supporting services that work together to implement the framework's support for i18n, being used by the default implementation xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService] .
+This is one of the supporting services that work together to implement the framework's support for i18n, being used by the default implementation xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService] .
 
 == API
 
@@ -27,7 +27,7 @@ Reads the lines from the specified "logical" file name.
 
 Reads the lines from the specified "logical" file name.
 
-It is the responsibility of xref:system:generated:index/applib/services/i18n/TranslationsResolver.adoc[TranslationsResolver] to determine where the file actually resides (the data could be read from a database, for example, rather than an actual file.
+It is the responsibility of xref:refguide:applib:index/services/i18n/TranslationsResolver.adoc[TranslationsResolver] to determine where the file actually resides (the data could be read from a database, for example, rather than an actual file.
 
 include::hooks/TranslationsResolver_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
index 48f1226..a89eef5 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/LocaleProvider_020-examples-and-usage.adoc
@@ -11,9 +11,9 @@ For the "big picture" and further details on the framework's i18n support, can b
 
 Other i18n services include:
 
-* xref:system:generated:index/applib/services/i18n/TranslationService.adoc[`TranslationService`]
+* xref:refguide:applib:index/services/i18n/TranslationService.adoc[`TranslationService`]
 
-* xref:system:generated:index/applib/services/i18n/TranslationsResolver.adoc[`TranslationsResolver`]
+* xref:refguide:applib:index/services/i18n/TranslationsResolver.adoc[`TranslationsResolver`]
 
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
index 7520583..31da642 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationService_020-examples-and-usage.adoc
@@ -9,11 +9,11 @@ For the "big picture" and further details on the framework's support, see xref:u
 
 == Related Services
 
-* xref:system:generated:index/applib/services/i18n/Mode.adoc[Mode]
+* xref:refguide:applib:index/services/i18n/Mode.adoc[Mode]
 +
 enumerates the mode that the translation service is currently in, as per xref:TranslationService.adoc#getMode__[getMode()].
 
-* xref:system:generated:index/applib/services/i18n/LocaleProvider.adoc[`LocaleProvider`]
+* xref:refguide:applib:index/services/i18n/LocaleProvider.adoc[`LocaleProvider`]
 +
 Used by the default implementation (`TranslationServicePo`) to return the `Locale` of the current user.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
index b01258e..42bd7ba 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/i18n/hooks/TranslationsResolver_020-examples-and-usage.adoc
@@ -9,6 +9,6 @@ For the "big picture" and further details on Apache Isis' i18n support, see xref
 
 == See Also
 
-This service works in conjunction with xref:system:generated:index/applib/services/i18n/LocaleProvider.adoc[`LocaleProvider`] and xref:system:generated:index/applib/services/i18n/TranslationService.adoc[`TranslationService`] in order to provide i18n support.
+This service works in conjunction with xref:refguide:applib:index/services/i18n/LocaleProvider.adoc[`LocaleProvider`] and xref:refguide:applib:index/services/i18n/TranslationService.adoc[`TranslationService`] in order to provide i18n support.
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/Execution.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/Execution.adoc
index cc855ac..2918f61 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/Execution.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/Execution.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Represents an action invocation/property edit as a node in a call-stack execution graph, with sub-interactions being made by way of the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] ).
+Represents an action invocation/property edit as a node in a call-stack execution graph, with sub-interactions being made by way of the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] ).
 
-The xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] has a reference to a _Interaction#getCurrentExecution() top-level_ execution.
+The xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] has a reference to a _Interaction#getCurrentExecution() top-level_ execution.
 
 == API
 
@@ -29,7 +29,7 @@ class Execution<T, E> {
 <.> xref:#getChildren__[getChildren()]
 +
 --
-The actions/property edits made in turn via the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
+The actions/property edits made in turn via the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
 --
 <.> xref:#setEvent__E[setEvent(E)]
 +
@@ -67,7 +67,7 @@ The actions/property edits made in turn via the xref:system:generated:index/appl
 [#getChildren__]
 === getChildren()
 
-The actions/property edits made in turn via the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
+The actions/property edits made in turn via the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
 
 [#setEvent__E]
 === setEvent(E)
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/ExecutionContext.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/ExecutionContext.adoc
index 7db2412..e31589e 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/ExecutionContext.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/ExecutionContext.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Provides the user and scenario specific environment for an xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution]
+Provides the user and scenario specific environment for an xref:refguide:applib:index/services/iactn/Execution.adoc[Execution]
 
 == API
 
@@ -45,7 +45,7 @@ The (programmatically) simulated (or actual) clock.
 <.> xref:#ofUserWithSystemDefaults__UserMemento[ofUserWithSystemDefaults(UserMemento)]
 +
 --
-Creates a new xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] with the specified user and system defaults for clock, locale and time-zone.
+Creates a new xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] with the specified user and system defaults for clock, locale and time-zone.
 --
 
 == Members
@@ -63,4 +63,4 @@ The (programmatically) simulated (or actual) clock.
 [#ofUserWithSystemDefaults__UserMemento]
 === ofUserWithSystemDefaults(UserMemento)
 
-Creates a new xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] with the specified user and system defaults for clock, locale and time-zone.
+Creates a new xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] with the specified user and system defaults for clock, locale and time-zone.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/Interaction.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/Interaction.adoc
index caf8256..b4dca5a 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/Interaction.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/Interaction.adoc
@@ -2,11 +2,11 @@
 
 Represents an action invocation or property modification, resulting in some state change of the system. It captures not only the target object and arguments passed, but also builds up the call-graph, and captures metrics, eg for profiling.
 
-The `Interaction` can be used to obtain the xref:system:generated:index/applib/services/command/Command.adoc[Command] object representing the top-level invocation action/property edit.
+The `Interaction` can be used to obtain the xref:refguide:applib:index/services/command/Command.adoc[Command] object representing the top-level invocation action/property edit.
 
-The distinction between xref:system:generated:index/applib/services/command/Command.adoc[Command] and this object is perhaps subtle: the former represents the intention to invoke an action/edit a property, whereas this represents the actual invocation/edit itself.
+The distinction between xref:refguide:applib:index/services/command/Command.adoc[Command] and this object is perhaps subtle: the former represents the intention to invoke an action/edit a property, whereas this represents the actual invocation/edit itself.
 
-To confuse matters slightly, historically the xref:system:generated:index/applib/services/command/Command.adoc[Command] interface defines members (specifically: _Command#getStartedAt()_ , _Command#getCompletedAt()_ , _Command#getResult()_ , _Command#getException()_ ) which logically belong to this class instead; they remain in xref:system:generated:index/applib/services/command/Command.adoc[Command] for backward compatibility only (and have been deprecated).
+To confuse matters slightly, historically the xref:refguide:applib:index/services/command/Command.adoc[Command] interface defines members (specifically: _Command#getStartedAt()_ , _Command#getCompletedAt()_ , _Command#getResult()_ , _Command#getException()_ ) which logically belong to this class instead; they remain in xref:refguide:applib:index/services/command/Command.adoc[Command] for backward compatibility only (and have been deprecated).
 
 == API
 
@@ -25,7 +25,7 @@ interface Interaction {
 <.> xref:#getUniqueId__[getUniqueId()]
 +
 --
-The unique identifier of this interaction (inherited from xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] )
+The unique identifier of this interaction (inherited from xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId] )
 --
 <.> xref:#getCommand__[getCommand()]
 +
@@ -35,7 +35,7 @@ Represents the _intention_ to perform this interaction.
 <.> xref:#getCurrentExecution__[getCurrentExecution()]
 +
 --
-The current (most recently pushed) xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] .
+The current (most recently pushed) xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] .
 --
 <.> xref:#getPriorExecution__[getPriorExecution()]
 +
@@ -45,7 +45,7 @@ The execution that preceded the current one.
 <.> xref:#next__String[next(String)]
 +
 --
-Generates numbers in a named sequence. The name of the sequence can be arbitrary, though note that the framework also uses this capability to generate sequence numbers corresponding to the sequences enumerated by the xref:system:generated:index/applib/services/iactn/Sequence.adoc[Sequence] enum.
+Generates numbers in a named sequence. The name of the sequence can be arbitrary, though note that the framework also uses this capability to generate sequence numbers corresponding to the sequences enumerated by the xref:refguide:applib:index/services/iactn/Sequence.adoc[Sequence] enum.
 --
 
 == Members
@@ -53,7 +53,7 @@ Generates numbers in a named sequence. The name of the sequence can be arbitrary
 [#getUniqueId__]
 === getUniqueId()
 
-The unique identifier of this interaction (inherited from xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] )
+The unique identifier of this interaction (inherited from xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId] )
 
 This can be used to correlate audit records and transactions happening as a consequence or within the interaction.
 
@@ -65,7 +65,7 @@ Represents the _intention_ to perform this interaction.
 [#getCurrentExecution__]
 === getCurrentExecution()
 
-The current (most recently pushed) xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] .
+The current (most recently pushed) xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] .
 
 [#getPriorExecution__]
 === getPriorExecution()
@@ -75,7 +75,7 @@ The execution that preceded the current one.
 [#next__String]
 === next(String)
 
-Generates numbers in a named sequence. The name of the sequence can be arbitrary, though note that the framework also uses this capability to generate sequence numbers corresponding to the sequences enumerated by the xref:system:generated:index/applib/services/iactn/Sequence.adoc[Sequence] enum.
+Generates numbers in a named sequence. The name of the sequence can be arbitrary, though note that the framework also uses this capability to generate sequence numbers corresponding to the sequences enumerated by the xref:refguide:applib:index/services/iactn/Sequence.adoc[Sequence] enum.
 
 include::hooks/Interaction_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/InteractionContext.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/InteractionContext.adoc
index 2c3f61a..0b29d7e 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/InteractionContext.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/InteractionContext.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Provides the current thread's xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] .
+Provides the current thread's xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] .
 
-An xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] contains a top-level xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] representing the invocation of an action or the editing of a property. If that top-level action or property uses the _org.apache.isis.applib.services.wrapper.WrapperFactory_ domain service to invoke child actions/properties, then those sub-executions are captured as a call-graph. The xref:system:generated:index [...]
+An xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] contains a top-level xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] representing the invocation of an action or the editing of a property. If that top-level action or property uses the _org.apache.isis.applib.services.wrapper.WrapperFactory_ domain service to invoke child actions/properties, then those sub-executions are captured as a call-graph. The xref:refguide:applib:index/services/iactn/E [...]
 
 == API
 
@@ -18,7 +18,7 @@ interface InteractionContext {
 <.> xref:#currentInteraction__[currentInteraction()]
 +
 --
-Optionally, the currently active xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] for the calling thread.
+Optionally, the currently active xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] for the calling thread.
 --
 
 == Members
@@ -26,7 +26,7 @@ Optionally, the currently active xref:system:generated:index/applib/services/iac
 [#currentInteraction__]
 === currentInteraction()
 
-Optionally, the currently active xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] for the calling thread.
+Optionally, the currently active xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] for the calling thread.
 
 include::hooks/InteractionContext_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/Sequence.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/Sequence.adoc
index 42ecee2..f0deb9e 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/Sequence.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/Sequence.adoc
@@ -18,12 +18,12 @@ enum Sequence {
 <.> xref:#INTERACTION[INTERACTION]
 +
 --
-Each interaction is either an action invocation or a property edit. There could be multiple of these, typically as the result of a nested calls using the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] . Another reason is support for bulk action invocations within a single transaction.
+Each interaction is either an action invocation or a property edit. There could be multiple of these, typically as the result of a nested calls using the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] . Another reason is support for bulk action invocations within a single transaction.
 --
 <.> xref:#PUBLISHED_EVENT[PUBLISHED_EVENT]
 +
 --
-For objects: multiple such could be dirtied and thus published as separate events. For actions invocations/property edits : multiple sub-invocations could occur if sub-invocations are made through the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
+For objects: multiple such could be dirtied and thus published as separate events. For actions invocations/property edits : multiple sub-invocations could occur if sub-invocations are made through the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
 --
 <.> xref:#TRANSACTION[TRANSACTION]
 +
@@ -36,12 +36,12 @@ There may be multiple transactions within a given interaction.
 [#INTERACTION]
 === INTERACTION
 
-Each interaction is either an action invocation or a property edit. There could be multiple of these, typically as the result of a nested calls using the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] . Another reason is support for bulk action invocations within a single transaction.
+Each interaction is either an action invocation or a property edit. There could be multiple of these, typically as the result of a nested calls using the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] . Another reason is support for bulk action invocations within a single transaction.
 
 [#PUBLISHED_EVENT]
 === PUBLISHED_EVENT
 
-For objects: multiple such could be dirtied and thus published as separate events. For actions invocations/property edits : multiple sub-invocations could occur if sub-invocations are made through the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
+For objects: multiple such could be dirtied and thus published as separate events. For actions invocations/property edits : multiple sub-invocations could occur if sub-invocations are made through the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] .
 
 [#TRANSACTION]
 === TRANSACTION
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_020-examples-and-usage.adoc
index 9b69e56..1e7c4a5 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Execution_020-examples-and-usage.adoc
@@ -5,21 +5,21 @@
 
 == Usage Notes
 
-``Execution``s can be subscribed to using the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] interface.
+``Execution``s can be subscribed to using the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] interface.
 +
 One reason to subscribe is to persist these interaction/executions.
 This supports several use cases:
 
 ** they enable profiling of the running application (which actions are invoked then most often, what is their response time)
 
-** if auditing is configured (using xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[`EntityPropertyChangeSubscriber`]), they provide better audit information, since the parent xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction] captures the 'cause' of an interaction and can be correlated to the audit records (the "effect" of the interaction) by way of the xref:applib-classes:roles-mixins-contributees/contributee.a [...]
+** if auditing is configured (using xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[`EntityPropertyChangeSubscriber`]), they provide better audit information, since the parent xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] captures the 'cause' of an interaction and can be correlated to the audit records (the "effect" of the interaction) by way of the xref:applib-classes:roles-mixins-contributees/contributee.adoc#HasUniqueId[ [...]
 
 
 == See also
 
-* xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction]
+* xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction]
 
-* xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]
+* xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]
 
 
 // TODO: mention oubox publisher once ported over from incode-platform
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
index b88db51..7034236 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/InteractionContext_020-examples-and-usage.adoc
@@ -7,15 +7,15 @@
 == Usage Notes
 
 Typically domain objects will have little need to interact with the `InteractionContext` and `Interaction` directly.
-The services are used within the framework however, primarily to support the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI, and to emit domain events over the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`].
+The services are used within the framework however, primarily to support the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI, and to emit domain events over the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`].
 
 
 
 == See Also
 
-* xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction], as provided by the `InteractionContext`
+* xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction], as provided by the `InteractionContext`
 
-* xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution], as referenced by xref:system:generated:index/applib/services/iactn/Interaction.adoc[Interaction].
+* xref:refguide:applib:index/services/iactn/Execution.adoc[Execution], as referenced by xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction].
 
-* xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]
+* xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
index a1325c2..9ca2d87 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/iactn/hooks/Interaction_020-examples-and-usage.adoc
@@ -6,7 +6,7 @@
 == Usage Notes
 
 You could also think of this interface as somewhat analogous to a (database) transaction.
-However, the framework's xref:system:generated:index/applib/services/xactn/TransactionService.adoc[TransactionService] allows programmatic control of underlying database transactions, including the ability to commit one transaction and start a new one (using xref:system:generated:index/applib/services/xactn/TransactionService.adoc#nextTransaction[nextTransaction]).
+However, the framework's xref:refguide:applib:index/services/xactn/TransactionService.adoc[TransactionService] allows programmatic control of underlying database transactions, including the ability to commit one transaction and start a new one (using xref:refguide:applib:index/services/xactn/TransactionService.adoc#nextTransaction[nextTransaction]).
 The is therefore not an exact mapping between an `Interaction` and a (database) transaction, because the former could span multiple of the latter.
 
 
@@ -14,7 +14,7 @@ The is therefore not an exact mapping between an `Interaction` and a (database)
 
 == See Also
 
-* xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution]
+* xref:refguide:applib:index/services/iactn/Execution.adoc[Execution]
 
-* xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]
+* xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
index 6a7bbe7..1f3061b 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/inject/hooks/ServiceInjector_020-examples-and-usage.adoc
@@ -18,10 +18,10 @@ repositoryService.persist(cust);
 
 == Related Services
 
-* xref:system:generated:index/applib/services/registry/ServiceRegistry.adoc[`ServiceRegistry`]
+* xref:refguide:applib:index/services/registry/ServiceRegistry.adoc[`ServiceRegistry`]
 +
 to just lookup existing domain services by type.
 
-* xref:system:generated:index/applib/services/repository/RepositoryService.adoc#detachedEntity__T[RepositoryService#detachedEntity()]
+* xref:refguide:applib:index/services/repository/RepositoryService.adoc#detachedEntity__T[RepositoryService#detachedEntity()]
 
-* xref:system:generated:index/applib/services/factory/FactoryService.adoc#detachedEntity__T[FactoryService#detachedEntity()]
+* xref:refguide:applib:index/services/factory/FactoryService.adoc#detachedEntity__T[FactoryService#detachedEntity()]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
index d4e85f3..a7bb1f2 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/jaxb/hooks/JaxbService_020-examples-and-usage.adoc
@@ -14,4 +14,4 @@ The functionality to download XML and XSD schemas is also exposed in the UI thro
 
 == See also
 
-* xref:system:generated:index/applib/services/jaxb/IsisSchemas.adoc[IsisSchemas]
+* xref:refguide:applib:index/services/jaxb/IsisSchemas.adoc[IsisSchemas]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutService.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutService.adoc
index 0db7804..576b073 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutService.adoc
@@ -27,7 +27,7 @@ Obtains a zip file of the serialized XML of the layouts (grids) of all domain en
 <.> xref:#toMenuBarsXml__MenuBarsService.Type[toMenuBarsXml(MenuBarsService.Type)]
 +
 --
-Obtains the serialized XML form of the menu bars layout ( xref:system:generated:index/applib/services/menu/MenuBarsService.adoc[MenuBarsService] ).
+Obtains the serialized XML form of the menu bars layout ( xref:refguide:applib:index/services/menu/MenuBarsService.adoc[MenuBarsService] ).
 --
 
 == Members
@@ -45,7 +45,7 @@ Obtains a zip file of the serialized XML of the layouts (grids) of all domain en
 [#toMenuBarsXml__MenuBarsService.Type]
 === toMenuBarsXml(MenuBarsService.Type)
 
-Obtains the serialized XML form of the menu bars layout ( xref:system:generated:index/applib/services/menu/MenuBarsService.adoc[MenuBarsService] ).
+Obtains the serialized XML form of the menu bars layout ( xref:refguide:applib:index/services/menu/MenuBarsService.adoc[MenuBarsService] ).
 
 include::hooks/LayoutService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
index a9f71de..1b7d932 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Simply provides a UI to allow layouts (obtained from xref:system:generated:index/applib/services/layout/LayoutService.adoc[LayoutService] to be downloaded within the UI.
+Simply provides a UI to allow layouts (obtained from xref:refguide:applib:index/services/layout/LayoutService.adoc[LayoutService] to be downloaded within the UI.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/layout/Style.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/Style.adoc
index acb14d8..f6e2c0d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/layout/Style.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/layout/Style.adoc
@@ -61,7 +61,7 @@ The intention here is that any layout metadata annotations can be removed from t
 
 Default, whereby missing properties/collections/actions are added to regions, and unused/empty regions are removed/trimmed.
 
-It should be possible to remove any xref:system:generated:index/applib/annotation/MemberOrder.adoc[MemberOrder] annotation but any property/collection/action layout annotations would need to be retained.
+It should be possible to remove any xref:refguide:applib:index/annotation/MemberOrder.adoc[MemberOrder] annotation but any property/collection/action layout annotations would need to be retained.
 
 * _@MemberGroupLayout_ : *serialized as XML*
 * _@MemberOrder_ : *serialized as XML*
diff --git a/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
index 2a69910..69f18e0 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
@@ -4,5 +4,5 @@
 
 == See also
 
-* xref:system:generated:index/applib/services/layout/LayoutService.adoc[LayoutService]
-* xref:system:generated:index/applib/services/layout/Style.adoc[Style]
+* xref:refguide:applib:index/services/layout/LayoutService.adoc[LayoutService]
+* xref:refguide:applib:index/services/layout/Style.adoc[Style]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
index d7944b6..84ae23d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
@@ -15,7 +15,7 @@ The XML can then be copied into the codebase of the application, and annotations
 
 === Styles
 
-Each of these actions take as a parameter an instance of xref:system:generated:index/applib/services/layout/Style.adoc[Style].
+Each of these actions take as a parameter an instance of xref:refguide:applib:index/services/layout/Style.adoc[Style].
 
 The `CURRENT` style corresponds to the layout already loaded for the domain class, typically from an already persisted `layout.xml` file.
 The other three styles allow the developer to choose how much metadata is to be specified in the XML, and how much (if any) will be obtained elsewhere, typically from annotations in the metamodel.
@@ -26,8 +26,8 @@ The table below summarises the choices:
 |===
 
 | Style
-| 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`]
+| xref:refguide:applib:index/annotation/MemberOrder.adoc[`@MemberOrder`]
+| xref:refguide:applib:index/annotation/ActionLayout.adoc[`@ActionLayout`], xref:refguide:applib:index/annotation/PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`]
 
 
 |`COMPLETE`
@@ -68,11 +68,11 @@ The grid regions will be empty in this version, and the framework will use the `
 
 == See also
 
-The functionality of `LayoutService` is surfaced in the user interface through a related xref:system:generated:index/applib/services/layout/LayoutService.adoc#related-mixins-and-menus[mixin and menu action].
-See also xref:system:generated:index/applib/services/layout/Style.adoc[Style], which determines how much data is included in the downloaded XML.
+The functionality of `LayoutService` is surfaced in the user interface through a related xref:refguide:applib:index/services/layout/LayoutService.adoc#related-mixins-and-menus[mixin and menu action].
+See also xref:refguide:applib:index/services/layout/Style.adoc[Style], which determines how much data is included in the downloaded XML.
 
-The xref:system:generated:index/applib/services/grid/GridService.adoc[`GridService`] is responsible for loading and normalizing layout XML for a domain class.
-It in turn uses the xref:system:generated:index/applib/services/grid/GridLoaderService.adoc[`GridLoaderService`] and  xref:system:generated:index/applib/services/grid/GridSystemService.adoc[`GridSystemService`]
+The xref:refguide:applib:index/services/grid/GridService.adoc[`GridService`] is responsible for loading and normalizing layout XML for a domain class.
+It in turn uses the xref:refguide:applib:index/services/grid/GridLoaderService.adoc[`GridLoaderService`] and  xref:refguide:applib:index/services/grid/GridSystemService.adoc[`GridSystemService`]
 services.
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_010-implementation.adoc
index 568dbfc..44ed799 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_010-implementation.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_010-implementation.adoc
@@ -8,6 +8,6 @@
 The xref:vw:ROOT:about.adoc[Wicket viewer] provides an implementation of this service `o.a.i.viewer.wicket.viewer.services.DeepLinkServiceWicket`.
 
 There is no domain service to support deep links to the URLs of the xref:vro:ROOT:about.adoc[RestfulObjects viewer].
-However, a URL can be constructed easily enough according to the link:http://www.restfulobjects.org[Restful Objects spec] in conjunction with a `Bookmark` obtained via the xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`].
+However, a URL can be constructed easily enough according to the link:http://www.restfulobjects.org[Restful Objects spec] in conjunction with a `Bookmark` obtained via the xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`].
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
index 4febc6f..9600cb7 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/linking/hooks/DeepLinkService_020-examples-and-usage.adoc
@@ -4,7 +4,7 @@
 
 == Usage within the framework
 
-The xref:system:generated:index/applib/services/userreg/EmailNotificationService.adoc[`EmailNotificationService`] uses this service in order to generate emails as part of xref:vw:ROOT:features.adoc#user-registration[user registration].
+The xref:refguide:applib:index/services/userreg/EmailNotificationService.adoc[`EmailNotificationService`] uses this service in order to generate emails as part of xref:vw:ROOT:features.adoc#user-registration[user registration].
 
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
index 69934c6..04f8a28 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
@@ -1,10 +1,10 @@
 :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 [...]
 
-Returns the xref:system:generated:index/applib/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] instance (bootstrap3-specific subtype of _org.apache.isis.applib.layout.menubars.MenuBars_ , for the UI.
+Returns the xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] instance (bootstrap3-specific subtype of _org.apache.isis.applib.layout.menubars.MenuBars_ , for the UI.
 
 The default implementation deserializes the `menubars.layout.xml` file read from the classpath.
 
-The service is _called_ by the default implementation of xref:system:generated:index/applib/services/menu/MenuBarsService.adoc[MenuBarsService] .
+The service is _called_ by the default implementation of xref:refguide:applib:index/services/menu/MenuBarsService.adoc[MenuBarsService] .
 
 == API
 
@@ -25,7 +25,7 @@ Whether dynamic reloading of layouts is enabled.
 <.> xref:#menuBars__[menuBars()]
 +
 --
-Returns a new instance of a xref:system:generated:index/applib/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] if possible, else `null` .
+Returns a new instance of a xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] if possible, else `null` .
 --
 
 == Members
@@ -35,12 +35,12 @@ Returns a new instance of a xref:system:generated:index/applib/layout/menubars/b
 
 Whether dynamic reloading of layouts is enabled.
 
-If not, then the calling xref:system:generated:index/applib/services/menu/MenuBarsService.adoc[MenuBarsService] will cache the layout once loaded.
+If not, then the calling xref:refguide:applib:index/services/menu/MenuBarsService.adoc[MenuBarsService] will cache the layout once loaded.
 
 [#menuBars__]
 === menuBars()
 
-Returns a new instance of a xref:system:generated:index/applib/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] if possible, else `null` .
+Returns a new instance of a xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] if possible, else `null` .
 
 include::hooks/MenuBarsLoaderService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsService.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsService.adoc
index b461bd1..5a04647 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/menu/MenuBarsService.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Responsible for returning a xref:system:generated:index/applib/services/menu/MenuBarsService.adoc[MenuBarsService] instance, a data structure representing the arrangement of domain service actions across multiple menu bars, menus and sections.
+Responsible for returning a xref:refguide:applib:index/services/menu/MenuBarsService.adoc[MenuBarsService] instance, a data structure representing the arrangement of domain service actions across multiple menu bars, menus and sections.
 
 This is used by the Wicket viewer to build up the menu. It is also served as the "menuBars" resource by the Restful Objects viewer.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
index 1669fa1..b2056b6 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsLoaderService_020-examples-and-usage.adoc
@@ -4,4 +4,4 @@
 
 == See also
 
-* xref:system:generated:index/applib/services/menu/MenuBarsService.adoc[MenuBarsService]
+* xref:refguide:applib:index/services/menu/MenuBarsService.adoc[MenuBarsService]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_010-implementation.adoc
index cb9cbfc..8c8e0ca 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_010-implementation.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_010-implementation.adoc
@@ -7,4 +7,4 @@
 
 The framework provides a default implementation of this service, namely `o.a.i.core.runtimeservices.menu.MenuBarsServiceDefault`.
 
-This uses the xref:system:generated:index/applib/services/menu/MenuBarsLoaderService.adoc[MenuBarsLoaderService] to load a serialized form of `MenuBars` instance, called `menubars.layout.xml`, from the classpath.
+This uses the xref:refguide:applib:index/services/menu/MenuBarsLoaderService.adoc[MenuBarsLoaderService] to load a serialized form of `MenuBars` instance, called `menubars.layout.xml`, from the classpath.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
index ef2cde1..c15ce41 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/menu/hooks/MenuBarsService_020-examples-and-usage.adoc
@@ -4,4 +4,4 @@
 
 == See also
 
-* xref:system:generated:index/applib/services/menu/MenuBarsLoaderService.adoc[MenuBarsLoaderService]
+* xref:refguide:applib:index/services/menu/MenuBarsLoaderService.adoc[MenuBarsLoaderService]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_020-examples-and-usage.adoc
index 2f43e24..422caad 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/message/hooks/MessageService_020-examples-and-usage.adoc
@@ -32,6 +32,6 @@ For the "big picture" and further details on the framework's i18n support, can b
 
 == See also
 
-* xref:system:generated:index/applib/services/i18n/LocaleProvider.adoc[LocaleProvider]
-* xref:system:generated:index/applib/services/i18n/TranslationService.adoc[TranslationService]
+* xref:refguide:applib:index/services/i18n/LocaleProvider.adoc[LocaleProvider]
+* xref:refguide:applib:index/services/i18n/TranslationService.adoc[TranslationService]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelService.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
index 410912b..74d0bc4 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
@@ -47,12 +47,12 @@ What sort of object the domain type represents.
 <.> xref:#sortOf__Bookmark_Mode[sortOf(Bookmark, Mode)]
 +
 --
-Override of _#sortOf(Class, Mode)_ , extracting the domain type from the provided xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] of a domain object instance.
+Override of _#sortOf(Class, Mode)_ , extracting the domain type from the provided xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] of a domain object instance.
 --
 <.> xref:#commandDtoProcessorFor__String[commandDtoProcessorFor(String)]
 +
 --
-Obtains the implementation of xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] (if any) as per _Action#commandDtoProcessor()_ or _Property#commandDtoProcessor()_ .
+Obtains the implementation of xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] (if any) as per _Action#commandDtoProcessor()_ or _Property#commandDtoProcessor()_ .
 --
 <.> xref:#exportMetaModel__Config[exportMetaModel(Config)]
 +
@@ -82,7 +82,7 @@ Invalidates and rebuilds the internal metadata for the specified domain type.
 
 Returns a list of representations of each of member of each domain class.
 
-Used by xref:system:generated:index/applib/services/metamodel/MetaModelServiceMenu.adoc[MetaModelServiceMenu] to return a downloadable CSV.
+Used by xref:refguide:applib:index/services/metamodel/MetaModelServiceMenu.adoc[MetaModelServiceMenu] to return a downloadable CSV.
 
 Note that _MetaModelService#exportMetaModel(Config)_ provides a superset of the functionality provided by this method.
 
@@ -94,12 +94,12 @@ What sort of object the domain type represents.
 [#sortOf__Bookmark_Mode]
 === sortOf(Bookmark, Mode)
 
-Override of _#sortOf(Class, Mode)_ , extracting the domain type from the provided xref:system:generated:index/applib/services/bookmark/Bookmark.adoc[Bookmark] of a domain object instance.
+Override of _#sortOf(Class, Mode)_ , extracting the domain type from the provided xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] of a domain object instance.
 
 [#commandDtoProcessorFor__String]
 === commandDtoProcessorFor(String)
 
-Obtains the implementation of xref:system:generated:index/applib/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] (if any) as per _Action#commandDtoProcessor()_ or _Property#commandDtoProcessor()_ .
+Obtains the implementation of xref:refguide:applib:index/services/commanddto/processor/CommandDtoProcessor.adoc[CommandDtoProcessor] (if any) as per _Action#commandDtoProcessor()_ or _Property#commandDtoProcessor()_ .
 
 This is used by framework-provided implementations of _org.apache.isis.applib.services.conmap.ContentMappingService_ .
 
@@ -108,7 +108,7 @@ This is used by framework-provided implementations of _org.apache.isis.applib.se
 
 Exports the entire metamodel as a DTO, serializable into XML using JAXB.
 
-The xref:system:generated:index/applib/services/metamodel/Config.adoc[Config] parameter can be used to restrict/filter the export to some subset of the metamodel; in particular to specific _Config#getPackagePrefixes() package prefixes_ .
+The xref:refguide:applib:index/services/metamodel/Config.adoc[Config] parameter can be used to restrict/filter the export to some subset of the metamodel; in particular to specific _Config#getPackagePrefixes() package prefixes_ .
 
 include::hooks/MetaModelService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
index 9d02474..350083e 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Provides a UI to allow domain model metadata (obtained from xref:system:generated:index/applib/services/metamodel/MetaModelService.adoc[MetaModelService] to be downloaded within the UI.
+Provides a UI to allow domain model metadata (obtained from xref:refguide:applib:index/services/metamodel/MetaModelService.adoc[MetaModelService] to be downloaded within the UI.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
index 638050f..502fe63 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/metamodel/hooks/MetaModelService_020-examples-and-usage.adoc
@@ -4,11 +4,11 @@
 
 == See also
 
-* xref:system:generated:index/applib/services/metamodel/MetaModelServiceMenu.adoc[MetaModelServiceMenu]
+* xref:refguide:applib:index/services/metamodel/MetaModelServiceMenu.adoc[MetaModelServiceMenu]
 +
-exposes xref:system:generated:index/applib/services/metamodel/MetaModelService.adoc#exportMetaModel__Config[exportMetaModel] as an action in the user interface.
+exposes xref:refguide:applib:index/services/metamodel/MetaModelService.adoc#exportMetaModel__Config[exportMetaModel] as an action in the user interface.
 
-* xref:system:generated:index/applib/services/metamodel/BeanSort.adoc[BeanSort]
-* xref:system:generated:index/applib/services/metamodel/DomainMember.adoc[DomainMember]
-* xref:system:generated:index/applib/services/metamodel/DomainModel.adoc[DomainModel]
-* xref:system:generated:index/applib/services/metamodel/Config.adoc[Config]
+* xref:refguide:applib:index/services/metamodel/BeanSort.adoc[BeanSort]
+* xref:refguide:applib:index/services/metamodel/DomainMember.adoc[DomainMember]
+* xref:refguide:applib:index/services/metamodel/DomainModel.adoc[DomainModel]
+* xref:refguide:applib:index/services/metamodel/Config.adoc[Config]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
index 029277f..a5468fc 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/metrics/hooks/MetricsService_020-examples-and-usage.adoc
@@ -6,7 +6,7 @@
 == Related Services
 
 
-* xref:system:generated:index/applib/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber]
+* xref:refguide:applib:index/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber]
 +
-provides a mechanism to access these same metrics (as xref:system:generated:index/applib/services/publishing/spi/EntityChanges.adoc[EntityChanges]) through a subscriber SPI.
+provides a mechanism to access these same metrics (as xref:refguide:applib:index/services/publishing/spi/EntityChanges.adoc[EntityChanges]) through a subscriber SPI.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/CommandSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/CommandSubscriber.adoc
index cd7176a..f4b78fb 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/CommandSubscriber.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/CommandSubscriber.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Part of the _Publishing SPI_ . A component to receive xref:system:generated:index/applib/services/command/Command.adoc[Command] s (with publishing enabled) that just completed.
+Part of the _Publishing SPI_ . A component to receive xref:refguide:applib:index/services/command/Command.adoc[Command] s (with publishing enabled) that just completed.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChanges.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChanges.adoc
index 42d4491..90de92d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChanges.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChanges.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-As used by xref:system:generated:index/applib/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber] , provides metrics on the "footprint" of an interaction, in other words the number of objects accessed or changed.
+As used by xref:refguide:applib:index/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber] , provides metrics on the "footprint" of an interaction, in other words the number of objects accessed or changed.
 
 The numbers of objects loaded, created, updated or deleted and the number of object properties modified (in other words the "size" or "weight" of the transaction).
 
@@ -25,12 +25,12 @@ interface EntityChanges {
 <.> xref:#getUniqueId__[getUniqueId()]
 +
 --
-inherited from xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] , correlates back to the unique identifier of the transaction in which these objects were changed.
+inherited from xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId] , correlates back to the unique identifier of the transaction in which these objects were changed.
 --
 <.> xref:#getUsername__[getUsername()]
 +
 --
-Inherited from xref:system:generated:index/commons/having/HasUsername.adoc[HasUsername] , is the user that initiated the transaction causing these objects to change.
+Inherited from xref:refguide:commons:index//having/HasUsername.adoc[HasUsername] , is the user that initiated the transaction causing these objects to change.
 --
 <.> xref:#getCompletedAt__[getCompletedAt()]
 +
@@ -73,12 +73,12 @@ Same details, but as an an instance of _ChangesDto_ .
 [#getUniqueId__]
 === getUniqueId()
 
-inherited from xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] , correlates back to the unique identifier of the transaction in which these objects were changed.
+inherited from xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId] , correlates back to the unique identifier of the transaction in which these objects were changed.
 
 [#getUsername__]
 === getUsername()
 
-Inherited from xref:system:generated:index/commons/having/HasUsername.adoc[HasUsername] , is the user that initiated the transaction causing these objects to change.
+Inherited from xref:refguide:commons:index//having/HasUsername.adoc[HasUsername] , is the user that initiated the transaction causing these objects to change.
 
 [#getCompletedAt__]
 === getCompletedAt()
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChangesSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChangesSubscriber.adoc
index 66a5197..44ca41d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChangesSubscriber.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityChangesSubscriber.adoc
@@ -19,7 +19,7 @@ interface EntityChangesSubscriber {
 <.> xref:#onChanging__EntityChanges[onChanging(EntityChanges)]
 +
 --
-Receives all changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:system:generated:index/applib/services/publishing/spi/EntityChanges.adoc[EntityChanges] .
+Receives all changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:refguide:applib:index/services/publishing/spi/EntityChanges.adoc[EntityChanges] .
 --
 
 == Members
@@ -27,7 +27,7 @@ Receives all changing entities (with publishing enabled using _DomainObject#enti
 [#onChanging__EntityChanges]
 === onChanging(EntityChanges)
 
-Receives all changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:system:generated:index/applib/services/publishing/spi/EntityChanges.adoc[EntityChanges] .
+Receives all changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:refguide:applib:index/services/publishing/spi/EntityChanges.adoc[EntityChanges] .
 
 The callback is called at the end of the transaction, during the pre-commit phase.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChange.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChange.adoc
index eab86ec..51bc754 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChange.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChange.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Immutable data record for xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] s.
+Immutable data record for xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] s.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc
index cffb4d0..b3f4010 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc
@@ -17,7 +17,7 @@ interface EntityPropertyChangeSubscriber {
 <.> xref:#onChanging__EntityPropertyChange[onChanging(EntityPropertyChange)]
 +
 --
-Receives a single property change event for changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange] .
+Receives a single property change event for changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:refguide:applib:index/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange] .
 --
 
 == Members
@@ -25,7 +25,7 @@ Receives a single property change event for changing entities (with publishing e
 [#onChanging__EntityPropertyChange]
 === onChanging(EntityPropertyChange)
 
-Receives a single property change event for changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange] .
+Receives a single property change event for changing entities (with publishing enabled using _DomainObject#entityChangePublishing()_ ) as an instance of xref:refguide:applib:index/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange] .
 
 The callback is called (multiple times) at the end of the transaction, during the pre-commit phase.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/ExecutionSubscriber.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/ExecutionSubscriber.adoc
index 87b4bde..9ccb047 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/ExecutionSubscriber.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/ExecutionSubscriber.adoc
@@ -19,7 +19,7 @@ interface ExecutionSubscriber {
 <.> xref:#onExecution__Execution[onExecution(Execution)]
 +
 --
-Callback to notify that an interaction (an action invocation or property edit, as represented by xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] ) has completed.
+Callback to notify that an interaction (an action invocation or property edit, as represented by xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] ) has completed.
 --
 
 == Members
@@ -27,7 +27,7 @@ Callback to notify that an interaction (an action invocation or property edit, a
 [#onExecution__Execution]
 === onExecution(Execution)
 
-Callback to notify that an interaction (an action invocation or property edit, as represented by xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] ) has completed.
+Callback to notify that an interaction (an action invocation or property edit, as represented by xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] ) has completed.
 
 This callback method is called by the framework immediately after the interaction (not at the end of the transaction, unlike some of the other subscribers).
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
index 0b7e8cd..3f5bd3f 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityChangesSubscriber_020-examples-and-usage.adoc
@@ -4,4 +4,4 @@
 
 == See Also
 
-* xref:system:generated:index/applib/services/publishing/spi/EntityChanges.adoc[EntityChanges]
+* xref:refguide:applib:index/services/publishing/spi/EntityChanges.adoc[EntityChanges]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
index 9cf2be7..90e70ce 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/EntityPropertyChangeSubscriber_020-examples-and-usage.adoc
@@ -4,4 +4,4 @@
 
 == See also
 
-* xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange]
+* xref:refguide:applib:index/services/publishing/spi/EntityPropertyChange.adoc[EntityPropertyChange]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
index 942ebd7..2ddfdea 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/publishing/spi/hooks/ExecutionSubscriber_020-examples-and-usage.adoc
@@ -4,7 +4,7 @@
 
 == Wrapper Factory
 
-If the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] is used to call other objects then the metrics are captured for each sub-execution.
+If the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] is used to call other objects then the metrics are captured for each sub-execution.
 
 
 
@@ -15,21 +15,21 @@ If the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[W
 
 See also:
 
-* the xref:system:generated:index/applib/services/iactn/InteractionContext.adoc[`InteractionContext`] is used to obtain the `Interaction` from which the member executions are published.
+* the xref:refguide:applib:index/services/iactn/InteractionContext.adoc[`InteractionContext`] is used to obtain the `Interaction` from which the member executions are published.
 
-* the xref:system:generated:index/applib/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber] is used to obtain the set of objects modified within the interaction
+* the xref:refguide:applib:index/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber] is used to obtain the set of objects modified within the interaction
 
-* the xref:system:generated:index/applib/services/metrics/MetricsService.adoc[`MetricsService`] is used to obtain the objects that are loaded throughout the transaction; this info is used in order to instantiate the xref:system:generated:index/applib/services/publishing/spi/EntityChanges.adoc[EntityChanges] object passed through to the xref:system:generated:index/applib/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber].
+* the xref:refguide:applib:index/services/metrics/MetricsService.adoc[`MetricsService`] is used to obtain the objects that are loaded throughout the transaction; this info is used in order to instantiate the xref:refguide:applib:index/services/publishing/spi/EntityChanges.adoc[EntityChanges] object passed through to the xref:refguide:applib:index/services/publishing/spi/EntityChangesSubscriber.adoc[EntityChangesSubscriber].
 
-* The services provided by this module combine very well with the xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] and with xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber].
+* The services provided by this module combine very well with the xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] and with xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber].
 +
-The xref:system:generated:index/applib/services/command/Command.adoc[Command]  captures the __cause__ of an interaction (an action was invoked, a property was edited), while the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] captures the __effect__ of that interaction in terms of events, while the xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] captures [...]
+The xref:refguide:applib:index/services/command/Command.adoc[Command]  captures the __cause__ of an interaction (an action was invoked, a property was edited), while the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] captures the __effect__ of that interaction in terms of events, while the xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] captures the effect of the inter [...]
 
-All of these services collaborate implicitly by way of the xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] interface.
+All of these services collaborate implicitly by way of the xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId] interface.
 
 In contrast:
 
-* The xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[EventBusService] differs from the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] in that the former is intended for fine-grained publish/subscribe for object-to-object interactions _within_ an Apache Isis domain object model.
+* The xref:refguide:applib:index/services/eventbus/EventBusService.adoc[EventBusService] differs from the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] in that the former is intended for fine-grained publish/subscribe for object-to-object interactions _within_ an Apache Isis domain object model.
 +
 The event propagation is strictly in-memory, and there are no restrictions on the object acting as the event; it need not be serializable, for example.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCacheControl.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCacheControl.adoc
index 3004956..230cd0a 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCacheControl.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/QueryResultsCacheControl.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Used to enable or disable caching by xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] .
+Used to enable or disable caching by xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] .
 
-This mechanism was introduced to allow fixtures module to be able to disable the xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] while fixtures are being installed.
+This mechanism was introduced to allow fixtures module to be able to disable the xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] while fixtures are being installed.
 
 == API
 
@@ -17,7 +17,7 @@ interface QueryResultsCacheControl {
 <.> xref:#isIgnoreCache__[isIgnoreCache()]
 +
 --
-Whether the xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] should be disabled, in other words to stop using any cached results.
+Whether the xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] should be disabled, in other words to stop using any cached results.
 --
 
 == Members
@@ -25,7 +25,7 @@ Whether the xref:system:generated:index/applib/services/queryresultscache/QueryR
 [#isIgnoreCache__]
 === isIgnoreCache()
 
-Whether the xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] should be disabled, in other words to stop using any cached results.
+Whether the xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[QueryResultsCache] should be disabled, in other words to stop using any cached results.
 
 include::hooks/QueryResultsCacheControl_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
index 625c811..b55079c 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/queryresultscache/hooks/QueryResultsCache_020-examples-and-usage.adoc
@@ -52,4 +52,4 @@ If however every order is for a different product, then no benefit will be gaine
 
 == Related Services
 
-The xref:system:generated:index/applib/services/scratchpad/Scratchpad.adoc[Scratchpad] service is also intended for actions that are called many times, allowing arbitrary information to be shared between them.
+The xref:refguide:applib:index/services/scratchpad/Scratchpad.adoc[Scratchpad] service is also intended for actions that are called many times, allowing arbitrary information to be shared between them.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/registry/ServiceRegistry.adoc b/antora/components/refguide/modules/applib/pages/index/services/registry/ServiceRegistry.adoc
index 26608d6..fab0ad9 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/registry/ServiceRegistry.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/registry/ServiceRegistry.adoc
@@ -24,12 +24,12 @@ interface ServiceRegistry {
 <.> xref:#select__Class_Annotation[][select(Class, Annotation[])]
 +
 --
-Obtains a xref:system:generated:index/commons/collections/Can.adoc[Can] container containing any matching instances for the given required type and additional required qualifiers.
+Obtains a xref:refguide:commons:index//collections/Can.adoc[Can] container containing any matching instances for the given required type and additional required qualifiers.
 --
 <.> xref:#select__Class[select(Class)]
 +
 --
-Obtains a xref:system:generated:index/commons/collections/Can.adoc[Can] container containing any matching instances for the given required type.
+Obtains a xref:refguide:commons:index//collections/Can.adoc[Can] container containing any matching instances for the given required type.
 --
 <.> xref:#streamRegisteredBeansOfType__Class[streamRegisteredBeansOfType(Class)]
 +
@@ -72,12 +72,12 @@ Looks up a domain service of the requested type (same as _#lookupService(Class)_
 [#select__Class_Annotation[]]
 === select(Class, Annotation[])
 
-Obtains a xref:system:generated:index/commons/collections/Can.adoc[Can] container containing any matching instances for the given required type and additional required qualifiers.
+Obtains a xref:refguide:commons:index//collections/Can.adoc[Can] container containing any matching instances for the given required type and additional required qualifiers.
 
 [#select__Class]
 === select(Class)
 
-Obtains a xref:system:generated:index/commons/collections/Can.adoc[Can] container containing any matching instances for the given required type.
+Obtains a xref:refguide:commons:index//collections/Can.adoc[Can] container containing any matching instances for the given required type.
 
 [#streamRegisteredBeansOfType__Class]
 === streamRegisteredBeansOfType(Class)
diff --git a/antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
index 257e714..f7a434b 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/registry/hooks/ServiceRegistry_020-examples-and-usage.adoc
@@ -24,15 +24,15 @@ MyService myService = serviceRegistry.lookupServiceElseFail(MyService.class);
 
 == Related Services
 
-* xref:system:generated:index/applib/services/inject/ServiceInjector.adoc[ServiceInjector]
+* xref:refguide:applib:index/services/inject/ServiceInjector.adoc[ServiceInjector]
 +
 to inject domain services rather than just look them up.
 
-* xref:system:generated:index/applib/services/factory/FactoryService.adoc[FactoryService]
+* xref:refguide:applib:index/services/factory/FactoryService.adoc[FactoryService]
 +
 also provides a method that will inject domain services
 
-* xref:system:generated:index/applib/services/repository/RepositoryService.adoc[RepositoryService].
+* xref:refguide:applib:index/services/repository/RepositoryService.adoc[RepositoryService].
 +
 also provides a method that will inject domain services
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/repository/RepositoryService.adoc b/antora/components/refguide/modules/applib/pages/index/services/repository/RepositoryService.adoc
index 6f45d26..ef45654 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/repository/RepositoryService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/repository/RepositoryService.adoc
@@ -2,7 +2,7 @@
 
 Collects together methods for creating, persisting and searching for entities from the underlying persistence store.
 
-Typically it's good practice to define a domain-specific service (eg `CustomerRepository` ) which then delegates to this service. This domain-specific service can use some xref:system:generated:index/applib/services/repository/RepositoryService.adoc[RepositoryService] 's "naive" methods that use client-side predicates for filtering; these can then be replaced by more sophisticated implementations that use proper server-side filtering later on without impacting the rest of the application.
+Typically it's good practice to define a domain-specific service (eg `CustomerRepository` ) which then delegates to this service. This domain-specific service can use some xref:refguide:applib:index/services/repository/RepositoryService.adoc[RepositoryService] 's "naive" methods that use client-side predicates for filtering; these can then be replaced by more sophisticated implementations that use proper server-side filtering later on without impacting the rest of the application.
 
 == API
 
@@ -38,7 +38,7 @@ interface RepositoryService {
 <.> xref:#getEntityState__Object[getEntityState(Object)]
 +
 --
-Returns the xref:system:generated:index/applib/services/repository/EntityState.adoc[EntityState] of given _object_ .
+Returns the xref:refguide:applib:index/services/repository/EntityState.adoc[EntityState] of given _object_ .
 --
 <.> xref:#detachedEntity__T[detachedEntity(T)]
 +
@@ -93,7 +93,7 @@ Overload of _#allMatches(Class, Predicate)_ , returns a _page_ of persisted inst
 <.> xref:#allMatches__Query[allMatches(Query)]
 +
 --
-Returns all the instances that match the given xref:system:generated:index/applib/query/Query.adoc[Query] .
+Returns all the instances that match the given xref:refguide:applib:index/query/Query.adoc[Query] .
 --
 <.> xref:#uniqueMatch__Class_Predicate[uniqueMatch(Class, Predicate)]
 +
@@ -103,7 +103,7 @@ Finds the only instance of the specified type (including subtypes) that satifies
 <.> xref:#uniqueMatch__Query[uniqueMatch(Query)]
 +
 --
-Find the only instance that matches the provided xref:system:generated:index/applib/query/Query.adoc[Query] .
+Find the only instance that matches the provided xref:refguide:applib:index/query/Query.adoc[Query] .
 --
 <.> xref:#firstMatch__Class_Predicate[firstMatch(Class, Predicate)]
 +
@@ -113,7 +113,7 @@ Find the only instance of the specified type (including subtypes) that satifies
 <.> xref:#firstMatch__Query[firstMatch(Query)]
 +
 --
-Find the only instance that matches the provided xref:system:generated:index/applib/query/Query.adoc[Query] , if any.
+Find the only instance that matches the provided xref:refguide:applib:index/query/Query.adoc[Query] , if any.
 --
 <.> xref:#refresh__T[refresh(T)]
 +
@@ -179,7 +179,7 @@ Determines if the specified object has been deleted from the object store.
 [#getEntityState__Object]
 === getEntityState(Object)
 
-Returns the xref:system:generated:index/applib/services/repository/EntityState.adoc[EntityState] of given _object_ .
+Returns the xref:refguide:applib:index/services/repository/EntityState.adoc[EntityState] of given _object_ .
 
 [#detachedEntity__T]
 === detachedEntity(T)
@@ -262,7 +262,7 @@ If the optional range parameters are used, the dataset returned starts from (0 b
 [#allMatches__Query]
 === allMatches(Query)
 
-Returns all the instances that match the given xref:system:generated:index/applib/query/Query.adoc[Query] .
+Returns all the instances that match the given xref:refguide:applib:index/query/Query.adoc[Query] .
 
 This is the main API for server-side (performant) queries returning multiple instances, where a _org.apache.isis.applib.query.NamedQuery_ can be passed in that ultimately describes a SELECT query with WHERE predicates. The mechanism by which this is defined depends on the ORM (JDO or JPA). A _org.apache.isis.applib.query.NamedQuery_ can optionally specify a _org.apache.isis.applib.query.NamedQuery#withRange(QueryRange) range_ of instances to be returned.
 
@@ -280,7 +280,7 @@ If no instance is found then _Optional#empty()_ will be return, while if there i
 [#uniqueMatch__Query]
 === uniqueMatch(Query)
 
-Find the only instance that matches the provided xref:system:generated:index/applib/query/Query.adoc[Query] .
+Find the only instance that matches the provided xref:refguide:applib:index/query/Query.adoc[Query] .
 
 This is the main API for server-side (performant) queries returning no more than one instance, where a _org.apache.isis.applib.query.NamedQuery_ can be passed in that ultimately describes a SELECT query with WHERE predicates. The mechanism by which this is defined depends on the ORM (JDO or JPA). A _org.apache.isis.applib.query.NamedQuery_ can optionally specify a _org.apache.isis.applib.query.NamedQuery#withRange(QueryRange) range_ of instances to be returned.
 
@@ -298,7 +298,7 @@ If no instance is found then _Optional#empty()_ will be return, while if there i
 [#firstMatch__Query]
 === firstMatch(Query)
 
-Find the only instance that matches the provided xref:system:generated:index/applib/query/Query.adoc[Query] , if any.
+Find the only instance that matches the provided xref:refguide:applib:index/query/Query.adoc[Query] , if any.
 
 This is the main API for server-side (performant) queries returning the first matching instance, where a _org.apache.isis.applib.query.NamedQuery_ can be passed in that ultimately describes a SELECT query with WHERE predicates. The mechanism by which this is defined depends on the ORM (JDO or JPA). A _org.apache.isis.applib.query.NamedQuery_ can optionally specify a _org.apache.isis.applib.query.NamedQuery#withRange(QueryRange) range_ of instances to be returned.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
index 1e03742..42d07c9 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/repository/hooks/RepositoryService_020-examples-and-usage.adoc
@@ -26,9 +26,9 @@ repositoryService.persist(cust);
 ----
 
 
-You should be aware that by default the framework queues up calls to xref:system:generated:index/applib/services/repository/RepositoryService.adoc#persist__T[#persist()] and xref:system:generated:index/applib/services/repository/RepositoryService.adoc#remove__Object[#remove()].
+You should be aware that by default the framework queues up calls to xref:refguide:applib:index/services/repository/RepositoryService.adoc#persist__T[#persist()] and xref:refguide:applib:index/services/repository/RepositoryService.adoc#remove__Object[#remove()].
 These are then executed either when the request completes (and the transaction commits), or if the queue is flushed.
-This can be done either implicitly by the framework, or as the result of a direct call to xref:system:generated:index/applib/services/xactn/TransactionService.adoc#flushTransaction__[TransactionService#flushTransaction].
+This can be done either implicitly by the framework, or as the result of a direct call to xref:refguide:applib:index/services/xactn/TransactionService.adoc#flushTransaction__[TransactionService#flushTransaction].
 
 By default the framework itself will cause `#flush()` to be called whenever a query is executed by way of `#allMatches(Query)`.
 However, this behaviour can be disabled using the  xref:refguide:config:sections/Other.adoc[]
@@ -165,12 +165,12 @@ The pattern is parameter, argument, parameter, argument, ... and so on.
 
 [TIP]
 ====
-If using JPA, it is also possible to use the Spring Data repositories, using xref:system:generated:index/persistence/jpa/applib/services/JpaSupportService.adoc[JpaSupportService].
+If using JPA, it is also possible to use the Spring Data repositories, using xref:refguide:persistence:index/jpa/applib/services/JpaSupportService.adoc[JpaSupportService].
 ====
 
 [TIP]
 ====
-If using JDO/DataNucleus, it is also possible to use the DataNucleus type-safe query API, see xref:system:generated:index/persistence/jdo/applib/services/JdoSupportService.adoc[JdoSupportService].
+If using JDO/DataNucleus, it is also possible to use the DataNucleus type-safe query API, see xref:refguide:persistence:index/jdo/applib/services/JdoSupportService.adoc[JdoSupportService].
 ====
 
 
@@ -180,12 +180,12 @@ If using JDO/DataNucleus, it is also possible to use the DataNucleus type-safe q
 
 Supporting classes used by the API:
 
-* xref:system:generated:index/applib/services/repository/EntityState.adoc[EntityState]
-* xref:system:generated:index/applib/query/Query.adoc[Query]
-** xref:system:generated:index/applib/query/NamedQuery.adoc[NamedQuery]
-** xref:system:generated:index/applib/query/AllInstancesQuery.adoc[AllInstancesQuery]
-* xref:system:generated:index/applib/query/QueryRange.adoc[QueryRange]
+* xref:refguide:applib:index/services/repository/EntityState.adoc[EntityState]
+* xref:refguide:applib:index/query/Query.adoc[Query]
+** xref:refguide:applib:index/query/NamedQuery.adoc[NamedQuery]
+** xref:refguide:applib:index/query/AllInstancesQuery.adoc[AllInstancesQuery]
+* xref:refguide:applib:index/query/QueryRange.adoc[QueryRange]
 
 Transaction management:
 
-* xref:system:generated:index/applib/services/xactn/TransactionService.adoc[TransactionService]
+* xref:refguide:applib:index/services/xactn/TransactionService.adoc[TransactionService]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_010-implementation.adoc
index 2ee3816..f1b489e 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_010-implementation.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_010-implementation.adoc
@@ -7,4 +7,4 @@
 
 
 The framework provides a default implementation - `o.a.i.runtimeservices.routing.RoutingServiceDefault` - which will always return the original object provided, or the home page if a `null` or `void` was provided.
-Under the covers this implementation uses the xref:system:generated:index/applib/services/homepage/HomePageResolverService.adoc[`HomePageResolverService`].
+Under the covers this implementation uses the xref:refguide:applib:index/services/homepage/HomePageResolverService.adoc[`HomePageResolverService`].
diff --git a/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
index 7563b1b..75e0477 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/routing/hooks/RoutingService_020-examples-and-usage.adoc
@@ -13,7 +13,7 @@ The route used will be the result of the first implementation checked that decla
 
 == Related Services
 
-* xref:system:generated:index/applib/services/homepage/HomePageResolverService.adoc[`HomePageResolverService`]
+* xref:refguide:applib:index/services/homepage/HomePageResolverService.adoc[`HomePageResolverService`]
 +
 Used by the default implementation of this service uses the
  to determine where to route actions that return `null` or are declared as `void`.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_010-implementation.adoc b/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
index aaeece1..4644c0d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_010-implementation.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/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:system:generated:index/applib/annotation/InteractionScope.adoc[`@InteractionScope`]'d wrapper around a `java.util.Map`
+This is just an xref:refguide:applib:index/annotation/InteractionScope.adoc[`@InteractionScope`]'d wrapper around a `java.util.Map`
diff --git a/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
index ae753ce..e2d255c 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/scratchpad/hooks/Scratchpad_020-examples-and-usage.adoc
@@ -4,7 +4,7 @@
 
 == Related Services
 
-* xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`]
+* xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`]
 +
 is useful for caching the results of expensive method calls.
 It is also
diff --git a/antora/components/refguide/modules/applib/pages/index/services/sudo/SudoService.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/SudoService.adoc
index afde70d..bca3fa5 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/sudo/SudoService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/sudo/SudoService.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Allows a block of code to be executed within an arbitrary xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] , allowing the who, when and where to be temporarily switched.
+Allows a block of code to be executed within an arbitrary xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] , allowing the who, when and where to be temporarily switched.
 
-Most typically this service is used to temporarily change the &qout;who", that is the user reported by the xref:system:generated:index/applib/services/user/UserService.adoc[UserService] 's _UserService#currentUser() getUser()_ - hence the name SudoService. But the user's locale and timezome can also be changed, as well as the time reported by _org.apache.isis.applib.services.clock.ClockService_ .
+Most typically this service is used to temporarily change the &qout;who", that is the user reported by the xref:refguide:applib:index/services/user/UserService.adoc[UserService] 's _UserService#currentUser() getUser()_ - hence the name SudoService. But the user's locale and timezome can also be changed, as well as the time reported by _org.apache.isis.applib.services.clock.ClockService_ .
 
 The primary use case for this service is for fixture scripts and integration tests.
 
@@ -26,12 +26,12 @@ If included in the list of roles, then will disable security checks (can view an
 <.> xref:#call__UnaryOperator_Callable[call(UnaryOperator, Callable)]
 +
 --
-Executes the supplied _Callable_ block, within the provided xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] .
+Executes the supplied _Callable_ block, within the provided xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] .
 --
 <.> xref:#run__UnaryOperator_ThrowingRunnable[run(UnaryOperator, ThrowingRunnable)]
 +
 --
-Executes the supplied _Callable_ block, within the provided xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] .
+Executes the supplied _Callable_ block, within the provided xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] .
 --
 
 == Members
@@ -44,12 +44,12 @@ If included in the list of roles, then will disable security checks (can view an
 [#call__UnaryOperator_Callable]
 === call(UnaryOperator, Callable)
 
-Executes the supplied _Callable_ block, within the provided xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] .
+Executes the supplied _Callable_ block, within the provided xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] .
 
 [#run__UnaryOperator_ThrowingRunnable]
 === run(UnaryOperator, ThrowingRunnable)
 
-Executes the supplied _Callable_ block, within the provided xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] .
+Executes the supplied _Callable_ block, within the provided xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] .
 
 include::hooks/SudoService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
index 68fce46..5d62657 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoServiceListener_020-examples-and-usage.adoc
@@ -3,4 +3,4 @@
 
 == See also
 
-* xref:system:generated:index/applib/services/sudo/SudoService.adoc[SudoService]
+* xref:refguide:applib:index/services/sudo/SudoService.adoc[SudoService]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
index abec672..9e4b88c 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
@@ -27,11 +27,11 @@ protected void execute(final ExecutionContext ec) {
 
 == Interaction with Shiro
 
-When `sudo(...)` is called the "effective user" is reported by  xref:system:generated:index/applib/services/user/UserService.adoc[`UserService`].
+When `sudo(...)` is called the "effective user" is reported by  xref:refguide:applib:index/services/user/UserService.adoc[`UserService`].
 However, it does _not_ propagate through to the xref:security:ROOT:about.adoc[Shiro security mechanism], which continue to be evaluated according to the permissions of the current user.
 
 This can be a problem in certain use cases.
-For example if running a fixture script (which uses the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory]) from within an implementation of xref:system:generated:index/applib/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`], this is likely to result in ``HiddenException``s being thrown because there is no effective user.
+For example if running a fixture script (which uses the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory]) from within an implementation of xref:refguide:applib:index/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`], this is likely to result in ``HiddenException``s being thrown because there is no effective user.
 
 In such cases, permission checking can simply be disabled by specifying `SudoService.ACCESS_ALL_ROLE` as one of the roles.
 For example:
@@ -60,9 +60,9 @@ In the future this service may be used more deeply, eg to propagate permissions
 
 == See also
 
-* xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext]
+* xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext]
 
-* xref:system:generated:index/applib/services/sudo/SudoServiceListener.adoc[SudoServiceListener]
+* xref:refguide:applib:index/services/sudo/SudoServiceListener.adoc[SudoServiceListener]
 
 * the `InteractionFactory` is a lower-level framework (non-API) service, that provides the ability to programmatically start a new "interaction"; these can be nested.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
index 5bad2fa..04a704d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/swagger/hooks/SwaggerService_020-examples-and-usage.adoc
@@ -14,11 +14,11 @@ The service is_not_ (currently) used by the framework itself; it is provided as
 
 == See also
 
-* xref:system:generated:index/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc[SwaggerServiceMenu]
+* xref:refguide:viewer:index/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc[SwaggerServiceMenu]
 +
 part of the xref:vro:ROOT:about.adoc[Restful Objects viewer], this provides a prototype action that enables the swagger spec to be downloaded from theUI.
 
-* xref:system:generated:index/testing/integtestsupport/applib/swagger/SwaggerExporter.adoc[SwaggerExporter]
+* xref:refguide:testing:index/integtestsupport/applib/swagger/SwaggerExporter.adoc[SwaggerExporter]
 +
 can be used to generate a Swagger spec, for example within a test suite or larger build pipeline.
 +
diff --git a/antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc
index ed5a310..e5dcbee 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Provided as a convenient base class for providing alternative implementations of xref:system:generated:index/applib/services/urlencoding/UrlEncodingService.adoc[UrlEncodingService] .
+Provided as a convenient base class for providing alternative implementations of xref:refguide:applib:index/services/urlencoding/UrlEncodingService.adoc[UrlEncodingService] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
index 9017a02..4231560 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
@@ -22,7 +22,7 @@ For large view models, there's the possibility that the 2083 character limit cou
 
 * xref:userguide:fun:overview.adoc#view-models[view models]
 
-* xref:system:generated:index/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc[UrlEncodingServiceUsingBaseEncodingAbstract]
+* xref:refguide:applib:index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc[UrlEncodingServiceUsingBaseEncodingAbstract]
 +
 provided as a convenient base class for alternative implementations.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/user/RoleMemento.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/RoleMemento.adoc
index acbdf40..b0a6df4 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/user/RoleMemento.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/user/RoleMemento.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Immutable serializable value held by xref:system:generated:index/applib/services/user/UserMemento.adoc[UserMemento] .
+Immutable serializable value held by xref:refguide:applib:index/services/user/UserMemento.adoc[UserMemento] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/user/UserService.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/UserService.adoc
index 4db15e7..8cb671d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/user/UserService.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/user/UserService.adoc
@@ -2,7 +2,7 @@
 
 Allows the domain object to obtain the identity of the user interacting with said object.
 
-If xref:system:generated:index/applib/services/sudo/SudoService.adoc[SudoService] has been used to temporarily override the user and/or roles, then this service will report the overridden values instead.
+If xref:refguide:applib:index/services/sudo/SudoService.adoc[SudoService] has been used to temporarily override the user and/or roles, then this service will report the overridden values instead.
 
 == API
 
@@ -21,7 +21,7 @@ interface UserService {
 <.> xref:#currentUser__[currentUser()]
 +
 --
-Optionally gets the details about the current user, based on whether an xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
+Optionally gets the details about the current user, based on whether an xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
 --
 <.> xref:#getUser__[getUser()]
 +
@@ -36,7 +36,7 @@ Gets the details about the current user.
 <.> xref:#currentUserName__[currentUserName()]
 +
 --
-Optionally gets the the current user's name, based on whether an xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
+Optionally gets the the current user's name, based on whether an xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
 --
 <.> xref:#currentUserNameElseNobody__[currentUserNameElseNobody()]
 +
@@ -49,7 +49,7 @@ Returns either the current user's name or else _Nobody_ .
 [#currentUser__]
 === currentUser()
 
-Optionally gets the details about the current user, based on whether an xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
+Optionally gets the details about the current user, based on whether an xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
 
 [#getUser__]
 === getUser()
@@ -64,7 +64,7 @@ Gets the details about the current user.
 [#currentUserName__]
 === currentUserName()
 
-Optionally gets the the current user's name, based on whether an xref:system:generated:index/applib/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
+Optionally gets the the current user's name, based on whether an xref:refguide:applib:index/services/iactn/ExecutionContext.adoc[ExecutionContext] can be found with the current thread's context.
 
 [#currentUserNameElseNobody__]
 === currentUserNameElseNobody()
diff --git a/antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_020-examples-and-usage.adoc
index f9cc138..42ac9ae 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/user/hooks/UserService_020-examples-and-usage.adoc
@@ -12,5 +12,5 @@ In addition, when using the xref:vw:ROOT:about.adoc[Wicket viewer] there will be
 
 == See also
 
-* xref:system:generated:index/applib/services/user/UserMemento.adoc[UserMemento]
-* xref:system:generated:index/applib/services/user/RoleMemento.adoc[RoleMemento]
+* xref:refguide:applib:index/services/user/UserMemento.adoc[UserMemento]
+* xref:refguide:applib:index/services/user/RoleMemento.adoc[RoleMemento]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
index 7c61331..8d20643 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/EmailNotificationService_020-examples-and-usage.adoc
@@ -17,7 +17,7 @@ If necessary, one can be created on the fly using the `InteractionFactory#runAut
 
 The `EmailNotificationService` supports the xref:vw:ROOT:features.adoc#user-registration[user registration] (self sign-up) features of the xref:vw:ROOT:about.adoc[Wicket viewer] whereby a user can sign-up to access an application by providing a valid email address.
 
-* The Wicket viewer will check whether an implementation of this service (and also the xref:system:generated:index/applib/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`]) is available, and if so will (unless configured not to) expose a sign-up page where the user enters their email address.
+* The Wicket viewer will check whether an implementation of this service (and also the xref:refguide:applib:index/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`]) is available, and if so will (unless configured not to) expose a sign-up page where the user enters their email address.
 
 * A verification email is sent using this service; the email includes a link back to the running application.
 
@@ -25,21 +25,21 @@ The `EmailNotificationService` supports the xref:vw:ROOT:features.adoc#user-regi
 
 * The role of this service in all of this is to format and send out emails for the initial registration, or for password resets.
 
-The default implementation of this service uses the xref:system:generated:index/applib/services/email/EmailService.adoc[`EmailService`], which must be configured in order for user registration to be enabled.
+The default implementation of this service uses the xref:refguide:applib:index/services/email/EmailService.adoc[`EmailService`], which must be configured in order for user registration to be enabled.
 
 
 == Related Services
 
-The default implementation of this service uses xref:system:generated:index/applib/services/email/EmailService.adoc[`EmailService`], which must have been configured/initialized correctly.
+The default implementation of this service uses xref:refguide:applib:index/services/email/EmailService.adoc[`EmailService`], which must have been configured/initialized correctly.
 
-This service is used by (Apache Isis' default implementation of) xref:system:generated:index/applib/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`].
+This service is used by (Apache Isis' default implementation of) xref:refguide:applib:index/services/userreg/UserRegistrationService.adoc[`UserRegistrationService`].
 
 
 == Related Event Classes
 
 See:
 
-* xref:system:generated:index/applib/services/userreg/events/EmailRegistrationEvent.adoc[EmailRegistrationEvent]
-* xref:system:generated:index/applib/services/userreg/events/PasswordResetEvent.adoc[PasswordResetEvent]
+* xref:refguide:applib:index/services/userreg/events/EmailRegistrationEvent.adoc[EmailRegistrationEvent]
+* xref:refguide:applib:index/services/userreg/events/PasswordResetEvent.adoc[PasswordResetEvent]
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
index 16c541f..89deb13 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/userreg/hooks/UserRegistrationService_020-examples-and-usage.adoc
@@ -6,7 +6,7 @@
 == Usage by the framework
 
 The xref:vw:ROOT:about.adoc[Wicket viewer] supports user registration, relying on
-both the xref:system:generated:index/applib/services/userreg/EmailNotificationService.adoc[EmailNotificationService] and xref:system:generated:index/applib/services/email/EmailService.adoc[EmailService].
+both the xref:refguide:applib:index/services/userreg/EmailNotificationService.adoc[EmailNotificationService] and xref:refguide:applib:index/services/email/EmailService.adoc[EmailService].
 
 The framework provides default implementations of both of these services.
 The notification service requires no further configuration.
@@ -14,7 +14,7 @@ The email service (`EmailServiceDefault`) _does_ require a couple of configurati
 
 === User sign-up
 
-For user sign-up, the xref:vw:ROOT:about.adoc[Wicket viewer] will check whether an implementation of this service (and also the xref:system:generated:index/applib/services/userreg/EmailNotificationService.adoc[`EmailNotificationService`]) is available, and if so will render a sign-up page where the user enters their email address.
+For user sign-up, the xref:vw:ROOT:about.adoc[Wicket viewer] will check whether an implementation of this service (and also the xref:refguide:applib:index/services/userreg/EmailNotificationService.adoc[`EmailNotificationService`]) is available, and if so will render a sign-up page where the user enters their email address.
 A verification email is sent (using the aforementioned `EmailNotificationService`) which includes a link back to the running application; this allows the user then to complete their registration process (choose user name, password and so on).
 When the user has provided the additional details, the Wicket viewer calls _this_ service in order to create an account for them, and then logs the user on.
 
@@ -38,5 +38,5 @@ That said, we expect that such use cases will be comparatively rare; the primary
 
 == See also
 
-* xref:system:generated:index/applib/services/userreg/EmailNotificationService.adoc[EmailNotificationService]
-* xref:system:generated:index/applib/services/email/EmailService.adoc[EmailService]
+* xref:refguide:applib:index/services/userreg/EmailNotificationService.adoc[EmailNotificationService]
+* xref:refguide:applib:index/services/email/EmailService.adoc[EmailService]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrapperFactory.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrapperFactory.adoc
index 1708da9..5934321 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrapperFactory.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrapperFactory.adoc
@@ -12,7 +12,7 @@ The 'wrap' is a runtime-code-generated proxy that wraps the underlying domain ob
 * a `set` method for properties
 * 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 as hidden then a xref:system:generated:index/applib/services/wrapper/HiddenException.adoc[HiddenException] will be thrown. Similarly if an action has a `validate` method and the supplied arguments are invalid then a xref:system:generated:index/applib/services/wrapper/InvalidException.adoc[InvalidException] will be thrown.
+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 as hidden then a xref:refguide:applib:index/services/wrapper/HiddenException.adoc[HiddenException] will be thrown. Similarly if an action has a `validate` method and the supplied arguments are invalid then a xref:refguide:applib:index/services/wrapper/InvalidException.adoc[InvalidException] will be thrown.
 
 In addition, the following methods may also be called:
 
@@ -85,17 +85,17 @@ Returns a proxy object for the provided _mixinClass_ , through which can execute
 <.> xref:#getListeners__[getListeners()]
 +
 --
-All xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] s that have been registered using _#addInteractionListener(InteractionListener)_ .
+All xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] s that have been registered using _#addInteractionListener(InteractionListener)_ .
 --
 <.> xref:#addInteractionListener__InteractionListener[addInteractionListener(InteractionListener)]
 +
 --
-Registers an xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to be notified of interactions on all wrappers.
+Registers an xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to be notified of interactions on all wrappers.
 --
 <.> xref:#removeInteractionListener__InteractionListener[removeInteractionListener(InteractionListener)]
 +
 --
-Remove an xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to no longer be notified of interactions on wrappers.
+Remove an xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to no longer be notified of interactions on wrappers.
 --
 
 == Members
@@ -105,7 +105,7 @@ Remove an xref:system:generated:index/applib/services/wrapper/listeners/Interact
 
 Provides the "wrapper" of a domain object against which to invoke the action.
 
-The provided xref:system:generated:index/applib/services/wrapper/control/SyncControl.adoc[SyncControl] determines whether business rules are checked first, and conversely whether the action is executed. There are therefore three typical cases:
+The provided xref:refguide:applib:index/services/wrapper/control/SyncControl.adoc[SyncControl] determines whether business rules are checked first, and conversely whether the action is executed. There are therefore three typical cases:
 
 * check rules, execute action
 * skip rules, execute action
@@ -125,7 +125,7 @@ A convenience overload for _#wrap(Object, SyncControl)_ , returning a wrapper to
 
 Provides the wrapper for a _FactoryService#mixin(Class, Object) mixin_ , against which to invoke the action.
 
-The provided xref:system:generated:index/applib/services/wrapper/control/SyncControl.adoc[SyncControl] determines whether business rules are checked first, and conversely whether the action is executed. See _#wrap(Object, SyncControl)_ for more details on this.
+The provided xref:refguide:applib:index/services/wrapper/control/SyncControl.adoc[SyncControl] determines whether business rules are checked first, and conversely whether the action is executed. See _#wrap(Object, SyncControl)_ for more details on this.
 
 [#wrapMixin__Class_Object]
 === wrapMixin(Class, Object)
@@ -157,19 +157,19 @@ Returns a proxy object for the provided _mixinClass_ , through which can execute
 [#getListeners__]
 === getListeners()
 
-All xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] s that have been registered using _#addInteractionListener(InteractionListener)_ .
+All xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] s that have been registered using _#addInteractionListener(InteractionListener)_ .
 
 [#addInteractionListener__InteractionListener]
 === addInteractionListener(InteractionListener)
 
-Registers an xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to be notified of interactions on all wrappers.
+Registers an xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to be notified of interactions on all wrappers.
 
 This is retrospective: the listener will be notified of interactions even on wrappers created before the listener was installed. (From an implementation perspective this is because the wrappers delegate back to the container to fire the events).
 
 [#removeInteractionListener__InteractionListener]
 === removeInteractionListener(InteractionListener)
 
-Remove an xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to no longer be notified of interactions on wrappers.
+Remove an xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to no longer be notified of interactions on wrappers.
 
 This is retrospective: the listener will no longer be notified of any interactions created on any wrappers, not just on those wrappers created subsequently. (From an implementation perspective this is because the wrappers delegate back to the container to fire the events).
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrappingObject.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrappingObject.adoc
index e09ec7d..a75c1ce 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrappingObject.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/WrappingObject.adoc
@@ -27,7 +27,7 @@ Provide access to the underlying, wrapped object.
 <.> xref:#__isis_executionModes__[__isis_executionModes()]
 +
 --
-The _EnumSetexecution modes_ inferred from the xref:system:generated:index/applib/services/wrapper/control/SyncControl.adoc[SyncControl] with which this wrapper was _WrapperFactory#wrap(Object, SyncControl) created_ .
+The _EnumSetexecution modes_ inferred from the xref:refguide:applib:index/services/wrapper/control/SyncControl.adoc[SyncControl] with which this wrapper was _WrapperFactory#wrap(Object, SyncControl) created_ .
 --
 
 == Members
@@ -53,4 +53,4 @@ NOTE: domain classes may not have a method with this name. The `__isis_` prefix
 [#__isis_executionModes__]
 === __isis_executionModes()
 
-The _EnumSetexecution modes_ inferred from the xref:system:generated:index/applib/services/wrapper/control/SyncControl.adoc[SyncControl] with which this wrapper was _WrapperFactory#wrap(Object, SyncControl) created_ .
+The _EnumSetexecution modes_ inferred from the xref:refguide:applib:index/services/wrapper/control/SyncControl.adoc[SyncControl] with which this wrapper was _WrapperFactory#wrap(Object, SyncControl) created_ .
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/AsyncControl.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/AsyncControl.adoc
index c369b5b..15b8201 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/AsyncControl.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/AsyncControl.adoc
@@ -41,7 +41,7 @@ Skip checking business rules (hide/disable/validate) before executing the underl
 <.> xref:#with__ExceptionHandler[with(ExceptionHandler)]
 +
 --
-How to handle exceptions if they occur, using the provided xref:system:generated:index/applib/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
+How to handle exceptions if they occur, using the provided xref:refguide:applib:index/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
 --
 <.> xref:#with__ExecutorService[with(ExecutorService)]
 +
@@ -79,7 +79,7 @@ Skip checking business rules (hide/disable/validate) before executing the underl
 [#with__ExceptionHandler]
 === with(ExceptionHandler)
 
-How to handle exceptions if they occur, using the provided xref:system:generated:index/applib/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
+How to handle exceptions if they occur, using the provided xref:refguide:applib:index/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
 
 The default behaviour is to rethrow the exception.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/SyncControl.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/SyncControl.adoc
index 0b418f4..689714a 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/SyncControl.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/control/SyncControl.adoc
@@ -25,7 +25,7 @@ Skip checking business rules (hide/disable/validate) before executing the underl
 <.> xref:#with__ExceptionHandler[with(ExceptionHandler)]
 +
 --
-How to handle exceptions if they occur, using the provided xref:system:generated:index/applib/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
+How to handle exceptions if they occur, using the provided xref:refguide:applib:index/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
 --
 <.> xref:#withExecute__[withExecute()]
 +
@@ -53,7 +53,7 @@ Skip checking business rules (hide/disable/validate) before executing the underl
 [#with__ExceptionHandler]
 === with(ExceptionHandler)
 
-How to handle exceptions if they occur, using the provided xref:system:generated:index/applib/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
+How to handle exceptions if they occur, using the provided xref:refguide:applib:index/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler] .
 
 The default behaviour is to rethrow the exception.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/AccessEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/AccessEvent.adoc
index 79f8d47..94407ca 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/AccessEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/AccessEvent.adoc
@@ -2,7 +2,7 @@
 
  _Supported only by _org.apache.isis.applib.services.wrapper.WrapperFactory_ service,_ represents an access (reading) of a property, collection or title.
 
-Analogous to xref:system:generated:index/applib/services/wrapper/events/ValidityEvent.adoc[ValidityEvent] (which corresponds to modifying a property or collection etc), however the _#getReason()_ will always be `null` . (If access is not allowed then a vetoing xref:system:generated:index/applib/services/wrapper/events/VisibilityEvent.adoc[VisibilityEvent] would have been fired).
+Analogous to xref:refguide:applib:index/services/wrapper/events/ValidityEvent.adoc[ValidityEvent] (which corresponds to modifying a property or collection etc), however the _#getReason()_ will always be `null` . (If access is not allowed then a vetoing xref:refguide:applib:index/services/wrapper/events/VisibilityEvent.adoc[VisibilityEvent] would have been fired).
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionArgumentEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionArgumentEvent.adoc
index 3dc0665..e907ab2 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionArgumentEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionArgumentEvent.adoc
@@ -4,7 +4,7 @@
 
 If _#getReason()_ is not `null` then provides the reason why the argument is invalid; otherwise the argument is valid.
 
-Called once per argument, and before xref:system:generated:index/applib/services/wrapper/events/ActionInvocationEvent.adoc[ActionInvocationEvent] .
+Called once per argument, and before xref:refguide:applib:index/services/wrapper/events/ActionInvocationEvent.adoc[ActionInvocationEvent] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionInvocationEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionInvocationEvent.adoc
index 574199b..fca7249 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionInvocationEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionInvocationEvent.adoc
@@ -1,10 +1,10 @@
 :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 [...]
 
- _Supported only by xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check as to whether a particular argument for an action is valid or not.
+ _Supported only by xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check as to whether a particular argument for an action is valid or not.
 
 If _#getReason()_ is not `null` then provides the reason why the set of arguments are invalid; otherwise the arguments are valid.
 
-Called after each of the xref:system:generated:index/applib/services/wrapper/events/ActionArgumentEvent.adoc[ActionArgumentEvent] s.
+Called after each of the xref:refguide:applib:index/services/wrapper/events/ActionArgumentEvent.adoc[ActionArgumentEvent] s.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionVisibilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionVisibilityEvent.adoc
index 517b5fe..f4fb73f 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionVisibilityEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ActionVisibilityEvent.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
- _Supported only by xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check as to whether an action is visible or has been hidden.
+ _Supported only by xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check as to whether an action is visible or has been hidden.
 
 If _#getReason()_ is not `null` then provides the reason why the action is invisible; otherwise action is visible.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAccessEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAccessEvent.adoc
index 29e46ea..f242a09 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAccessEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/CollectionAccessEvent.adoc
@@ -2,7 +2,7 @@
 
  _Supported only by _org.apache.isis.applib.services.wrapper.WrapperFactory_ service,_ represents an access (reading) of a collection.
 
-Analogous to xref:system:generated:index/applib/services/wrapper/events/CollectionAddToEvent.adoc[CollectionAddToEvent] or xref:system:generated:index/applib/services/wrapper/events/CollectionRemoveFromEvent.adoc[CollectionRemoveFromEvent] , however the _#getReason()_ will always be `null` . (If access is not allowed then a vetoing _CollectionVisibilityEvent_ would have been fired).
+Analogous to xref:refguide:applib:index/services/wrapper/events/CollectionAddToEvent.adoc[CollectionAddToEvent] or xref:refguide:applib:index/services/wrapper/events/CollectionRemoveFromEvent.adoc[CollectionRemoveFromEvent] , however the _#getReason()_ will always be `null` . (If access is not allowed then a vetoing _CollectionVisibilityEvent_ would have been fired).
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
index 5917733..6fb8bc2 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
@@ -2,7 +2,7 @@
 
  _Supported only by _org.apache.isis.applib.services.wrapper.WrapperFactory_ service,_ represents an interaction with a domain object or a particular feature (property, collection, action) of a domain object.
 
-Many of the interactions are checks for xref:system:generated:index/applib/services/wrapper/events/VisibilityEvent.adoc[VisibilityEvent] , xref:system:generated:index/applib/services/wrapper/events/UsabilityEvent.adoc[UsabilityEvent] and xref:system:generated:index/applib/services/wrapper/events/ValidityEvent.adoc[ValidityEvent] .
+Many of the interactions are checks for xref:refguide:applib:index/services/wrapper/events/VisibilityEvent.adoc[VisibilityEvent] , xref:refguide:applib:index/services/wrapper/events/UsabilityEvent.adoc[UsabilityEvent] and xref:refguide:applib:index/services/wrapper/events/ValidityEvent.adoc[ValidityEvent] .
 
 == API
 
@@ -35,7 +35,7 @@ The domain object (pojo) against which the interaction occurred.
 <.> xref:#getIdentifier__[getIdentifier()]
 +
 --
-The xref:system:generated:index/applib/Identifier.adoc[Identifier] of the feature of the object being interacted with.
+The xref:refguide:applib:index/Identifier.adoc[Identifier] of the feature of the object being interacted with.
 --
 <.> xref:#getClassName__[getClassName()]
 +
@@ -103,9 +103,9 @@ The domain object (pojo) against which the interaction occurred.
 [#getIdentifier__]
 === getIdentifier()
 
-The xref:system:generated:index/applib/Identifier.adoc[Identifier] of the feature of the object being interacted with.
+The xref:refguide:applib:index/Identifier.adoc[Identifier] of the feature of the object being interacted with.
 
-Will be consistent with the subclass of xref:system:generated:index/applib/services/wrapper/events/InteractionEvent.adoc[InteractionEvent] . So for example a xref:system:generated:index/applib/services/wrapper/events/PropertyModifyEvent.adoc[PropertyModifyEvent] will have an xref:system:generated:index/applib/Identifier.adoc[Identifier] that identifies the property being modified.
+Will be consistent with the subclass of xref:refguide:applib:index/services/wrapper/events/InteractionEvent.adoc[InteractionEvent] . So for example a xref:refguide:applib:index/services/wrapper/events/PropertyModifyEvent.adoc[PropertyModifyEvent] will have an xref:refguide:applib:index/Identifier.adoc[Identifier] that identifies the property being modified.
 
 [#getClassName__]
 === getClassName()
@@ -168,6 +168,6 @@ Whether this interaction has been vetoed (meaning that _#getReason()_ and _#getA
 
 The interpretation of this depends on the subclass:
 
-* for xref:system:generated:index/applib/services/wrapper/events/VisibilityEvent.adoc[VisibilityEvent] , a veto means that the feature (property, collection, action) is hidden
-* for xref:system:generated:index/applib/services/wrapper/events/UsabilityEvent.adoc[UsabilityEvent] , a veto means that the feature is disabled
-* for xref:system:generated:index/applib/services/wrapper/events/ValidityEvent.adoc[ValidityEvent] , a veto means that the proposed modification (property value, object added/removed, action argument) is invalid
+* for xref:refguide:applib:index/services/wrapper/events/VisibilityEvent.adoc[VisibilityEvent] , a veto means that the feature (property, collection, action) is hidden
+* for xref:refguide:applib:index/services/wrapper/events/UsabilityEvent.adoc[UsabilityEvent] , a veto means that the feature is disabled
+* for xref:refguide:applib:index/services/wrapper/events/ValidityEvent.adoc[ValidityEvent] , a veto means that the proposed modification (property value, object added/removed, action argument) is invalid
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyAccessEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyAccessEvent.adoc
index 3916772..b1ac0a7 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyAccessEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/PropertyAccessEvent.adoc
@@ -2,7 +2,7 @@
 
  _Supported only by _org.apache.isis.applib.services.wrapper.WrapperFactory_ service,_ represents an access (reading) of a property.
 
-Analogous to xref:system:generated:index/applib/services/wrapper/events/PropertyModifyEvent.adoc[PropertyModifyEvent] , however the _#getReason()_ will always be `null` . (If access is not allowed then a xref:system:generated:index/applib/services/wrapper/events/PropertyVisibilityEvent.adoc[PropertyVisibilityEvent] would have been fired).
+Analogous to xref:refguide:applib:index/services/wrapper/events/PropertyModifyEvent.adoc[PropertyModifyEvent] , however the _#getReason()_ will always be `null` . (If access is not allowed then a xref:refguide:applib:index/services/wrapper/events/PropertyVisibilityEvent.adoc[PropertyVisibilityEvent] would have been fired).
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ProposedHolderEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ProposedHolderEvent.adoc
index 0eee739..d87994a 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ProposedHolderEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/ProposedHolderEvent.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
- _Supported only by _org.apache.isis.applib.services.wrapper.WrapperFactory_ service,_ makes it easier to process different events that hold a single proposed argument (such as xref:system:generated:index/applib/services/wrapper/events/CollectionAddToEvent.adoc[CollectionAddToEvent] and xref:system:generated:index/applib/services/wrapper/events/PropertyModifyEvent.adoc[PropertyModifyEvent] ).
+ _Supported only by _org.apache.isis.applib.services.wrapper.WrapperFactory_ service,_ makes it easier to process different events that hold a single proposed argument (such as xref:refguide:applib:index/services/wrapper/events/CollectionAddToEvent.adoc[CollectionAddToEvent] and xref:refguide:applib:index/services/wrapper/events/PropertyModifyEvent.adoc[PropertyModifyEvent] ).
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/VisibilityEvent.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/VisibilityEvent.adoc
index 71698e0..439243d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/VisibilityEvent.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/events/VisibilityEvent.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
- _Supported only by xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check to determine whether a member of an object is visible or has been hidden.
+ _Supported only by xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] service,_ represents a check to determine whether a member of an object is visible or has been hidden.
 
 If _#getReason()_ is `null` , then is usable; otherwise is invisible.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
index b396dbd..03ee983 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/hooks/WrapperFactory_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/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:system:generated:index/applib/annotation/ActionLayout.adoc#hidden[`@ActionLayout#hidden`] then a `HiddenException` will be thrown.
+For example, if a property is annotated with xref:refguide:applib:index/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: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.
+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:index/annotation/Action.adoc#command[command] will be created and pre- and post-execute xref:refguide:applib:index/annotation/Action.adoc#domainEvent[domain event]s) will be fired.
 
 === Mixins
 
@@ -67,7 +67,7 @@ In addition, any xref:refguide:applib-methods:prefixes.adoc#default[`default...(
 
 === Creating interactions
 
-One use case for the `WrapperFactory` is to invoke actions that have xref:system:generated:index/applib/annotation/Action.adoc#executionPublishing[Action#executionPublishing] enabled.
+One use case for the `WrapperFactory` is to invoke actions that have xref:refguide:applib:index/annotation/Action.adoc#executionPublishing[Action#executionPublishing] enabled.
 This will result in a serializable representation of the action invocation to be published; this could then be used to route a message to another system.
 
 The target action is often a no-op; indeed it can even be hidden if the `WrapperFactory` is invoked with rules skipped.
@@ -92,7 +92,7 @@ Said another way: interactions are performed "as if" they are through the viewer
 
 One possible use case for the listener API would be to autogenerate documentation, for example a sequence diagram from tests.
 
-Such a feature would probably also use xref:system:generated:index/applib/services/iactn/InteractionContext.adoc[`InteractionContext`], which builds up an execution call graph of interactions between (wrapped) objects.
+Such a feature would probably also use xref:refguide:applib:index/services/iactn/InteractionContext.adoc[`InteractionContext`], which builds up an execution call graph of interactions between (wrapped) objects.
 
 
 
@@ -101,8 +101,8 @@ Such a feature would probably also use xref:system:generated:index/applib/servic
 
 == See also
 
-* xref:system:generated:index/applib/services/wrapper/control/SyncControl.adoc[SyncControl] and xref:system:generated:index/applib/services/wrapper/control/AsyncControl.adoc[AsyncControl]
-** xref:system:generated:index/applib/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler]
-** xref:system:generated:index/applib/services/wrapper/control/ExecutionMode.adoc[ExecutionMode]
-* xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener]
-** xref:system:generated:index/applib/services/wrapper/listeners/InteractionAdapter.adoc[InteractionAdapter]
+* xref:refguide:applib:index/services/wrapper/control/SyncControl.adoc[SyncControl] and xref:refguide:applib:index/services/wrapper/control/AsyncControl.adoc[AsyncControl]
+** xref:refguide:applib:index/services/wrapper/control/ExceptionHandler.adoc[ExceptionHandler]
+** xref:refguide:applib:index/services/wrapper/control/ExecutionMode.adoc[ExecutionMode]
+* xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener]
+** xref:refguide:applib:index/services/wrapper/listeners/InteractionAdapter.adoc[InteractionAdapter]
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionAdapter.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionAdapter.adoc
index 57fa3ee..8f588cf 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionAdapter.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionAdapter.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Provides no-op implementations of each of the methods within xref:system:generated:index/applib/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to simplify the creation of new listeners.
+Provides no-op implementations of each of the methods within xref:refguide:applib:index/services/wrapper/listeners/InteractionListener.adoc[InteractionListener] , to simplify the creation of new listeners.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionListener.adoc b/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionListener.adoc
index 0d7d52e..054b371 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionListener.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/wrapper/listeners/InteractionListener.adoc
@@ -135,7 +135,7 @@ A check was made to determine if a property was usable.
 
 A property was read.
 
-Unlike most other events, a xref:system:generated:index/applib/services/wrapper/events/PropertyAccessEvent.adoc[PropertyAccessEvent] will never have been vetoed (that is, _PropertyAccessEvent#isVeto()_ will always be `false` ).
+Unlike most other events, a xref:refguide:applib:index/services/wrapper/events/PropertyAccessEvent.adoc[PropertyAccessEvent] will never have been vetoed (that is, _PropertyAccessEvent#isVeto()_ will always be `false` ).
 
 [#propertyModified__PropertyModifyEvent]
 === propertyModified(PropertyModifyEvent)
@@ -163,7 +163,7 @@ Will be fired prior to either _#collectionAccessed(CollectionAccessEvent)_ or _#
 
 A collection was read.
 
-Unlike most other events, a xref:system:generated:index/applib/services/wrapper/events/CollectionAccessEvent.adoc[CollectionAccessEvent] will never have been vetoed (that is, _CollectionAccessEvent#isVeto()_ will always be `false` ).
+Unlike most other events, a xref:refguide:applib:index/services/wrapper/events/CollectionAccessEvent.adoc[CollectionAccessEvent] will never have been vetoed (that is, _CollectionAccessEvent#isVeto()_ will always be `false` ).
 
 [#collectionAddedTo__CollectionAddToEvent]
 === collectionAddedTo(CollectionAddToEvent)
diff --git a/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionId.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionId.adoc
index daa771b..773b216 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionId.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/xactn/TransactionId.adoc
@@ -32,7 +32,7 @@ Identifies the transaction (there could be multiple) within the _org.apache.isis
 <.> xref:#context[context]
 +
 --
-Identifies the persistence context that this xref:system:generated:index/applib/services/xactn/TransactionId.adoc[TransactionId] was created for.
+Identifies the persistence context that this xref:refguide:applib:index/services/xactn/TransactionId.adoc[TransactionId] was created for.
 --
 <.> xref:#empty__[empty()]
 +
@@ -55,7 +55,7 @@ Identifies the transaction (there could be multiple) within the _org.apache.isis
 [#context]
 === context
 
-Identifies the persistence context that this xref:system:generated:index/applib/services/xactn/TransactionId.adoc[TransactionId] was created for.
+Identifies the persistence context that this xref:refguide:applib:index/services/xactn/TransactionId.adoc[TransactionId] was created for.
 
 Useful when there are multiple persistence contexts configured. There are no constraints to format of this String, it is left for the implementation to ensure that the string is a uniqie identifier to the context.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
index 722751d..65124e1 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionService_020-examples-and-usage.adoc
@@ -4,7 +4,7 @@
 
 == See Also
 
-* xref:system:generated:index/applib/services/xactn/TransactionId.adoc[TransactionId]
-* xref:system:generated:index/applib/services/xactn/TransactionState.adoc[TransactionState]
+* xref:refguide:applib:index/services/xactn/TransactionId.adoc[TransactionId]
+* xref:refguide:applib:index/services/xactn/TransactionState.adoc[TransactionState]
 
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
index 5aa9ce1..f353fa3 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/xactn/hooks/TransactionalProcessor_020-examples-and-usage.adoc
@@ -40,10 +40,10 @@ class CustomController {
 
 == See also
 
-* xref:system:generated:index/core/interaction/session/InteractionFactory.adoc[InteractionFactory]
+* xref:refguide:core:index/interaction/session/InteractionFactory.adoc[InteractionFactory]
 +
 Not formal API, but used in the example above to obtain an outer "interaction" (session) within which the transaction is executed.
 
-* xref:system:generated:index/commons/functional/Result.adoc[Result]
+* xref:refguide:commons:index//functional/Result.adoc[Result]
 +
 which captures the result of an operation, either its successful return value or an exception.
diff --git a/antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_020-examples-and-usage.adoc
index 8f11071..e39b12d 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/xml/hooks/XmlService_020-examples-and-usage.adoc
@@ -4,7 +4,7 @@
 
 == See also
 
-* xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService]
+* xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService]
 +
 uses this service.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc b/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
index fc2f5a8..1b15f6e 100644
--- a/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/services/xmlsnapshot/hooks/XmlSnapshotService_020-examples-and-usage.adoc
@@ -122,14 +122,14 @@ One reason for doing this is to provide a stable API between the domain model an
 
 == See Also
 
-* xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService~Snapshot.adoc[Snapshot]
-** xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService~Snapshot~Builder.adoc[Snapshot.Builder]
+* xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService~Snapshot.adoc[Snapshot]
+** xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService~Snapshot~Builder.adoc[Snapshot.Builder]
 
-* xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[BookmarkService]
+* xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[BookmarkService]
 +
 provides a mechanism for obtaining a string representations of a single domain object.
 
-* xref:system:generated:index/applib/services/jaxb/JaxbService.adoc[JaxbService]
+* xref:refguide:applib:index/services/jaxb/JaxbService.adoc[JaxbService]
 +
 is a simple wrapper around standard JAXB functionality for generating both XMLs and XSDs from JAXB-annotated classes.
 +
diff --git a/antora/components/refguide/modules/applib/pages/index/snapshot/SnapshottableWithInclusions.adoc b/antora/components/refguide/modules/applib/pages/index/snapshot/SnapshottableWithInclusions.adoc
index 3417c09..ab2ed21 100644
--- a/antora/components/refguide/modules/applib/pages/index/snapshot/SnapshottableWithInclusions.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/snapshot/SnapshottableWithInclusions.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Optional interface for domain objects with which an snapshot is to be created using the xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService] , indicating paths to be _org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot_ automatically include additional paths within the snapshot.
+Optional interface for domain objects with which an snapshot is to be created using the xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService] , indicating paths to be _org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService.Snapshot_ automatically include additional paths within the snapshot.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification.adoc b/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification.adoc
index 641f130..b0ff90d 100644
--- a/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Adapter to make it easy to write xref:system:generated:index/applib/spec/Specification.adoc[Specification] s.
+Adapter to make it easy to write xref:refguide:applib:index/spec/Specification.adoc[Specification] s.
 
 Provides two main features:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification2.adoc b/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification2.adoc
index a8a58be..6d67917 100644
--- a/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification2.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/spec/AbstractSpecification2.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Adapter to make it easy to write xref:system:generated:index/applib/spec/Specification.adoc[Specification] s.
+Adapter to make it easy to write xref:refguide:applib:index/spec/Specification.adoc[Specification] s.
 
 Provides two main features:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/spec/Specification2.adoc b/antora/components/refguide/modules/applib/pages/index/spec/Specification2.adoc
index e1addc7..faea4b7 100644
--- a/antora/components/refguide/modules/applib/pages/index/spec/Specification2.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/spec/Specification2.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Optional extension to the base xref:system:generated:index/applib/spec/Specification.adoc[Specification] , to allow for i18n.
+Optional extension to the base xref:refguide:applib:index/spec/Specification.adoc[Specification] , to allow for i18n.
 
-If implemented, then the _#satisfies(Object)_ inherited from xref:system:generated:index/applib/spec/Specification.adoc[Specification] can just return `null` ; it will never be called by the framework.
+If implemented, then the _#satisfies(Object)_ inherited from xref:refguide:applib:index/spec/Specification.adoc[Specification] can just return `null` ; it will never be called by the framework.
 
 == API
 
@@ -17,7 +17,7 @@ interface Specification2 {
 <.> xref:#satisfiesTranslatable__Object[satisfiesTranslatable(Object)]
 +
 --
-If `null` then satisfied, otherwise is the reason (as a xref:system:generated:index/applib/services/i18n/TranslatableString.adoc[TranslatableString] translatable string) as to why the specification is not satisfied.
+If `null` then satisfied, otherwise is the reason (as a xref:refguide:applib:index/services/i18n/TranslatableString.adoc[TranslatableString] translatable string) as to why the specification is not satisfied.
 --
 
 == Members
@@ -25,4 +25,4 @@ If `null` then satisfied, otherwise is the reason (as a xref:system:generated:in
 [#satisfiesTranslatable__Object]
 === satisfiesTranslatable(Object)
 
-If `null` then satisfied, otherwise is the reason (as a xref:system:generated:index/applib/services/i18n/TranslatableString.adoc[TranslatableString] translatable string) as to why the specification is not satisfied.
+If `null` then satisfied, otherwise is the reason (as a xref:refguide:applib:index/services/i18n/TranslatableString.adoc[TranslatableString] translatable string) as to why the specification is not satisfied.
diff --git a/antora/components/refguide/modules/applib/pages/index/spec/SpecificationAnd.adoc b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationAnd.adoc
index a7fc323..3684ac7 100644
--- a/antora/components/refguide/modules/applib/pages/index/spec/SpecificationAnd.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationAnd.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Adapter to make it easy to perform boolean algebra on xref:system:generated:index/applib/spec/Specification.adoc[Specification] s.
+Adapter to make it easy to perform boolean algebra on xref:refguide:applib:index/spec/Specification.adoc[Specification] s.
 
-Subclasses represent the intersection of multiple xref:system:generated:index/applib/spec/Specification.adoc[Specification] s. An implementation should instantiate the xref:system:generated:index/applib/spec/Specification.adoc[Specification] s to be satisfied in its constructor.
+Subclasses represent the intersection of multiple xref:refguide:applib:index/spec/Specification.adoc[Specification] s. An implementation should instantiate the xref:refguide:applib:index/spec/Specification.adoc[Specification] s to be satisfied in its constructor.
 
 For example:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/spec/SpecificationNot.adoc b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationNot.adoc
index 520c0b8..03ff726 100644
--- a/antora/components/refguide/modules/applib/pages/index/spec/SpecificationNot.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationNot.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Adapter to make it easy to perform boolean algebra on xref:system:generated:index/applib/spec/Specification.adoc[Specification] s.
+Adapter to make it easy to perform boolean algebra on xref:refguide:applib:index/spec/Specification.adoc[Specification] s.
 
-Subclasses represent the logical inverse of a xref:system:generated:index/applib/spec/Specification.adoc[Specification] s. An implementation should instantiate the xref:system:generated:index/applib/spec/Specification.adoc[Specification] s to be satisfied in its constructor.
+Subclasses represent the logical inverse of a xref:refguide:applib:index/spec/Specification.adoc[Specification] s. An implementation should instantiate the xref:refguide:applib:index/spec/Specification.adoc[Specification] s to be satisfied in its constructor.
 
 For example:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/spec/SpecificationOr.adoc b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationOr.adoc
index 47dd40d..b0a849b 100644
--- a/antora/components/refguide/modules/applib/pages/index/spec/SpecificationOr.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/spec/SpecificationOr.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Adapter to make it easy to perform boolean algebra on xref:system:generated:index/applib/spec/Specification.adoc[Specification] s.
+Adapter to make it easy to perform boolean algebra on xref:refguide:applib:index/spec/Specification.adoc[Specification] s.
 
-Subclasses represent the conjunction of multiple xref:system:generated:index/applib/spec/Specification.adoc[Specification] s. An implementation should instantiate the xref:system:generated:index/applib/spec/Specification.adoc[Specification] s to be satisfied in its constructor.
+Subclasses represent the conjunction of multiple xref:refguide:applib:index/spec/Specification.adoc[Specification] s. An implementation should instantiate the xref:refguide:applib:index/spec/Specification.adoc[Specification] s to be satisfied in its constructor.
 
 For example:
 
diff --git a/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer.adoc b/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer.adoc
index 73bc6fb..94d9dce 100644
--- a/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer.adoc
@@ -4,7 +4,7 @@ Helper class to create properly concatenated reason string for use in method tha
 
 If no reasons are specified _#getReason()_ will return `null` , otherwise it will return a _String_ with all the valid reasons concatenated with a semi-colon separating each one.
 
-An alternative is to use the xref:system:generated:index/applib/util/Reasons.adoc[Reasons] class.
+An alternative is to use the xref:refguide:applib:index/util/Reasons.adoc[Reasons] class.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer2.adoc b/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer2.adoc
index ab114f9..da714a0 100644
--- a/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer2.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/util/ReasonBuffer2.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Extension to applib's xref:system:generated:index/applib/util/ReasonBuffer.adoc[ReasonBuffer] .
+Extension to applib's xref:refguide:applib:index/util/ReasonBuffer.adoc[ReasonBuffer] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/util/Reasons.adoc b/antora/components/refguide/modules/applib/pages/index/util/Reasons.adoc
index 14437fa..cea206e 100644
--- a/antora/components/refguide/modules/applib/pages/index/util/Reasons.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/util/Reasons.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-An alternative to xref:system:generated:index/applib/util/ReasonBuffer.adoc[ReasonBuffer] .
+An alternative to xref:refguide:applib:index/util/ReasonBuffer.adoc[ReasonBuffer] .
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/util/TitleBuffer.adoc b/antora/components/refguide/modules/applib/pages/index/util/TitleBuffer.adoc
index 4d59dec..39ed841 100644
--- a/antora/components/refguide/modules/applib/pages/index/util/TitleBuffer.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/util/TitleBuffer.adoc
@@ -40,12 +40,12 @@ class TitleBuffer {
 <.> xref:#TitleBuffer[TitleBuffer]
 +
 --
-Creates a new, empty, xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Creates a new, empty, xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 --
 <.> xref:#TitleBuffer[TitleBuffer]
 +
 --
-Creates a new xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] , containing the title of the specified object.
+Creates a new xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] , containing the title of the specified object.
 --
 <.> xref:#TitleBuffer[TitleBuffer]
 +
@@ -71,7 +71,7 @@ Determines if the specified text is empty. Will return true if either: the speci
 <.> xref:#append__Object[append(Object)]
 +
 --
-Append the title of the specified object to this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Append the title of the specified object to this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 --
 <.> xref:#append__Object_String[append(Object, String)]
 +
@@ -91,12 +91,12 @@ Appends the joining string and the title of the specified object. If the object
 <.> xref:#append__String_Object_String[append(String, Object, String)]
 +
 --
-Append the `joiner` text, a space, and the title of the specified object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If the title of the specified object is null then use the `defaultValue` text. If both the objects title and the default value are null or equate to a zero-length string then no text will be appended ; not even the joiner text.
+Append the `joiner` text, a space, and the title of the specified object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If the title of the specified object is null then use the `defaultValue` text. If both the objects title and the default value are null or equate to a zero-length string then no text will be appended ; not even the joiner text.
 --
 <.> xref:#append__String_String[append(String, String)]
 +
 --
-Appends the joiner text, a space, and the text to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If no text yet exists in the object then the joiner text and space are omitted.
+Appends the joiner text, a space, and the text to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If no text yet exists in the object then the joiner text and space are omitted.
 --
 <.> xref:#appendSpace__[appendSpace()]
 +
@@ -111,27 +111,27 @@ Concatenate the the title value (the result of calling an objects label() method
 <.> xref:#concat__Object_String[concat(Object, String)]
 +
 --
-Concatenate the title of the object value or the specified default value if the title is equal to null or is empty, to this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Concatenate the title of the object value or the specified default value if the title is equal to null or is empty, to this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 --
 <.> xref:#concat__String[concat(String)]
 +
 --
-Concatenate the specified text on to the end of the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Concatenate the specified text on to the end of the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 --
 <.> xref:#concat__String_String[concat(String, String)]
 +
 --
-Concatenate the joiner text and the text to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] object. If no text yet exists in the object then the joiner text is omitted.
+Concatenate the joiner text and the text to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] object. If no text yet exists in the object then the joiner text is omitted.
 --
 <.> xref:#concat__String_Object[concat(String, Object)]
 +
 --
-Concatenate the joiner text and the title of the object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If no object yet exists in the object then the joiner text is omitted.
+Concatenate the joiner text and the title of the object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If no object yet exists in the object then the joiner text is omitted.
 --
 <.> xref:#concat__String_Object_String[concat(String, Object, String)]
 +
 --
-Concatenate the joiner text and the title of the object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] object. If no object yet exists in the object then defaultValue is used instead.
+Concatenate the joiner text and the title of the object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] object. If no object yet exists in the object then defaultValue is used instead.
 --
 <.> xref:#toString__[toString()]
 +
@@ -149,12 +149,12 @@ Truncates this title so it has a maximum number of words. Spaces are used to det
 [#TitleBuffer]
 === TitleBuffer
 
-Creates a new, empty, xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Creates a new, empty, xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 
 [#TitleBuffer]
 === TitleBuffer
 
-Creates a new xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] , containing the title of the specified object.
+Creates a new xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] , containing the title of the specified object.
 
 Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
@@ -188,7 +188,7 @@ Determines if the specified text is empty. Will return true if either: the speci
 [#append__Object]
 === append(Object)
 
-Append the title of the specified object to this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Append the title of the specified object to this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 
 Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
@@ -214,14 +214,14 @@ Note: this method only obtains the title using either `title()` or `toString()`
 [#append__String_Object_String]
 === append(String, Object, String)
 
-Append the `joiner` text, a space, and the title of the specified object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If the title of the specified object is null then use the `defaultValue` text. If both the objects title and the default value are null or equate to a zero-length string then no text will be appended ; not even the joiner text.
+Append the `joiner` text, a space, and the title of the specified object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If the title of the specified object is null then use the `defaultValue` text. If both the objects title and the default value are null or equate to a zero-length string then no text will be appended ; not even the joiner text.
 
 Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#append__String_String]
 === append(String, String)
 
-Appends the joiner text, a space, and the text to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If no text yet exists in the object then the joiner text and space are omitted.
+Appends the joiner text, a space, and the text to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If no text yet exists in the object then the joiner text and space are omitted.
 
 [#appendSpace__]
 === appendSpace()
@@ -236,31 +236,31 @@ Concatenate the the title value (the result of calling an objects label() method
 [#concat__Object_String]
 === concat(Object, String)
 
-Concatenate the title of the object value or the specified default value if the title is equal to null or is empty, to this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Concatenate the title of the object value or the specified default value if the title is equal to null or is empty, to this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 
 Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#concat__String]
 === concat(String)
 
-Concatenate the specified text on to the end of the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] .
+Concatenate the specified text on to the end of the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 
 [#concat__String_String]
 === concat(String, String)
 
-Concatenate the joiner text and the text to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] object. If no text yet exists in the object then the joiner text is omitted.
+Concatenate the joiner text and the text to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] object. If no text yet exists in the object then the joiner text is omitted.
 
 [#concat__String_Object]
 === concat(String, Object)
 
-Concatenate the joiner text and the title of the object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] . If no object yet exists in the object then the joiner text is omitted.
+Concatenate the joiner text and the title of the object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If no object yet exists in the object then the joiner text is omitted.
 
 Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#concat__String_Object_String]
 === concat(String, Object, String)
 
-Concatenate the joiner text and the title of the object to the text of this xref:system:generated:index/applib/util/TitleBuffer.adoc[TitleBuffer] object. If no object yet exists in the object then defaultValue is used instead.
+Concatenate the joiner text and the title of the object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] object. If no object yet exists in the object then defaultValue is used instead.
 
 Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
diff --git a/antora/components/refguide/modules/applib/pages/index/util/schema/InteractionDtoUtils.adoc b/antora/components/refguide/modules/applib/pages/index/util/schema/InteractionDtoUtils.adoc
index 2bfb6a8..f5dc845 100644
--- a/antora/components/refguide/modules/applib/pages/index/util/schema/InteractionDtoUtils.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/util/schema/InteractionDtoUtils.adoc
@@ -37,12 +37,12 @@ class InteractionDtoUtils {
 <.> xref:#newInteractionDto__Execution[newInteractionDto(Execution)]
 +
 --
-Creates a _InteractionDto_ (serializable to XML) for the provided xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] (the applib object).
+Creates a _InteractionDto_ (serializable to XML) for the provided xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] (the applib object).
 --
 <.> xref:#newInteractionDto__Execution_Strategy[newInteractionDto(Execution, Strategy)]
 +
 --
-Creates a _InteractionDto_ (serializable to XML) for the provided xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] (the applib object).
+Creates a _InteractionDto_ (serializable to XML) for the provided xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] (the applib object).
 --
 <.> xref:#addReturn__ActionInvocationDto_Class_Object_BookmarkService[addReturn(ActionInvocationDto, Class, Object, BookmarkService)]
 
@@ -51,12 +51,12 @@ Creates a _InteractionDto_ (serializable to XML) for the provided xref:system:ge
 [#newInteractionDto__Execution]
 === newInteractionDto(Execution)
 
-Creates a _InteractionDto_ (serializable to XML) for the provided xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] (the applib object).
+Creates a _InteractionDto_ (serializable to XML) for the provided xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] (the applib object).
 
 [#newInteractionDto__Execution_Strategy]
 === newInteractionDto(Execution, Strategy)
 
-Creates a _InteractionDto_ (serializable to XML) for the provided xref:system:generated:index/applib/services/iactn/Execution.adoc[Execution] (the applib object).
+Creates a _InteractionDto_ (serializable to XML) for the provided xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] (the applib object).
 
 [#addReturn__ActionInvocationDto_Class_Object_BookmarkService]
 === addReturn(ActionInvocationDto, Class, Object, BookmarkService)
diff --git a/antora/components/refguide/modules/applib/pages/index/value/Blob.adoc b/antora/components/refguide/modules/applib/pages/index/value/Blob.adoc
index 231724e..9622094 100644
--- a/antora/components/refguide/modules/applib/pages/index/value/Blob.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/value/Blob.adoc
@@ -24,7 +24,7 @@ class Blob {
 <.> xref:#of__String_CommonMimeType_byte[][of(String, CommonMimeType, byte[])]
 +
 --
-Returns a new xref:system:generated:index/applib/value/Blob.adoc[Blob] of given _name_ , _mimeType_ and _content_ .
+Returns a new xref:refguide:applib:index/value/Blob.adoc[Blob] of given _name_ , _mimeType_ and _content_ .
 --
 <.> xref:#writeBytesTo__OutputStream[writeBytesTo(OutputStream)]
 +
@@ -38,11 +38,11 @@ Does not close the OutputStream.
 [#of__String_CommonMimeType_byte[]]
 === of(String, CommonMimeType, byte[])
 
-Returns a new xref:system:generated:index/applib/value/Blob.adoc[Blob] of given _name_ , _mimeType_ and _content_ .
+Returns a new xref:refguide:applib:index/value/Blob.adoc[Blob] of given _name_ , _mimeType_ and _content_ .
 
-_name_ may or may not include the desired filename extension, it is guaranteed, that the resulting xref:system:generated:index/applib/value/Blob.adoc[Blob] has the appropriate extension as constraint by the given _mimeType_ .
+_name_ may or may not include the desired filename extension, it is guaranteed, that the resulting xref:refguide:applib:index/value/Blob.adoc[Blob] has the appropriate extension as constraint by the given _mimeType_ .
 
-For more fine-grained control use one of the xref:system:generated:index/applib/value/Blob.adoc[Blob] constructors directly.
+For more fine-grained control use one of the xref:refguide:applib:index/value/Blob.adoc[Blob] constructors directly.
 
 [#writeBytesTo__OutputStream]
 === writeBytesTo(OutputStream)
diff --git a/antora/components/refguide/modules/applib/pages/index/value/Clob.adoc b/antora/components/refguide/modules/applib/pages/index/value/Clob.adoc
index 6552c82..70ff4c8 100644
--- a/antora/components/refguide/modules/applib/pages/index/value/Clob.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/value/Clob.adoc
@@ -26,7 +26,7 @@ class Clob {
 <.> xref:#of__String_CommonMimeType_CharSequence[of(String, CommonMimeType, CharSequence)]
 +
 --
-Returns a new xref:system:generated:index/applib/value/Clob.adoc[Clob] of given _name_ , _mimeType_ and _content_ .
+Returns a new xref:refguide:applib:index/value/Clob.adoc[Clob] of given _name_ , _mimeType_ and _content_ .
 --
 
 == Members
@@ -34,8 +34,8 @@ Returns a new xref:system:generated:index/applib/value/Clob.adoc[Clob] of given
 [#of__String_CommonMimeType_CharSequence]
 === of(String, CommonMimeType, CharSequence)
 
-Returns a new xref:system:generated:index/applib/value/Clob.adoc[Clob] of given _name_ , _mimeType_ and _content_ .
+Returns a new xref:refguide:applib:index/value/Clob.adoc[Clob] of given _name_ , _mimeType_ and _content_ .
 
-_name_ may or may not include the desired filename extension, it is guaranteed, that the resulting xref:system:generated:index/applib/value/Clob.adoc[Clob] has the appropriate extension as constraint by the given _mimeType_ .
+_name_ may or may not include the desired filename extension, it is guaranteed, that the resulting xref:refguide:applib:index/value/Clob.adoc[Clob] has the appropriate extension as constraint by the given _mimeType_ .
 
-For more fine-grained control use one of the xref:system:generated:index/applib/value/Clob.adoc[Clob] constructors directly.
+For more fine-grained control use one of the xref:refguide:applib:index/value/Clob.adoc[Clob] constructors directly.
diff --git a/antora/components/refguide/modules/applib/pages/index/value/LocalResourcePath.adoc b/antora/components/refguide/modules/applib/pages/index/value/LocalResourcePath.adoc
index 7d86695..f77fd85 100644
--- a/antora/components/refguide/modules/applib/pages/index/value/LocalResourcePath.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/value/LocalResourcePath.adoc
@@ -2,9 +2,9 @@
 
 Represents a local resource path, typically a relative path originating at this web-app's root or context-root.
 
-Action results of type xref:system:generated:index/applib/value/LocalResourcePath.adoc[LocalResourcePath] are interpreted as browser/client redirects, if applicable.
+Action results of type xref:refguide:applib:index/value/LocalResourcePath.adoc[LocalResourcePath] are interpreted as browser/client redirects, if applicable.
 
-xref:system:generated:index/applib/value/OpenUrlStrategy.adoc[OpenUrlStrategy] gives control on whether the redirect URL should open in the same or a new window/tap.
+xref:refguide:applib:index/value/OpenUrlStrategy.adoc[OpenUrlStrategy] gives control on whether the redirect URL should open in the same or a new window/tap.
 
 == API
 
diff --git a/antora/components/refguide/modules/applib/pages/index/value/OpenUrlStrategy.adoc b/antora/components/refguide/modules/applib/pages/index/value/OpenUrlStrategy.adoc
index fce02c6..8ca2c2d 100644
--- a/antora/components/refguide/modules/applib/pages/index/value/OpenUrlStrategy.adoc
+++ b/antora/components/refguide/modules/applib/pages/index/value/OpenUrlStrategy.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Controls, for Action results of type xref:system:generated:index/applib/value/LocalResourcePath.adoc[LocalResourcePath] , whether the redirect URL should open in the same or a new window/tap.
+Controls, for Action results of type xref:refguide:applib:index/value/LocalResourcePath.adoc[LocalResourcePath] , whether the redirect URL should open in the same or a new window/tap.
 
 == API
 
diff --git a/antora/components/refguide/modules/commons/pages/index/collections/Can.adoc b/antora/components/refguide/modules/commons/pages/index/collections/Can.adoc
index fd72d49..00501b2 100644
--- a/antora/components/refguide/modules/commons/pages/index/collections/Can.adoc
+++ b/antora/components/refguide/modules/commons/pages/index/collections/Can.adoc
@@ -1,12 +1,12 @@
 :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 [...]
 
-Immutable _Iterable_ , that can specifically represent 3 possible variants of xref:system:generated:index/commons/collections/Cardinality.adoc[Cardinality] .
+Immutable _Iterable_ , that can specifically represent 3 possible variants of xref:refguide:commons:index//collections/Cardinality.adoc[Cardinality] .
 
-Java's _Optional_ , can be seen as a holder of element(s), that is restricted to cardinality ZERO or ONE. xref:system:generated:index/commons/collections/Can.adoc[Can] is the logical extension to that, allowing also a cardinality of MULTIPLE.
+Java's _Optional_ , can be seen as a holder of element(s), that is restricted to cardinality ZERO or ONE. xref:refguide:commons:index//collections/Can.adoc[Can] is the logical extension to that, allowing also a cardinality of MULTIPLE.
 
-Same idiomatic convention applies: References to xref:system:generated:index/commons/collections/Can.adoc[Can] should never be initialized to _null_ .
+Same idiomatic convention applies: References to xref:refguide:commons:index//collections/Can.adoc[Can] should never be initialized to _null_ .
 
-A xref:system:generated:index/commons/collections/Can.adoc[Can] must not contain elements equal to _null_ .
+A xref:refguide:commons:index//collections/Can.adoc[Can] must not contain elements equal to _null_ .
 
 == API
 
diff --git a/antora/components/refguide/modules/commons/pages/index/functional/Result.adoc b/antora/components/refguide/modules/commons/pages/index/functional/Result.adoc
index 7692a05..46ec51e 100644
--- a/antora/components/refguide/modules/commons/pages/index/functional/Result.adoc
+++ b/antora/components/refguide/modules/commons/pages/index/functional/Result.adoc
@@ -1,6 +1,6 @@
 :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 xref:system:generated:index/commons/functional/Result.adoc[Result] type represents a value of one of two possible types (a disjoint union). The data constructors _Result#success(Object)_ and _Result#failure(Throwable)_ represent the two possible values.
+The xref:refguide:commons:index//functional/Result.adoc[Result] type represents a value of one of two possible types (a disjoint union). The data constructors _Result#success(Object)_ and _Result#failure(Throwable)_ represent the two possible values.
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUniqueId_command.adoc b/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUniqueId_command.adoc
index d888388..924e3e8 100644
--- a/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUniqueId_command.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/commandlog/impl/mixins/HasUniqueId_command.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-This mixin contributes a `command` action to any (non-command) implementation of xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId] ; that is: audit entries, and published events. Thus, it is possible to navigate from the effect back to the cause.
+This mixin contributes a `command` action to any (non-command) implementation of xref:refguide:commons:index//having/HasUniqueId.adoc[HasUniqueId] ; that is: audit entries, and published events. Thus, it is possible to navigate from the effect back to the cause.
 
 == API
 
@@ -20,7 +20,7 @@ CommandJdoRepository commandServiceRepository;
 <.> xref:#hideAct__[hideAct()]
 +
 --
-Hide if the contributee is a xref:system:generated:index/applib/services/command/Command.adoc[Command] , because xref:system:generated:index/applib/services/command/Command.adoc[Command] s already have a _Command#getParent() parent_ property.
+Hide if the contributee is a xref:refguide:applib:index/services/command/Command.adoc[Command] , because xref:refguide:applib:index/services/command/Command.adoc[Command] s already have a _Command#getParent() parent_ property.
 --
 
 == Members
@@ -28,4 +28,4 @@ Hide if the contributee is a xref:system:generated:index/applib/services/command
 [#hideAct__]
 === hideAct()
 
-Hide if the contributee is a xref:system:generated:index/applib/services/command/Command.adoc[Command] , because xref:system:generated:index/applib/services/command/Command.adoc[Command] s already have a _Command#getParent() parent_ property.
+Hide if the contributee is a xref:refguide:applib:index/services/command/Command.adoc[Command] , because xref:refguide:applib:index/services/command/Command.adoc[Command] s already have a _Command#getParent() parent_ property.
diff --git a/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc
index 5e844ee..ce98834 100644
--- a/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/commandreplay/secondary/executor/CommandExecutorServiceWithTime.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Override of xref:system:generated:index/applib/services/command/CommandExecutorService.adoc[CommandExecutorService] that also sets the time (using the xref:system:generated:index/extensions/commandreplay/secondary/clock/TickingClockService.adoc[TickingClockService] ) to that of the xref:system:generated:index/applib/services/command/Command.adoc[Command] 's _Command#getTimestamp() timestamp_ before executing the command.
+Override of xref:refguide:applib:index/services/command/CommandExecutorService.adoc[CommandExecutorService] that also sets the time (using the xref:refguide:extensions:index/commandreplay/secondary/clock/TickingClockService.adoc[TickingClockService] ) to that of the xref:refguide:applib:index/services/command/Command.adoc[Command] 's _Command#getTimestamp() timestamp_ before executing the command.
 
 It then delegates down to the default implementation.
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/CalendarEventable.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/CalendarEventable.adoc
index 4f8f410..5e2ed2e 100644
--- a/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/CalendarEventable.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/CalendarEventable.adoc
@@ -26,4 +26,4 @@ The name of the calendar to which this event belongs.
 
 For example, an `Employee` might provide have a `employedOn` , so the calendar name would be "employedOn"
 
-If there is possibly more than one date associated with the entity, then use xref:system:generated:index/extensions/fullcalendar/applib/Calendarable.adoc[Calendarable] instead.
+If there is possibly more than one date associated with the entity, then use xref:refguide:extensions:index/fullcalendar/applib/Calendarable.adoc[Calendarable] instead.
diff --git a/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/spi/CalendarableDereferencingService.adoc b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/spi/CalendarableDereferencingService.adoc
index 55907a1..26c1d96 100644
--- a/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/spi/CalendarableDereferencingService.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/fullcalendar/applib/spi/CalendarableDereferencingService.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Optional SPI service that allows a xref:system:generated:index/extensions/fullcalendar/applib/Calendarable.adoc[Calendarable] or xref:system:generated:index/extensions/fullcalendar/applib/CalendarEventable.adoc[CalendarEventable] object to be translated/dereferenced to some other object, typically its owner. The markers on the calendar then open up the dereferenced object, rather than the original xref:system:generated:index/extensions/fullcalendar/applib/Calendarable.adoc[Calendarable]  [...]
+Optional SPI service that allows a xref:refguide:extensions:index/fullcalendar/applib/Calendarable.adoc[Calendarable] or xref:refguide:extensions:index/fullcalendar/applib/CalendarEventable.adoc[CalendarEventable] object to be translated/dereferenced to some other object, typically its owner. The markers on the calendar then open up the dereferenced object, rather than the original xref:refguide:extensions:index/fullcalendar/applib/Calendarable.adoc[Calendarable] or xref:refguide:extensi [...]
 
 For example, the `incode-module-commchannel` 's `Note` implements `CalendarEventable` , but this service allows the _owner_ of the `Note` (ie the `Notable` ) sto be shown instead.
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/annotation/Model.adoc b/antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/annotation/Model.adoc
index d242939..22f80cd 100644
--- a/antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/annotation/Model.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/modelannotation/applib/annotation/Model.adoc
@@ -2,7 +2,7 @@
 
 Indicates that a method is a supporting-method, one that contributes (hide, validate, ...) to an *Action* .
 
-By placing the xref:system:generated:index/extensions/modelannotation/applib/annotation/Model.adoc[Model] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized and cannot be ignored.
+By placing the xref:refguide:extensions:index/modelannotation/applib/annotation/Model.adoc[Model] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized and cannot be ignored.
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermission.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermission.adoc
index 57a494f..b0d0945 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermission.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermission.adoc
@@ -2,9 +2,9 @@
 
 Specifies how a particular _#getRole() application role_ may interact with a specific _ApplicationFeature application feature_ .
 
-Each permission has a _#getRule() rule_ and a _#getMode() mode_ . The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] determines whether the permission _ApplicationPermissionRule#ALLOW grants_ access to the feature or _ApplicationPermissionRule#VETO veto_ es access to it. The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] indicates whether the rol [...]
+Each permission has a _#getRule() rule_ and a _#getMode() mode_ . The xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] determines whether the permission _ApplicationPermissionRule#ALLOW grants_ access to the feature or _ApplicationPermissionRule#VETO veto_ es access to it. The xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] indicates whether the role can _Applicati [...]
 
-For a given permission, there is an interaction between the xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] and the xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] :
+For a given permission, there is an interaction between the xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] and the xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] :
 
 * for an _ApplicationPermissionRule#ALLOW allow_ , a _ApplicationPermissionMode#CHANGING usability_ allow implies _ApplicationPermissionMode#VIEWING visibility_ allow.
 * conversely, for a _ApplicationPermissionRule#VETO veto_ , a _ApplicationPermissionMode#VIEWING visibility_ veto implies a _ApplicationPermissionMode#CHANGING usability_ veto.
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionMode.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionMode.adoc
index 18bb298..083d470 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionMode.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionMode.adoc
@@ -32,7 +32,7 @@ Whether can user/role can change (or is prevented from changing) the state of th
 
 Whether the user/role can view (or is prevented from viewing) the application feature (class member).
 
-The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:system:generated:index/extensions/secman/api/permission/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
+The xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:refguide:extensions:index/secman/api/permission/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
 
 [#CHANGING]
 === CHANGING
@@ -41,6 +41,6 @@ Whether can user/role can change (or is prevented from changing) the state of th
 
 In other words, whether they can execute (if an action, modify/clear (if a property), addTo/removeFrom (if a collection).
 
-The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:system:generated:index/extensions/secman/api/permission/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
+The xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:refguide:extensions:index/secman/api/permission/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
 
 Note that the Wicket viewer does not at the time of writing (Isis 1.6.0) support the notion of mutable collections. The RO viewer does, however.
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRule.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRule.adoc
index 0719429..3dd1af0 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRule.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionRule.adoc
@@ -32,11 +32,11 @@ The permission prevents the ability to view/use the _ApplicationFeature_ .
 
 The permission grants the ability to view/use the _ApplicationFeature_ .
 
-The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the _ApplicationFeature_ .
+The xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the _ApplicationFeature_ .
 
 [#VETO]
 === VETO
 
 The permission prevents the ability to view/use the _ApplicationFeature_ .
 
-The xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the _ApplicationFeature_ .
+The xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the _ApplicationFeature_ .
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValue.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValue.adoc
index 6241a10..6ea8fd9 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValue.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValue.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-A serializable value object representing an (anonymized) xref:system:generated:index/extensions/secman/api/permission/ApplicationPermission.adoc[ApplicationPermission] .
+A serializable value object representing an (anonymized) xref:refguide:extensions:index/secman/api/permission/ApplicationPermission.adoc[ApplicationPermission] .
 
 Intended for value type arithmetic and also for caching. No user/role information is held because that information is not required to perform the arithmetic.
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValueSet.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValueSet.adoc
index eeb1c8b..16780f7 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValueSet.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/ApplicationPermissionValueSet.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-A serializable value object representing a set of (anonymized) xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionValue.adoc[ApplicationPermissionValue] s.
+A serializable value object representing a set of (anonymized) xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionValue.adoc[ApplicationPermissionValue] s.
 
 Intended for value type arithmetic and also for caching.
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationService.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationService.adoc
index eb440f2..9f612b8 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationService.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/permission/PermissionsEvaluationService.adoc
@@ -2,7 +2,7 @@
 
 Strategy for determining which permission should apply when there are multiple that apply for a particular target feature Id, and which may conflict with each other.
 
-All implementations of this interface must be _java.io.Serializable_ , because an instance is serialized into xref:system:generated:index/extensions/secman/api/permission/ApplicationPermissionValueSet.adoc[ApplicationPermissionValueSet] .
+All implementations of this interface must be _java.io.Serializable_ , because an instance is serialized into xref:refguide:extensions:index/secman/api/permission/ApplicationPermissionValueSet.adoc[ApplicationPermissionValueSet] .
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyEvaluator.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyEvaluator.adoc
index 1563a2f..2dce6ed 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyEvaluator.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/ApplicationTenancyEvaluator.adoc
@@ -27,4 +27,4 @@ Whether this evaluator can determine the tenancy of the specified domain entity
 
 Whether this evaluator can determine the tenancy of the specified domain entity (such as `ToDoItem` ) being interacted with (the "what").
 
-This method is also called to determine if the evaluator is also able to determine the tenancy of the security module's own xref:system:generated:index/extensions/secman/api/user/ApplicationUser.adoc[ApplicationUser] , ie the "who" is doing the interacting. If the evaluator does not handle the class, then the fallback behaviour is to invoke _ApplicationUser#getAtPath()_ } on the xref:system:generated:index/extensions/secman/api/user/ApplicationUser.adoc[ApplicationUser] and use the path  [...]
+This method is also called to determine if the evaluator is also able to determine the tenancy of the security module's own xref:refguide:extensions:index/secman/api/user/ApplicationUser.adoc[ApplicationUser] , ie the "who" is doing the interacting. If the evaluator does not handle the class, then the fallback behaviour is to invoke _ApplicationUser#getAtPath()_ } on the xref:refguide:extensions:index/secman/api/user/ApplicationUser.adoc[ApplicationUser] and use the path from that.
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/HasAtPath.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/HasAtPath.adoc
index 5c3e470..8f1def1 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/HasAtPath.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/api/tenancy/HasAtPath.adoc
@@ -2,11 +2,11 @@
 
 Role interface for domain objects to implement, indicating that these are characteristics of the entity that can be used to determine its visibility/editability.object's tenancyuser's tenancyaccessnullnulleditablenullnon-nulleditable//editable//itvisible//it/carvisible//it/iglvisible//frvisible/nullnot visible/it/editable/it/iteditable/it/it/carvisible/it/it/iglvisible/it/frnot visible/itnullnot visible/it/car/editable/it/car/iteditable/it/car/it/careditable/it/car/it/iglnot visible/it/c [...]
 
-Previously the `atPath` would have corresponded to the unique path of some particular xref:system:generated:index/extensions/secman/api/tenancy/ApplicationTenancy.adoc[ApplicationTenancy] instance. However, this has now been generalized; the atPath is simply a string whose interpretation is application-specific (in particular by the xref:system:generated:index/extensions/secman/api/tenancy/ApplicationTenancyEvaluator.adoc[ApplicationTenancyEvaluator] SPI).
+Previously the `atPath` would have corresponded to the unique path of some particular xref:refguide:extensions:index/secman/api/tenancy/ApplicationTenancy.adoc[ApplicationTenancy] instance. However, this has now been generalized; the atPath is simply a string whose interpretation is application-specific (in particular by the xref:refguide:extensions:index/secman/api/tenancy/ApplicationTenancyEvaluator.adoc[ApplicationTenancyEvaluator] SPI).
 
-For applications that still wish to follow the original more specific design (that the `atPath` corresponds to a single xref:system:generated:index/extensions/secman/api/tenancy/ApplicationTenancy.adoc[ApplicationTenancy] ), then the path can be interpreted according to the following table:
+For applications that still wish to follow the original more specific design (that the `atPath` corresponds to a single xref:refguide:extensions:index/secman/api/tenancy/ApplicationTenancy.adoc[ApplicationTenancy] ), then the path can be interpreted according to the following table:
 
-any object that is not tenanted (that is, its class does not implement xref:system:generated:index/extensions/secman/api/tenancy/HasAtPath.adoc[HasAtPath] is accessible by any user (usual permission rules apply).
+any object that is not tenanted (that is, its class does not implement xref:refguide:extensions:index/secman/api/tenancy/HasAtPath.adoc[HasAtPath] is accessible by any user (usual permission rules apply).
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
index c5819de..73db5f2 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-This fixture script will be run automatically on start-up by virtue of the fact that the xref:system:generated:index/extensions/secman/jdo/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
+This fixture script will be run automatically on start-up by virtue of the fact that the xref:refguide:extensions:index/secman/jdo/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
index 3221201..61965f3 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Role for regular users of the security module, providing the ability to lookup their user account using the xref:system:generated:index/extensions/secman/model/app/user/MeService.adoc[MeService] , and for viewing and maintaining their user details.
+Role for regular users of the security module, providing the ability to lookup their user account using the xref:refguide:extensions:index/secman/model/app/user/MeService.adoc[MeService] , and for viewing and maintaining their user details.
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
index 6c85f85..d9c0881 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-This fixture script will be run automatically on start-up by virtue of the fact that the xref:system:generated:index/extensions/secman/jpa/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
+This fixture script will be run automatically on start-up by virtue of the fact that the xref:refguide:extensions:index/secman/jpa/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
index 3221201..61965f3 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Role for regular users of the security module, providing the ability to lookup their user account using the xref:system:generated:index/extensions/secman/model/app/user/MeService.adoc[MeService] , and for viewing and maintaining their user details.
+Role for regular users of the security module, providing the ability to lookup their user account using the xref:refguide:extensions:index/secman/model/app/user/MeService.adoc[MeService] , and for viewing and maintaining their user details.
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
index 1e101de..17a11fa 100644
--- a/antora/components/refguide/modules/extensions/pages/index/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/secman/jpa/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-An abstract implementation of xref:system:generated:index/applib/services/userreg/UserRegistrationService.adoc[UserRegistrationService] with a single abstract method for the initial role of newly created local users
+An abstract implementation of xref:refguide:applib:index/services/userreg/UserRegistrationService.adoc[UserRegistrationService] with a single abstract method for the initial role of newly created local users
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc b/antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc
index 4b73e61..012a73a 100644
--- a/antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapContextFactory.adoc
@@ -2,7 +2,7 @@
 
 An extension of _JndiLdapContextFactory_ that allows a different authentication mechanism for system-level authentications (as used by authorization lookups, for example) compared to regular authentication.
 
-See xref:system:generated:index/extensions/shirorealmldap/realm/impl/IsisLdapRealm.adoc[IsisLdapRealm] for typical configuration within `shiro.ini` .
+See xref:refguide:extensions:index/shirorealmldap/realm/impl/IsisLdapRealm.adoc[IsisLdapRealm] for typical configuration within `shiro.ini` .
 
 == API
 
diff --git a/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc
index c96fdcb..54763d7 100644
--- a/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc
+++ b/antora/components/refguide/modules/extensions/pages/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-_ComponentFactory_ for xref:system:generated:index/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc[CollectionContentsAsExcel] .
+_ComponentFactory_ for xref:refguide:extensions:index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.adoc[CollectionContentsAsExcel] .
 
 == API
 
diff --git a/antora/components/refguide/modules/subdomains/pages/index/base/applib/Chained.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/Chained.adoc
index c0cabae..2fb1557 100644
--- a/antora/components/refguide/modules/subdomains/pages/index/base/applib/Chained.adoc
+++ b/antora/components/refguide/modules/subdomains/pages/index/base/applib/Chained.adoc
@@ -14,12 +14,12 @@ interface Chained<T> {
 <.> xref:#getPrevious__[getPrevious()]
 +
 --
-The object (usually an xref:system:generated:index/subdomains/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that precedes this one, if any (not necessarily contiguously)..
+The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that precedes this one, if any (not necessarily contiguously)..
 --
 <.> xref:#getNext__[getNext()]
 +
 --
-The object (usually an xref:system:generated:index/subdomains/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that succeeds this one, if any (not necessarily contiguously).
+The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that succeeds this one, if any (not necessarily contiguously).
 --
 
 == Members
@@ -27,13 +27,13 @@ The object (usually an xref:system:generated:index/subdomains/base/applib/with/W
 [#getPrevious__]
 === getPrevious()
 
-The object (usually an xref:system:generated:index/subdomains/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that precedes this one, if any (not necessarily contiguously)..
+The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that precedes this one, if any (not necessarily contiguously)..
 
-Implementations where successive intervals are contiguous should instead implement xref:system:generated:index/subdomains/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] .
+Implementations where successive intervals are contiguous should instead implement xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] .
 
 [#getNext__]
 === getNext()
 
-The object (usually an xref:system:generated:index/subdomains/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that succeeds this one, if any (not necessarily contiguously).
+The object (usually an xref:refguide:subdomains:index/base/applib/with/WithInterval.adoc[WithInterval] , but not necessarily) that succeeds this one, if any (not necessarily contiguously).
 
-Implementations where successive intervals are contiguous should instead implement xref:system:generated:index/subdomains/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] .
+Implementations where successive intervals are contiguous should instead implement xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] .
diff --git a/antora/components/refguide/modules/subdomains/pages/index/base/applib/TitledEnum.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
index dee99f9..f5ad40b 100644
--- a/antora/components/refguide/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
+++ b/antora/components/refguide/modules/subdomains/pages/index/base/applib/TitledEnum.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-An enum that implements xref:system:generated:index/subdomains/base/applib/Titled.adoc[Titled] and moreover its _#title()_ is derived according to the _StringUtils#enumTitle(String)_ algorithm.
+An enum that implements xref:refguide:subdomains:index/base/applib/Titled.adoc[Titled] and moreover its _#title()_ is derived according to the _StringUtils#enumTitle(String)_ algorithm.
 
 == API
 
diff --git a/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
index 9efedca..d699af1 100644
--- a/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
+++ b/antora/components/refguide/modules/subdomains/pages/index/base/applib/with/WithIntervalContiguous.adoc
@@ -25,7 +25,7 @@ The interval that immediately succeeds this one, if any.
 <.> xref:#getTimeline__[getTimeline()]
 +
 --
-Show this xref:system:generated:index/subdomains/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] in context with its predecessors and successors.
+Show this xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] in context with its predecessors and successors.
 --
 
 == Members
@@ -37,7 +37,7 @@ The interval that immediately precedes this one, if any.
 
 The predecessor's _#getEndDate() end date_ is the day before this interval's _#getStartDate() start date_ .
 
-Implementations where successive intervals are NOT contiguous should instead implement xref:system:generated:index/subdomains/base/applib/Chained.adoc[Chained] .
+Implementations where successive intervals are NOT contiguous should instead implement xref:refguide:subdomains:index/base/applib/Chained.adoc[Chained] .
 
 [#getSuccessor__]
 === getSuccessor()
@@ -46,11 +46,11 @@ The interval that immediately succeeds this one, if any.
 
 The successor's _#getStartDate() start date_ is the day after this interval's _#getEndDate() end date_ .
 
-Implementations where successive intervals are NOT contiguous should instead implement xref:system:generated:index/subdomains/base/applib/Chained.adoc[Chained] .
+Implementations where successive intervals are NOT contiguous should instead implement xref:refguide:subdomains:index/base/applib/Chained.adoc[Chained] .
 
 [#getTimeline__]
 === getTimeline()
 
-Show this xref:system:generated:index/subdomains/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] in context with its predecessors and successors.
+Show this xref:refguide:subdomains:index/base/applib/with/WithIntervalContiguous.adoc[WithIntervalContiguous] in context with its predecessors and successors.
 
 This will typically (always) be a derived collection obtained by filtering a collection of the "parent".
diff --git a/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelServiceImpl.adoc b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelServiceImpl.adoc
index 4e5196f..f64a588 100644
--- a/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelServiceImpl.adoc
+++ b/antora/components/refguide/modules/subdomains/pages/index/excel/applib/dom/util/ExcelServiceImpl.adoc
@@ -43,12 +43,12 @@ As _#toExcel(List, Class, String, String)_ , but appends a single-sheet spreadsh
 <.> xref:#toExcel__WorksheetContent_String[toExcel(WorksheetContent, String)]
 +
 --
-As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:system:generated:index/subdomains/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] .
+As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:refguide:subdomains:index/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] .
 --
 <.> xref:#toExcel__WorksheetContent_String_InputStream[toExcel(WorksheetContent, String, InputStream)]
 +
 --
-As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:system:generated:index/subdomains/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] and with an input stream.
+As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:refguide:subdomains:index/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] and with an input stream.
 --
 <.> xref:#toExcel__List_String[toExcel(List, String)]
 +
@@ -73,7 +73,7 @@ Returns a list of objects for each line in the spreadsheet, of the specified typ
 <.> xref:#fromExcel__Blob_WorksheetSpec[fromExcel(Blob, WorksheetSpec)]
 +
 --
-As _#fromExcel(Blob, Class, String)_ , but specifying the class name and sheet name by way of a xref:system:generated:index/subdomains/excel/applib/dom/WorksheetSpec.adoc[WorksheetSpec] .
+As _#fromExcel(Blob, Class, String)_ , but specifying the class name and sheet name by way of a xref:refguide:subdomains:index/excel/applib/dom/WorksheetSpec.adoc[WorksheetSpec] .
 --
 <.> xref:#fromExcel__Blob_List[fromExcel(Blob, List)]
 +
@@ -98,12 +98,12 @@ As _#toExcel(List, Class, String, String)_ , but appends a single-sheet spreadsh
 [#toExcel__WorksheetContent_String]
 === toExcel(WorksheetContent, String)
 
-As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:system:generated:index/subdomains/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] .
+As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:refguide:subdomains:index/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] .
 
 [#toExcel__WorksheetContent_String_InputStream]
 === toExcel(WorksheetContent, String, InputStream)
 
-As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:system:generated:index/subdomains/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] and with an input stream.
+As _#toExcel(List, Class, String, String)_ , but with the domain objects, class and sheet name provided using a xref:refguide:subdomains:index/excel/applib/dom/WorksheetContent.adoc[WorksheetContent] and with an input stream.
 
 [#toExcel__List_String]
 === toExcel(List, String)
@@ -122,9 +122,9 @@ Creates a Blob holding a single-sheet spreadsheet with a pivot of the domain obj
 
 Minimal requirements for the domain object are:
 
-* One property has annotation xref:system:generated:index/subdomains/excel/applib/dom/PivotRow.adoc[PivotRow] and will be used as row identifier in left column of pivot. Empty values are supported.
-* At least one property has annotation xref:system:generated:index/subdomains/excel/applib/dom/PivotColumn.adoc[PivotColumn] . Its values will be used in columns of pivot. Empty values are supported.
-* At least one property has annotation xref:system:generated:index/subdomains/excel/applib/dom/PivotValue.adoc[PivotValue] . Its values will be distributed in the pivot.
+* One property has annotation xref:refguide:subdomains:index/excel/applib/dom/PivotRow.adoc[PivotRow] and will be used as row identifier in left column of pivot. Empty values are supported.
+* At least one property has annotation xref:refguide:subdomains:index/excel/applib/dom/PivotColumn.adoc[PivotColumn] . Its values will be used in columns of pivot. Empty values are supported.
+* At least one property has annotation xref:refguide:subdomains:index/excel/applib/dom/PivotValue.adoc[PivotValue] . Its values will be distributed in the pivot.
 
 [#fromExcel__Blob_Class_String]
 === fromExcel(Blob, Class, String)
@@ -136,7 +136,7 @@ If the class is a view model then the objects will be properly instantiated, wit
 [#fromExcel__Blob_WorksheetSpec]
 === fromExcel(Blob, WorksheetSpec)
 
-As _#fromExcel(Blob, Class, String)_ , but specifying the class name and sheet name by way of a xref:system:generated:index/subdomains/excel/applib/dom/WorksheetSpec.adoc[WorksheetSpec] .
+As _#fromExcel(Blob, Class, String)_ , but specifying the class name and sheet name by way of a xref:refguide:subdomains:index/excel/applib/dom/WorksheetSpec.adoc[WorksheetSpec] .
 
 [#fromExcel__Blob_List]
 === fromExcel(Blob, List)
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
index c709906..272e8d1 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/JsonRepresentation.adoc
@@ -320,17 +320,17 @@ Indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull(
 <.> xref:#getNull__String[getNull(String)]
 +
 --
-Either returns a xref:system:generated:index/viewer/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
+Either returns a xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
 --
 <.> xref:#asNull__[asNull()]
 +
 --
-Either returns a xref:system:generated:index/viewer/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
+Either returns a xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
 --
 <.> xref:#mapValueAsLink__[mapValueAsLink()]
 +
 --
-Convert a representation that contains a single node representing a link into a xref:system:generated:index/viewer/restfulobjects/applib/LinkRepresentation.adoc[LinkRepresentation] .
+Convert a representation that contains a single node representing a link into a xref:refguide:viewer:index/restfulobjects/applib/LinkRepresentation.adoc[LinkRepresentation] .
 --
 <.> xref:#as__Class[as(Class)]
 +
@@ -523,21 +523,21 @@ Indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull(
 [#getNull__String]
 === getNull(String)
 
-Either returns a xref:system:generated:index/viewer/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
+Either returns a xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
 
 Use _#isNull(String)_ to check first, if required.
 
 [#asNull__]
 === asNull()
 
-Either returns a xref:system:generated:index/viewer/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
+Either returns a xref:refguide:viewer:index/restfulobjects/applib/JsonRepresentation.adoc[JsonRepresentation] that indicates that the wrapped node has `null` value (ie _JsonRepresentation#isNull()_ ), or returns `null` if there was no node with the provided path.
 
 Use _#isNull()_ to check first, if required.
 
 [#mapValueAsLink__]
 === mapValueAsLink()
 
-Convert a representation that contains a single node representing a link into a xref:system:generated:index/viewer/restfulobjects/applib/LinkRepresentation.adoc[LinkRepresentation] .
+Convert a representation that contains a single node representing a link into a xref:refguide:viewer:index/restfulobjects/applib/LinkRepresentation.adoc[LinkRepresentation] .
 
 [#as__Class]
 === as(Class)
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/Rel.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/Rel.adoc
index 1ac309c..3803a00 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/Rel.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/Rel.adoc
@@ -56,7 +56,7 @@ enum Rel {
 <.> xref:#andParam__String_String[andParam(String, String)]
 +
 --
-For those xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel] s that also take a param
+For those xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel] s that also take a param
 --
 
 == Members
@@ -64,4 +64,4 @@ For those xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel]
 [#andParam__String_String]
 === andParam(String, String)
 
-For those xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel] s that also take a param
+For those xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel] s that also take a param
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RelDefinition.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RelDefinition.adoc
index 8b2d992..c881b8d 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RelDefinition.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RelDefinition.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Enumerates the organization that defined a xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel] .
+Enumerates the organization that defined a xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel] .
 
 == API
 
@@ -19,12 +19,12 @@ enum RelDefinition {
 <.> xref:#IANA[IANA]
 +
 --
-xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel] defined by IANA.
+xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel] defined by IANA.
 --
 <.> xref:#RO_SPEC[RO_SPEC]
 +
 --
-xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel] defined by the Restful Objects spec.
+xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel] defined by the Restful Objects spec.
 --
 <.> xref:#IMPL[IMPL]
 +
@@ -37,12 +37,12 @@ Proprietary rel defined by implementation.
 [#IANA]
 === IANA
 
-xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel] defined by IANA.
+xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel] defined by IANA.
 
 [#RO_SPEC]
 === RO_SPEC
 
-xref:system:generated:index/viewer/restfulobjects/applib/Rel.adoc[Rel] defined by the Restful Objects spec.
+xref:refguide:viewer:index/restfulobjects/applib/Rel.adoc[Rel] defined by the Restful Objects spec.
 
 [#IMPL]
 === IMPL
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RepresentationType.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RepresentationType.adoc
index 4952af5..27b6591 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RepresentationType.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/RepresentationType.adoc
@@ -68,12 +68,12 @@ Clones the (immutable) _#getMediaType() media type_ , adding in one additional p
 <.> xref:#matchesXmlProfileWithParameter__List_String[matchesXmlProfileWithParameter(List, String)]
 +
 --
-whether any of the xref:system:generated:index/viewer/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) XML _MediaType_ with specified parameter.
+whether any of the xref:refguide:viewer:index/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) XML _MediaType_ with specified parameter.
 --
 <.> xref:#matchesJsonProfileWithParameter__List_String[matchesJsonProfileWithParameter(List, String)]
 +
 --
-whether any of the xref:system:generated:index/viewer/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) JSON _MediaType_ with specified parameter.
+whether any of the xref:refguide:viewer:index/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) JSON _MediaType_ with specified parameter.
 --
 
 == Members
@@ -96,9 +96,9 @@ Clones the (immutable) _#getMediaType() media type_ , adding in one additional p
 [#matchesXmlProfileWithParameter__List_String]
 === matchesXmlProfileWithParameter(List, String)
 
-whether any of the xref:system:generated:index/viewer/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) XML _MediaType_ with specified parameter.
+whether any of the xref:refguide:viewer:index/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) XML _MediaType_ with specified parameter.
 
 [#matchesJsonProfileWithParameter__List_String]
 === matchesJsonProfileWithParameter(List, String)
 
-whether any of the xref:system:generated:index/viewer/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) JSON _MediaType_ with specified parameter.
+whether any of the xref:refguide:viewer:index/restfulobjects/applib/RepresentationType.adoc[RepresentationType] s matches any (accept header) JSON _MediaType_ with specified parameter.
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc
index 703ead5..997b8c6 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/applib/domainobjects/DomainObjectMemberRepresentation.adoc
@@ -1,8 +1,8 @@
 :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 [...]
 
-Represents the members within the xref:system:generated:index/viewer/restfulobjects/applib/domainobjects/DomainObjectRepresentation.adoc[DomainObjectRepresentation] 's `members` map.
+Represents the members within the xref:refguide:viewer:index/restfulobjects/applib/domainobjects/DomainObjectRepresentation.adoc[DomainObjectRepresentation] 's `members` map.
 
-Do not confuse with the subclasses of xref:system:generated:index/viewer/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.adoc[AbstractObjectMemberRepresentation] , which are standalone representations in their own right.
+Do not confuse with the subclasses of xref:refguide:viewer:index/restfulobjects/applib/domainobjects/AbstractObjectMemberRepresentation.adoc[AbstractObjectMemberRepresentation] , which are standalone representations in their own right.
 
 == API
 
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc
index 4fbeeff..61ad0e2 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.adoc
@@ -19,7 +19,7 @@ class RepresentationServiceContentNegotiator {
 <.> xref:#buildResponse__Function[buildResponse(Function)]
 +
 --
-Iterates over all _#contentNegotiationServices injected_ xref:system:generated:index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc[ContentNegotiationService] s to find one that returns a _ResponseBuilder_ using the provided function.
+Iterates over all _#contentNegotiationServices injected_ xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc[ContentNegotiationService] s to find one that returns a _ResponseBuilder_ using the provided function.
 --
 
 == Members
@@ -27,6 +27,6 @@ Iterates over all _#contentNegotiationServices injected_ xref:system:generated:i
 [#buildResponse__Function]
 === buildResponse(Function)
 
-Iterates over all _#contentNegotiationServices injected_ xref:system:generated:index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc[ContentNegotiationService] s to find one that returns a _ResponseBuilder_ using the provided function.
+Iterates over all _#contentNegotiationServices injected_ xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc[ContentNegotiationService] s to find one that returns a _ResponseBuilder_ using the provided function.
 
-There will always be at least one such service, namely the xref:system:generated:index/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc[ContentNegotiationServiceForRestfulObjectsV1_0] .
+There will always be at least one such service, namely the xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc[ContentNegotiationServiceForRestfulObjectsV1_0] .
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
index ac4db2a..7f80f89 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc
@@ -55,7 +55,7 @@ Action invocation is supported provided it returns a single domain object or a l
 
 Unlike RO v1.0, use a single content-type of `application/json;profile="urn:org.apache.isis/v2"` .
 
-The response content types xref:system:generated:index/applib/client/RepresentationTypeSimplifiedV2.adoc[RepresentationTypeSimplifiedV2] append the 'repr-type' parameter.
+The response content types xref:refguide:applib:index/client/RepresentationTypeSimplifiedV2.adoc[RepresentationTypeSimplifiedV2] append the 'repr-type' parameter.
 
 [#buildResponse__IResourceContext_ManagedObject]
 === buildResponse(IResourceContext, ManagedObject)
diff --git a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc
index 9bd6698..9f0a396 100644
--- a/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc
+++ b/antora/components/refguide/modules/viewer/pages/index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc
@@ -1,6 +1,6 @@
 :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 [...]
 
-Handles content negotiation for accept headers requiring `application/json` or `application/xml` and specifying an x-ro-domain-type; will delegate to any available xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[ContentMappingService] s to (try to) map the result object into the required representation if possible.
+Handles content negotiation for accept headers requiring `application/json` or `application/xml` and specifying an x-ro-domain-type; will delegate to any available xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[ContentMappingService] s to (try to) map the result object into the required representation if possible.
 
 In the accept header the profile is also checked dependent on the resource being invoked; either `profile="urn:org.restfulobjects:repr-types/object"` for an object representation, or `profile="profile=urn:org.restfulobjects:repr-types/action-result"` for an action result.
 
@@ -21,12 +21,12 @@ class ContentNegotiationServiceXRoDomainType {
 <.> xref:#buildResponse__IResourceContext_ManagedObject[buildResponse(IResourceContext, ManagedObject)]
 +
 --
-search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto` 
+search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto`
 --
 <.> xref:#buildResponse__IResourceContext_ObjectAndActionInvocation[buildResponse(IResourceContext, ObjectAndActionInvocation)]
 +
 --
-search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto` 
+search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto`
 --
 
 == Members
@@ -34,9 +34,9 @@ search for an accept header in form `application/xml;profile=urn:org.restfulobje
 [#buildResponse__IResourceContext_ManagedObject]
 === buildResponse(IResourceContext, ManagedObject)
 
-search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto` 
+search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto`
 
 [#buildResponse__IResourceContext_ObjectAndActionInvocation]
 === buildResponse(IResourceContext, ObjectAndActionInvocation)
 
-search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto` 
+search for an accept header in form `application/xml;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=todoapp.dto.module.todoitem.ToDoItemDto`
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 e8f3843..8b6e175 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: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:index/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:system:generated:index/applib/annotation/ParameterLayout.adoc#named[`@ParameterLayout#named()`]
+* no longer any need to specify xref:refguide:applib:index/annotation/ParameterLayout.adoc#named[`@ParameterLayout#named()`]
 * security integration with xref:security:keycloak:about.adoc[Keycloak]
 
 * New value types:
diff --git a/antora/playbooks/site-tooling.yml b/antora/playbooks/site-tooling.yml
index e32af13..f691905 100644
--- a/antora/playbooks/site-tooling.yml
+++ b/antora/playbooks/site-tooling.yml
@@ -31,7 +31,7 @@ content:
       start_path: antora/components/comguide # comguide
       branches: HEAD
     - url: .
-      start_path: antora/components/system # system
+      start_path: antora/components/refguide # refguide
       branches: HEAD
 
 # core
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 9ecf72e..a9394ac 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -40,7 +40,7 @@ content:
       start_path: antora/components/setupguide # setupguide
       branches: HEAD
     - url: .
-      start_path: antora/components/system # system
+      start_path: antora/components/refguide # refguide
       branches: HEAD
 
 # api
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 40dee42..e74a449 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:system:generated:index/applib/annotation/Action.adoc#semantics[`@Action#semantics`] attribute:
+One way to meet this requirement is using the framework's built-in xref:refguide:applib:index/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 04709e1..f4fbe86 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
@@ -21,8 +21,8 @@ When clicking the back button in the browser the user sees "Object not found" (s
 And refresh the current page when receiving a null response or invoking a void action.
 But how to implement this?_
 
-One way to implement this idea is to provide a custom implementation of the xref:system:generated:index/applib/services/routing/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:system:generated:index/applib/annotation/HomePage.adoc[`@HomePage`]) if one exists.
+One way to implement this idea is to provide a custom implementation of the xref:refguide:applib:index/services/routing/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:index/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 82fc0bc..8177064 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
@@ -11,13 +11,13 @@ From this link:http://isis.markmail.org/thread/dduarjscrbnodfsi[thread] on the A
 * _What is the easiest way to add a spell checker to the text written in a field in
    a domain object, for instance to check English syntax?_
 
-One way to implement is to use the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[event bus]:
+One way to implement is to use the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[event bus]:
 
 * 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:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent`].
+* if the change is made through an action, you can use xref:refguide:applib:index/annotation/Action.adoc#domainEvent[`@Action#domainEvent`].
 
-if if the change is made through an edit, you can use xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent`].
+if if the change is made through an edit, you can use xref:refguide:applib:index/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/replacing-default-service-implementations.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
index 8fe323c..c66e75d 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
@@ -9,7 +9,7 @@
 The framework provides default implementations for many of the xref:refguide:applib-svc:about.adoc[domain services].
 This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.
 
-For example, suppose you wanted to provide your own implementation of xref:system:generated:index/applib/services/i18n/LocaleProvider.adoc[`LocaleProvider`].
+For example, suppose you wanted to provide your own implementation of xref:refguide:applib:index/services/i18n/LocaleProvider.adoc[`LocaleProvider`].
 The trick is to use the Spring link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[`@Order`] annotation or equivalent mechanism.
 
 Here's how:
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 b01ed44..4375126 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: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.
+NOTE: FIXME -  easiest to simply store using DataNucleus' support for collections, marked as xref:refguide:applib:index/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/btb/pages/hints-and-tips/transactions-and-errors.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
index 8c0e3bf..2b5b169 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
@@ -11,7 +11,7 @@ Indeed, if you do try to manage transactions (eg by reaching into the JDO `Persi
 
 However, you can complete a given transaction and start a new one.
 This is sometimes useful if writing a xref:testing:fixtures:about.adoc#fixture-scripts[fixture script] which is going to perform some sort of bulk migration of data from an old system.
-For this use case, use the xref:system:generated:index/applib/services/xactn/TransactionService.adoc[`TransactionService`].
+For this use case, use the xref:refguide:applib:index/services/xactn/TransactionService.adoc[`TransactionService`].
 
 For example:
 
@@ -35,7 +35,7 @@ public class SomeLongRunningFixtureScript extends FixtureScript
 
 == Raise message in the UI
 
-The framework provides the xref:system:generated:index/applib/services/message/MessageService.adoc[`MessageService`] as a means to return an out-of-band message to the end-user.
+The framework provides the xref:refguide:applib:index/services/message/MessageService.adoc[`MessageService`] as a means to return an out-of-band message to the end-user.
 In the xref:vw:ROOT:about.adoc[Wicket viewer] these are shown as "toast" pop-ups; the
 xref:vro:ROOT:about.adoc[Restful Objects viewer] returns an HTTP header.
 
@@ -64,7 +64,7 @@ If however you want to indicate that the exception is in some sense "expected",
 Another way in which exceptions might be considered "expected" could be as the result of attempting to persist an object which then violates some type of database constraint.
 Even if the domain application checks beforehand, it could be that another user operating on the object at the same moment of time might result in the conflict.
 
-To handle this the xref:system:generated:index/applib/services/exceprecog/ExceptionRecognizerService.adoc[`ExceptionRecognizer`] SPI can be used.
+To handle this the xref:refguide:applib:index/services/exceprecog/ExceptionRecognizerService.adoc[`ExceptionRecognizer`] SPI can be used.
 The framework provides a number of implementations out-of-the-box; whenever an exception is thrown it is passed to each known recognizer implementation to see if it recognizes the exception and can return a user-meaningful error message.
 For example, `ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException` checks if the exception inherits from `java.sql.SQLIntegrityConstraintViolationException`, and if so, constructs a suitable message.
 
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
index 60ec495..7862957 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
@@ -5,7 +5,7 @@
 :page-partial:
 
 
-NOTE: FIXME - a write-up of the "vetoing subscriber" design pattern, eg as described in the  xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`]
+NOTE: FIXME - a write-up of the "vetoing subscriber" design pattern, eg as described in the  xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`]
 
 
 eg if included an addon such as auditing or security.
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc b/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
index 3049971..ee990f8 100644
--- a/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
+++ b/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.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 [...]
 :page-partial:
 
-The xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`] service
+The xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`] service
 covers all use-cases for programmatic view model creation and takes care,
 that all injection points are resolved for the resulting view model instance.
 
@@ -28,7 +28,7 @@ If it is, then we should probably remove FactoryService#create(...) for view mod
 With view models, some care must be taken in how they are instantiated.
 Specifically, it's important that the framework doesn't "know" about the view model until its state is "sufficiently" populated to distinguish from other view models.
 
-In practical terms, this means that view models should be instantiated using a constructor, and then injecting services (if required) using the xref:system:generated:index/applib/services/registry/ServiceRegistry.adoc[`ServiceRegistry`] service:
+In practical terms, this means that view models should be instantiated using a constructor, and then injecting services (if required) using the xref:refguide:applib:index/services/registry/ServiceRegistry.adoc[`ServiceRegistry`] service:
 
 [source,java]
 ----
@@ -36,7 +36,7 @@ CustomerViewModel viewModel = new CustomerViewModel("Joe", "Bloggs");
 serviceInjector.injectServicesInto(viewModel);
 ----
 
-What will most likely *fail* is to use the xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`]:
+What will most likely *fail* is to use the xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`]:
 
 
 [source,java]
diff --git a/api/adoc/userguide/modules/btb/pages/i18n.adoc b/api/adoc/userguide/modules/btb/pages/i18n.adoc
index d831cf1..2d51e69 100644
--- a/api/adoc/userguide/modules/btb/pages/i18n.adoc
+++ b/api/adoc/userguide/modules/btb/pages/i18n.adoc
@@ -56,7 +56,7 @@ In fact, it isn't even necessary for there to be any `.po` files; `.po` translat
 
 The main API is the `TranslationService`:
 
-* xref:system:generated:index/applib/services/i18n/TranslationService.adoc[leveloffset=+2]
+* xref:refguide:applib:index/services/i18n/TranslationService.adoc[leveloffset=+2]
 
 The `translate(...)` methods are closely modelled on GNU's gettext API.
 The first version is used when no translation is required, the second is when both a singular and plural form will be required, with the `num` parameter being used to select which is returned.
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 a47c3d1..971302d 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: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.
+This policy can be overridden for an individual property using the xref:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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 50ff45b..e0bd9f5 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:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`] or xref:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[`@Property#mustSatisfy()`] attributes.
+The reference guide also explains how to define validation declaratively, using the xref:refguide:applib:index/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`] or xref:refguide:applib:index/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/apache-isis-vs-cqrs-and-event-sourcing.adoc b/api/adoc/userguide/modules/fun/pages/concepts-patterns/apache-isis-vs-cqrs-and-event-sourcing.adoc
index 748c676..83eac95 100644
--- a/api/adoc/userguide/modules/fun/pages/concepts-patterns/apache-isis-vs-cqrs-and-event-sourcing.adoc
+++ b/api/adoc/userguide/modules/fun/pages/concepts-patterns/apache-isis-vs-cqrs-and-event-sourcing.adoc
@@ -52,9 +52,9 @@ In such cases there is still only a single physical datastore, and so transactio
 If you want to go all-in with CQRS with separate databases for the write and read model, then this could still be implemented with Apache Isis without pulling the framework apart too much.
 Here, Apache Isis would be used to provide the UI for the _read_ model, with the entities being truly immutable.
 Mixins would decorate these entities, but would act upon a write model whose persistence is handled outside of Apache Isis, probably using Spring Boot directly to provide a datasource.
-To synchronise the write- and read- model, the events emitted by xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] could be used.
+To synchronise the write- and read- model, the events emitted by xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] could be used.
 
-With respect to commands, Apache Isis provides the xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] which allows each business action to be reified into a `Command`.
+With respect to commands, Apache Isis provides the xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] which allows each business action to be reified into a `Command`.
 However, names are misleading here: Apache Isis' commands are relatively passive, merely recording the intent of the user to invoke some operation.
 In a CQRS architecture, commands take a more active role, locating and acting upon the domain objects.
 More significantly, in CQRS each command has its own class, such as `PlaceOrderCommand`, instantiated by the client and then executed.
@@ -87,7 +87,7 @@ But in any case the roadmap is to support JPA as well as JDO, indeed as you read
 
 As with a CQRS architecture, Apache xref:userguide:fun:mixins.adoc[mixins] would be the obvious way to associate behaviour with an event sourced entity.
 These mixins would most likely delegate to an event sourcing framework such as link:https://axoniq.io/[Axon] to do the work.
-Also, in Apache Isis every business action (and indeed, property and collection) emits domain events through the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`], and can optionally also be published through the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
+Also, in Apache Isis every business action (and indeed, property and collection) emits domain events through the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`], and can optionally also be published through the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
 These features could also have a role to play in an event sourced system.
 
 
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/architecture.adoc b/api/adoc/userguide/modules/fun/pages/concepts-patterns/architecture.adoc
index 9a9eb99..9c0edf7 100644
--- a/api/adoc/userguide/modules/fun/pages/concepts-patterns/architecture.adoc
+++ b/api/adoc/userguide/modules/fun/pages/concepts-patterns/architecture.adoc
@@ -94,4 +94,4 @@ Apache Isis' support for contributions (not only contributed actions, but also c
 And again, to loop back to the topic of this section, it's an AOP concept that being implemented by the framework.
 
 The nice thing about aspect orientation is that for the most part you can ignore these cross-cutting concerns and - at least initially - just focus on implementing your domain object.
-Later when your app starts to grow and you start to break it out into smaller modules, you can leverage Apache Isis' AOP support for xref:userguide:fun:overview.adoc#mixins[mixins] and interceptors (using the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[event bus]) to ensure that your codebase remains maintainable.
+Later when your app starts to grow and you start to break it out into smaller modules, you can leverage Apache Isis' AOP support for xref:userguide:fun:overview.adoc#mixins[mixins] and interceptors (using the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[event bus]) to ensure that your codebase remains maintainable.
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 fae1715..41fdd0e 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:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] SPI enables custom auditing, and the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI enables custom publishing.
+For example, the xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] SPI enables custom auditing, and the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] 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/crud.adoc b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc
index 905a52d..0488453 100644
--- a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc
+++ b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc
@@ -6,13 +6,13 @@
 
 
 This chapter shows the idioms for creating, reading, updating and deleting xref:userguide:fun:overview.adoc#domain-entities[domain entities].
-The main domain services used for this are xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`] and xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`].
+The main domain services used for this are xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`] and xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`].
 
 
 [[instantiating]]
 == Instantiating
 
-Domain entities can be instantiated using the xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`] provided by the framework.
+Domain entities can be instantiated using the xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`] provided by the framework.
 For example:
 
 [source,java]
@@ -39,8 +39,8 @@ public class Customer {
 }
 ----
 
-In such cases, the domain object cannot be instantiated using xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`].
-Instead the xref:system:generated:index/applib/services/inject/ServiceInjector.adoc[`ServiceInjector`] service can be used to inject services:
+In such cases, the domain object cannot be instantiated using xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`].
+Instead the xref:refguide:applib:index/services/inject/ServiceInjector.adoc[`ServiceInjector`] service can be used to inject services:
 
 [source,java]
 ----
@@ -62,7 +62,7 @@ Note though that this does _not_ raise any lifecycle event.
 [[persisting]]
 == Persisting
 
-Once a domain entity has been instantiated and initialized, it can be persisted using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`].
+Once a domain entity has been instantiated and initialized, it can be persisted using the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`].
 
 For example:
 
@@ -100,7 +100,7 @@ Note that the `persist()` returns the object passed to it.
 
 It's worth being aware that the framework does _not_ eagerly persist the object.
 Rather, it queues up an internal command structure representing the object persistence request.
-This is then executed either at the end of the transaction, or if a xref:userguide:fun:domain-entities-and-services.adoc#finding[query is run], or if the internal queue is manually flushed using xref:system:generated:index/applib/services/xactn/TransactionService.adoc[`TransactionService`]'s `flush()` method.
+This is then executed either at the end of the transaction, or if a xref:userguide:fun:domain-entities-and-services.adoc#finding[query is run], or if the internal queue is manually flushed using xref:refguide:applib:index/services/xactn/TransactionService.adoc[`TransactionService`]'s `flush()` method.
 Flushing also happens when a repository query is executed, so that the pending persist operation is performed first.
 Generally therefore the lazy persistence approach works well enough.
 
@@ -134,7 +134,7 @@ One downside is that the code is arguably less easy to debug.
 
 Retrieving domain entities depends on the ORM.
 In the case of xref:pjdo:ROOT:about.adoc[JDO/DataNucleus], it typically requires a JDOQL query defined on the domain entity, and a corresponding repository service for that domain entity type.
-This repository calls the framework-provided xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`] to actually submit the query.
+This repository calls the framework-provided xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`] to actually submit the query.
 
 For example:
 
@@ -182,7 +182,7 @@ public class CustomerRepository {
 
 }
 ----
-<1>    The xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`] is a generic facade over the JDO/DataNucleus API.
+<1>    The xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`] is a generic facade over the JDO/DataNucleus API.
 <2> Specifies the class that is annotated with @Query
 <3> Corresponds to the `@Query#name` attribute
 <4> Corresponds to the `:name` parameter in the query JDOQL string
@@ -206,7 +206,7 @@ Rather, the ORM (DataNucleus) automatically keeps track of the state of each obj
 
 That said, it is possible to "flush" pending changes:
 
-* xref:system:generated:index/applib/services/xactn/TransactionService.adoc[`TransactionService`] acts at the Apache Isis layer, and flushes any pending object persistence or object deletions
+* xref:refguide:applib:index/services/xactn/TransactionService.adoc[`TransactionService`] acts at the Apache Isis layer, and flushes any pending object persistence or object deletions
 
 * (if using xref:pjdo:ROOT:about.adoc[JDO/DataNucleus]), the xref:pjdo:ROOT:services/IsisJdoSupport.adoc[`IsisJdoSupport`] domain service can be used reach down to the underlying JDO API, and perform a flush of pending object updates also.
 
@@ -218,7 +218,7 @@ When an object is updated the framework will emit `ObjectUpdatingEvent` and `Obj
 :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:
 
-Domain entities can be deleted using xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`].
+Domain entities can be deleted using xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`].
 For example:
 
 [source,java]
@@ -229,7 +229,7 @@ repositoryService.remove(customer);
 
 It's worth being aware that (as for persisting new entities) the framework does _not_ eagerly delete the object.
 Rather, it queues up an internal command structure representing the object deletion request.
-This is then executed either at the end of the transaction, or if a xref:userguide:fun:domain-entities-and-services.adoc#finding[query is run], or if the internal queue is manually flushed using xref:system:generated:index/applib/services/xactn/TransactionService.adoc[`TransactionService`]'s `flush()` method.
+This is then executed either at the end of the transaction, or if a xref:userguide:fun:domain-entities-and-services.adoc#finding[query is run], or if the internal queue is manually flushed using xref:refguide:applib:index/services/xactn/TransactionService.adoc[`TransactionService`]'s `flush()` method.
 
 Alternatively, you can use:
 
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
index 8dab70f..a272cd4 100644
--- a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
+++ b/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
@@ -155,7 +155,7 @@ Must correspond to the class on which the annotation is defined (the framework c
 
 JDO/DataNucleus provides several APIs for defining queries, including entirely programmatic and type-safe APIs; but JDOQL is very similar to SQL and so easily learnt.
 
-To actually use the above definition, the framework provides the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`].
+To actually use the above definition, the framework provides the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`].
 This is a generic repository for any domain class.
 
 The corresponding repository method for the above query is:
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 a4b922e..502babd 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: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
+Domain services that are visible in the UI or REST API are annotated with xref:refguide:applib:index/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:system:generated:index/applib/annotation/InteractionScope.adoc[`@IsisSessionScope`] annotation).
+The vast majority of these are singleton (application) scoped; a smaller number are request scoped (using the xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainService.adoc[`@DomainService`].
-Its xref:system:generated:index/applib/annotation/DomainService.adoc#nature[`#nature()`] attribute is either:
+For domain services to be visible in the Apache Isis UI, they must be annotated with xref:refguide:applib:index/annotation/DomainService.adoc[`@DomainService`].
+Its xref:refguide:applib:index/annotation/DomainService.adoc#nature[`#nature()`] attribute is either:
 
 * `VIEW` (the default if not specified)
 +
@@ -44,7 +44,7 @@ Such programmatic services are usually annotated with Spring's link:https://docs
 
 == Repository and Factory
 
-The repository/factory uses an injected xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`] to both instantiate new objects and to query the database for existing objects of a given entity type.
+The repository/factory uses an injected xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`] to both instantiate new objects and to query the database for existing objects of a given entity type.
 Generally these services are not visible in UI, and so are annotated with link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/stereotype/Repository.html[`@Repository`]
 
 For example:
@@ -79,7 +79,7 @@ public CustomerRepository {
 }
 ----
 <.> Detected and managed by Spring Boot.
-<.> Lombok annotation for dependency injection of xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`] through generated constructor.
+<.> Lombok annotation for dependency injection of xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`] through generated constructor.
 <.> uses injected `RepositoryService` to query via JDOQL.
 <.> uses injected `RepositoryService` to instantiate a not-yet-persisted domain entity ...
 <.> \... and then save into the database a new `Customer` instance.
@@ -138,7 +138,7 @@ public class Customers {
 
 <.> Rendered in the UI as a "Find By Name" menu item underneath the "Customers" menu.
 
-<.> The xref:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`] provides metadata for the parameter itself, in this case its name.
+<.> The xref:refguide:applib:index/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:system:generated:index/applib/annotation/Action.adoc#restrictTo[Prototype] actions are rendered only in prototyping mode.
+<.> xref:refguide:applib:index/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).
@@ -195,10 +195,10 @@ By default all domain services are application-scoped, in other words singletons
 Such domain services are required to be thread-safe, usually satisfied by being intrinsically stateless.
 
 Sometimes though a service's lifetime is applicable only to a single (http) request.
-The framework has a number of such services, including a xref:system:generated:index/applib/services/scratchpad/Scratchpad.adoc[`Scratchpad`] service (to share adhoc data between methods), and xref:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`], which as its name suggests will cache query results.
+The framework has a number of such services, including a xref:refguide:applib:index/services/scratchpad/Scratchpad.adoc[`Scratchpad`] service (to share adhoc data between methods), and xref:refguide:applib:index/services/queryresultscache/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:system:generated:index/applib/annotation/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:refguide:applib:index/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 f172a4b..e7f6b64 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
@@ -5,7 +5,7 @@
 :page-partial:
 
 
-Apache Isis runs on top of Spring Boot, and uses Spring Boot for dependency injection, both the application's own domain services and also the many additional services defined by the framework (such as xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]).
+Apache Isis runs on top of Spring Boot, and uses Spring Boot for dependency injection, both the application's own domain services and also the many additional services defined by the framework (such as xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`]).
 
 Since this is a core capability of Spring, it's worth checking out Spring's link:https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#beans-factory-collaborators[documentation] on the topic.
 
@@ -168,7 +168,7 @@ These will be in the order as defined by the Spring link:https://docs.spring.io/
 This pattern can be useful when implementing the link:https://en.wikipedia.org/wiki/Chain-of-responsibility_pattern[chain of responsibility] design pattern, that is, looking for the first implementation that can handle a request.
 
 It is also useful to "broadcast" or fan out an implementation.
-For example, the framework defines the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI, which is used to publish xref:refguide:schema:ixn.adoc[Interaction Execution]s to external systems.
+For example, the framework defines the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] SPI, which is used to publish xref:refguide:schema:ixn.adoc[Interaction Execution]s to external systems.
 The framework provides a simple logging implementation, which will always be called.
 All other implementations available will also be called.
 
@@ -177,9 +177,9 @@ 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:system:generated:index/applib/annotation/InteractionScope.adoc[`@IsisSessionScope`].
+A small number of framework-provided services are annotated using xref:refguide:applib:index/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:system:generated:index/applib/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`], used for performance caching.
+One such service is xref:refguide:applib:index/services/queryresultscache/QueryResultsCache.adoc[`QueryResultsCache`], used for performance caching.
 
 These domain services must be requested using a slightly different idiom, using the `Provider` interface.
 For example:
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 eaf8f61..aaaac48 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:system:generated:index/applib/annotation/DomainObject.adoc#bounding[`@DomainObject#bounding`].
+For more on this, see xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteRepository[`@DomainObject#autoCompleteRepository`].
+For more on this, see xref:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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 8729e58..1c4ad8b 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:system:generated:index/applib/annotation/Property.adoc#mustSatisfy[`@Property#mustSatisfy()`] allows arbitrary validation rules to be specified for the property.
+The xref:refguide:applib:index/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:system:generated:index/applib/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`] allows the same validation rules to be specified for the parameter.
+The xref:refguide:applib:index/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 27772a0..d0f59a7 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: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.
+Accordingly, a mixin can be defined using the xref:refguide:applib:index/annotation/Action.adoc[`@Action`], xref:refguide:applib:index/annotation/Property.adoc[`@Property`] or xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`] annotations, but defined at the domain class level rather than at the method level.
 
-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.
+Using xref:refguide:applib:index/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:system:generated:index/applib/annotation/Collection.adoc[`@Collection`].
+The example below shows how to contribute a collection, using xref:refguide:applib:index/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:system:generated:index/applib/annotation/Property.adoc[`@Property`]; this implies a method called "prop":
+Contributed properties can likewise be defined using xref:refguide:applib:index/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:system:generated:index/applib/annotation/Action.adoc[`@Action`]; this implies a method called "act".
+Contributed actions are defined similarly, using xref:refguide:applib:index/annotation/Action.adoc[`@Action`]; this implies a method called "act".
 For example:
 
 [source,java]
@@ -158,7 +158,7 @@ Can be camelCase or PascalCase, either will work.
 When a domain object is rendered, the framework will automatically instantiate all required mixins and delegate to them dynamically.
 If writing integration tests or fixtures, or (sometimes) just regular domain logic, then you may need to instantiate mixins directly.
 
-For this you can use the xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService#mixin(...)`] method.
+For this you can use the xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService#mixin(...)`] method.
 
 For example:
 
@@ -168,7 +168,7 @@ DocumentHolder_documents mixin =
     factoryService.mixin(DocumentHolder_documents.class, customer);
 ----
 
-Alternatively, you can use xref:system:generated:index/applib/services/inject/ServiceInjector.adoc[`ServiceInjector`] to inject domain services after the mixin has been instantiated.
+Alternatively, you can use xref:refguide:applib:index/services/inject/ServiceInjector.adoc[`ServiceInjector`] to inject domain services after the mixin has been instantiated.
 You'll need to use this method if using nested non-static mixins:
 
 
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 32c38e7..c2e4441 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:system:generated:index/applib/annotation/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:refguide:applib:index/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:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`] annotation can be used to provide the UI hint.
+In such a case the xref:refguide:applib:index/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:system:generated:index/applib/annotation/MinLength.adoc[`@MinLength`] annotation defines how many characters the end-user must enter before performing a search.
+<.> The xref:refguide:applib:index/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:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`] - it doesn't actually need to be an action in the metamodel.
+NOTE: The referenced method can be xref:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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: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.
+The xref:refguide:applib:index/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:system:generated:index/applib/annotation/Parameter.adoc#maxLength[`@Parameter#maxLength`] annotation
+<.> Specifies the parameter length using xref:refguide:applib:index/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 9d13191..bd641eb 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: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)
+* Apache Isis defines its own xref xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`] annotation for capturing domain semantics.
+It also provides a xref:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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 24a0375..9d5cb6c 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: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)
+* Apache Isis defines its own xref:refguide:applib:index/annotation/Property.adoc[`@Property`] annotation for capturing domain semantics.
+It also provides a xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObject.adoc#editing[`@DomainObject#editing()`].
+If this is omitted then whether editing is enabled or disabled is inherited from the domain object level, xref:refguide:applib:index/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:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`].
+To get Apache Isis to ignore a property (exclude it from its metamodel), annotate the getter using xref:refguide:applib:index/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:system:generated:index/applib/annotation/Property.adoc#hidden[`@Property#hidden()`] or indeed xref:system:generated:index/applib/annotation/PropertyLayout.adoc#hidden[`@PropertyLayout#hidden()`].
+You can also suppress a property from the UI using xref:refguide:applib:index/annotation/Property.adoc#hidden[`@Property#hidden()`] or indeed xref:refguide:applib:index/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 7d887e5..6d7b1d9 100644
--- a/api/adoc/userguide/modules/fun/pages/overview/events.adoc
+++ b/api/adoc/userguide/modules/fun/pages/overview/events.adoc
@@ -4,10 +4,10 @@
 :page-partial:
 
 
-When the framework renders a domain object, and as the end-user interacts with the domain object, the framework it emits multiple events using the intra-process xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[event bus].
+When the framework renders a domain object, and as the end-user interacts with the domain object, the framework it emits multiple events using the intra-process xref:refguide:applib:index/services/eventbus/EventBusService.adoc[event bus].
 These events enable other domain services (possibly in other modules) to influence how the domain object is rendered, or to perform side-effects or even veto an action invocation.
 
-To receive the events, the domain service should subscribe to the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`], and implement an appropriately annotated method to receive the events.
+To receive the events, the domain service should subscribe to the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`], and implement an appropriately annotated method to receive the events.
 
 The framework has several categories of events: domain events, UI events and lifecycle events.
 These are explored in the sections below.
@@ -15,9 +15,9 @@ These are explored in the sections below.
 [#domain-events]
 == Domain Events
 
-Domain events are fired -- through the internal xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[event bus] -- for every user interaction with each object member (property, collection or action).
+Domain events are fired -- through the internal xref:refguide:applib:index/services/eventbus/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:system:generated:index/applib/annotation/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:refguide:applib:index/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: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()`].
+If annotated with xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`], the appropriate (subclass of) `TitleUiEvent` will be emitted.
+Similarly for xref:refguide:applib:index/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:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`#cssClassUiEvent()`], and to select an alternate xref:userguide:fun:ui.adoc#layout-file[layout file] using xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[`@DomainObjectLayout#updatingLifecycleEvent`], the appropriate (subclass of) `ObjectUpdatingEvent` will be emitted.
+For example, if annotated with xref:refguide:applib:index/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 e8d33e0..010d1f4 100644
--- a/api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc
+++ b/api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc
@@ -58,17 +58,17 @@ 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:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber];
+* as a handle to any object in an audit record, as used by xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber];
 
-* similarly within implementations of xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] to persist `Command` objects
+* similarly within implementations of xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] to persist `Command` objects
 
-* similarly within implementations of xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] to persist published action invocations
+* similarly within implementations of xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] to persist published action invocations
 
 * and of course both the xref:vro:ROOT:about.adoc[RestfulObjects viewer] and xref:vw:ROOT:about.adoc[Wicket viewer] use the oid tuple to look up, render and allow the user to interact with domain objects.
 
 Although the exact content of an OID should be considered opaque by domain objects, it is possible for domain objects to obtain OIDs.
-These are represented as ``Bookmark``s, obtained from the xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`].
-Deep links meanwhile can be obtained from the xref:system:generated:index/applib/services/linking/DeepLinkService.adoc[`DeepLinkService`].
+These are represented as ``Bookmark``s, obtained from the xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`].
+Deep links meanwhile can be obtained from the xref:refguide:applib:index/services/linking/DeepLinkService.adoc[`DeepLinkService`].
 
 OIDs can also be converted into XML format, useful for integration scenarios.
 The xref:refguide:schema:common.adoc[common schema] XSD defines the `oidDto` complex type for precisely this purpose.
diff --git a/api/adoc/userguide/modules/fun/pages/overview/modules.adoc b/api/adoc/userguide/modules/fun/pages/overview/modules.adoc
index 37e396a..a40e8b3 100644
--- a/api/adoc/userguide/modules/fun/pages/overview/modules.adoc
+++ b/api/adoc/userguide/modules/fun/pages/overview/modules.adoc
@@ -44,7 +44,7 @@ A mixin would allow the UI for a `Customer` to also display these attached ``Doc
 Dependencies are also injected into mixins.
 A common technique is to factor out from domain objects into mixins and then generalise.
 
-* the internal xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[event bus] allows modules to influence other modules.
+* the internal xref:refguide:applib:index/services/eventbus/EventBusService.adoc[event bus] allows modules to influence other modules.
 +
 A subscriber in one module can subscribe to events emitted by domain objects in another module.
 These events can affect both the UI (eg hiding or disabling xref:overview.adoc#object-members[object members], or allowing or vetoing interactions).
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 1ee0724..5536d4b 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: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
+<.> The xref:refguide:applib:index/annotation/Property.adoc[`@Property`] annotation defines additional domain-layer semantics
+<.> The xref:refguide:applib:index/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: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 xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`] annotation defines additional domain-layer semantics
+<.> The xref:refguide:applib:index/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: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
+<.> The xref:refguide:applib:index/annotation/Action.adoc[`@Action`] annotation defines additional domain-layer semantics
+<.> The xref:refguide:applib:index/annotation/ActionLayout.adoc[`@ActionLayout`] annotation defines additional presentation-layer hints
+<.> The xref:refguide:applib:index/annotation/Parameter.adoc[`@Parameter`] annotation defines additional domain-layer semantics
+<.> The xref:refguide:applib:index/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 737c6e4..c8b4d1a 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:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`] and xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[`@DomainServiceLayout`].
+The framework also defines supplementary annotations, notably xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`] and xref:refguide:applib:index/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 704b39c..a9e4fda 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:system:generated:index/applib/annotation/ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`].
+One option is to use the xref:refguide:applib:index/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: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.
+Rather than annotating every action with xref:refguide:applib:index/annotation/ActionLayout.adoc#cssClassFa[`@ActionLayout#cssClassFa`] and xref:refguide:applib:index/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:system:generated:index/applib/annotation/ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] for actions
+* xref:refguide:applib:index/annotation/ActionLayout.adoc#cssClass[`@ActionLayout#cssClass`] for actions
 
-* xref:system:generated:index/applib/annotation/PropertyLayout.adoc#cssClass[`@PropertyLayout#cssClass`] for properties, and
+* xref:refguide:applib:index/annotation/PropertyLayout.adoc#cssClass[`@PropertyLayout#cssClass`] for properties, and
 
-* xref:system:generated:index/applib/annotation/CollectionLayout.adoc#cssClass[`@CollectionLayout#cssClass`] for collections.
+* xref:refguide:applib:index/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 a55b1ec..e966f78 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: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.
+The actions of xref:domain-entities-and-services.adoc#domain-services[domain services] (annotated using xref:refguide:applib:index/annotation/DomainService.adoc[`@DomainService`] with a xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainServiceLayout.adoc#menuBar[`@DomainServiceLayout#menuBar()`] annotation.
+This is done using the xref:refguide:applib:index/annotation/DomainServiceLayout.adoc#menuBar[`@DomainServiceLayout#menuBar()`] annotation.
 
 For example:
 
@@ -61,7 +61,7 @@ image::application-menu/tertiary.png[width="300px"]
 
 
 
-In addition, the xref:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`] annotation can be used to group and order domain service actions:
+In addition, the xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainService.adoc#objectType[object type]
+<.> Identifies the service through its xref:refguide:applib:index/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`). +
 +
@@ -175,7 +175,7 @@ Once the application has bootstrapped with a layout file, downloading the "Defau
 
 === Downloading the layout file
 
-The current `menubars.layout.xml` can be downloaded from the xref:system:generated:index/applib/services/menu/MenuBarsService.adoc[`MenuBarsService`] (exposed on the prototyping menu):
+The current `menubars.layout.xml` can be downloaded from the xref:refguide:applib:index/services/menu/MenuBarsService.adoc[`MenuBarsService`] (exposed on the prototyping menu):
 
 image::menubars/010-download.png[width="300px"]
 
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 778d73b..f4372a9 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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#named[`@DomainObjectLayout#named`]
-| xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc#describedAs[`@DomainObjectLayout#describedAs`]
+| xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#named[`@DomainObjectLayout#named`]
+| xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#describedAs[`@DomainObjectLayout#describedAs`]
 
 
 | Property
-| xref:system:generated:index/applib/annotation/PropertyLayout.adoc#named[`@PropertyLayout#named`]
-| xref:system:generated:index/applib/annotation/PropertyLayout.adoc#describedAs[`@PropertyLayout#describedAs`]
+| xref:refguide:applib:index/annotation/PropertyLayout.adoc#named[`@PropertyLayout#named`]
+| xref:refguide:applib:index/annotation/PropertyLayout.adoc#describedAs[`@PropertyLayout#describedAs`]
 
 | Collection
-| xref:system:generated:index/applib/annotation/CollectionLayout.adoc#named[`@CollectionLayout#named`]
-| xref:system:generated:index/applib/annotation/CollectionLayout.adoc#describedAs[`@CollectionLayout#describedAs`]
+| xref:refguide:applib:index/annotation/CollectionLayout.adoc#named[`@CollectionLayout#named`]
+| xref:refguide:applib:index/annotation/CollectionLayout.adoc#describedAs[`@CollectionLayout#describedAs`]
 
 | Action
-| xref:system:generated:index/applib/annotation/ActionLayout.adoc#named[`@ActionLayout#named`]
-| xref:system:generated:index/applib/annotation/ActionLayout.adoc#describedAs[`@ActionLayout#describedAs`]
+| xref:refguide:applib:index/annotation/ActionLayout.adoc#named[`@ActionLayout#named`]
+| xref:refguide:applib:index/annotation/ActionLayout.adoc#describedAs[`@ActionLayout#describedAs`]
 
 | Action Parameters
-| xref:system:generated:index/applib/annotation/ParameterLayout.adoc#named[`@ParameterLayout#named`]
-| xref:system:generated:index/applib/annotation/ParameterLayout.adoc#describedAs[`@ParameterLayout#describedAs`]
+| xref:refguide:applib:index/annotation/ParameterLayout.adoc#named[`@ParameterLayout#named`]
+| xref:refguide:applib:index/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 f571b6f..45496d3 100644
--- a/api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc
+++ b/api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc
@@ -14,7 +14,7 @@ File-based layouts offer a number of benefits:
 
 * UI hints can be provided for xref:userguide:fun:mixins.adoc[mixin] contributions that are synthesised at runtime.
 
-It is also possible to download an initial `.layout.xml` - capturing any existing layout metadata - using the xref:system:generated:index/applib/services/layout/LayoutService.adoc[`LayoutService`] (exposed on the prototyping menu) or using a xref:refguide:applib-cm:roles-mixins-contributees/mixins.adoc#Object[mixin action] contributed to every domain object.
+It is also possible to download an initial `.layout.xml` - capturing any existing layout metadata - using the xref:refguide:applib:index/services/layout/LayoutService.adoc[`LayoutService`] (exposed on the prototyping menu) or using a xref:refguide:applib-cm:roles-mixins-contributees/mixins.adoc#Object[mixin action] contributed to every domain object.
 
 There are some downsides, though:
 
@@ -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:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`]:
+The annotations most relevant here is xref:refguide:applib:index/annotation/MemberOrder.adoc[`@MemberOrder`]:
 
 * for properties:
 
@@ -248,15 +248,15 @@ 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: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`].
+There are a number of other "layout" annotations, specifically xref:refguide:applib:index/annotation/PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`] and xref:refguide:applib:index/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:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`] provides layout hints for action parameters.
+In addition, xref:refguide:applib:index/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
 
-If you want to make your usage of layout files consistent, then the framework can help because it allows the layout XML files to be downloaded using the xref:system:generated:index/applib/services/layout/LayoutService.adoc[`LayoutService`].
+If you want to make your usage of layout files consistent, then the framework can help because it allows the layout XML files to be downloaded using the xref:refguide:applib:index/services/layout/LayoutService.adoc[`LayoutService`].
 This is exposed on the prototyping menu to allow you to download a ZIP file of layout XML files for all domain entities and view models.
 
 When downloading the layout files, there are four "styles" available:
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 e358614..6de4c0a 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:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation can be used build up the title of an object from its constituent parts.
+The xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`] attribute to specify:
+In the target object, we define an appropriate event type and use the xref:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] attribute to specify.
+In the target object, we define an appropriate event type and use the xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClass[`@DomainObjectLayout#cssClass()`] or in the xref:userguide:fun:ui.adoc#object-layout[layout.xml] file.
+xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassUiEvent[`@DomainObjectLayout#cssClassUiEvent()`] attribute to specify.
+In the target object, we define an appropriate event type and use the xref:refguide:applib:index/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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#layoutUiEvent[`@DomainObjectLayout#layoutUiEvent()`] attribute to specify.
+In the target object, we define an appropriate event type and use the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#layoutUiEvent[`@DomainObjectLayout#layoutUiEvent()`] attribute to specify.
 
 For example
 
diff --git a/api/adoc/userguide/modules/fun/pages/ui/table-columns.adoc b/api/adoc/userguide/modules/fun/pages/ui/table-columns.adoc
index 51fc07c..1ecc7bd 100644
--- a/api/adoc/userguide/modules/fun/pages/ui/table-columns.adoc
+++ b/api/adoc/userguide/modules/fun/pages/ui/table-columns.adoc
@@ -6,7 +6,7 @@
 
 
 
-The optional xref:system:generated:index/applib/services/tablecol/TableColumnOrderService.adoc[`TableColumnOrderService`] SPI service can be used to reorder columns in a table, either for a parented collection (owned by parent domain object) or a standalone collection (returned from an action invocation).
+The optional xref:refguide:applib:index/services/tablecol/TableColumnOrderService.adoc[`TableColumnOrderService`] SPI service can be used to reorder columns in a table, either for a parented collection (owned by parent domain object) or a standalone collection (returned from an action invocation).
 
 For example, suppose there is a `Customer` and an `Order`:
 
diff --git a/api/adoc/userguide/modules/fun/pages/view-models.adoc b/api/adoc/userguide/modules/fun/pages/view-models.adoc
index 97e54fe..361123c 100644
--- a/api/adoc/userguide/modules/fun/pages/view-models.adoc
+++ b/api/adoc/userguide/modules/fun/pages/view-models.adoc
@@ -77,10 +77,10 @@ The derived properties could also have been implemented using xref:userguide:fun
 
 [IMPORTANT]
 ====
-Be aware that all the state will ultimately converted into a URL-safe form (by way of the xref:system:generated:index/applib/services/urlencoding/UrlEncodingService.adoc[`UrlEncodingService`]).
+Be aware that all the state will ultimately converted into a URL-safe form (by way of the xref:refguide:applib:index/services/urlencoding/UrlEncodingService.adoc[`UrlEncodingService`]).
 
 There are limits to the lengths of URLs, however.
-If the URL does exceed limits or contains invalid characters, then provide a custom implementation of xref:system:generated:index/applib/services/urlencoding/UrlEncodingService.adoc[`UrlEncodingService`] to handle the memento string in some other fashion (eg substituting it with a GUID, with the memento cached somehow on the server).
+If the URL does exceed limits or contains invalid characters, then provide a custom implementation of xref:refguide:applib:index/services/urlencoding/UrlEncodingService.adoc[`UrlEncodingService`] to handle the memento string in some other fashion (eg substituting it with a GUID, with the memento cached somehow on the server).
 ====
 
 [#referencing-domain-entities]
@@ -91,10 +91,10 @@ For example, the `CompareCustomers` view model described xref:userguide:fun:view
 
 It wouldn't make sense to serialize out the state of a persistent entity.
 However, the identity of the underlying entity is well defined; Apache Isis defines the xref:refguide:schema:common.adoc[common schema] which defines the `<oid-dto>` element (and corresponding `OidDto` class): the object's type and its identifier.
-This is basically a formal XML equivalent to the `Bookmark` object obtained from the xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`].
+This is basically a formal XML equivalent to the `Bookmark` object obtained from the xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`].
 
 There is only one requirement to make this work: every referenced domain entity must be annotated with xref:refguide:applib-ant:XmlJavaTypeAdapter.adoc[`@XmlJavaTypeAdapter`], specifying the framework-provided `PersistentEntityAdapter`.
-And this class is similar to the xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`]: it knows how to create an `OidDto` from an object reference.
+And this class is similar to the xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`]: it knows how to create an `OidDto` from an object reference.
 
 Thus, in our view model we can legitimately write:
 
@@ -240,8 +240,8 @@ public class CustomerRecordOnSAP {
     // ...
 }
 ----
-|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].
+|Annotated with xref:refguide:applib:index/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:refguide:applib:index/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 93e6e47..2156bd6 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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`].
+<.> demonstrating use of UI events for a subscriber to provide the DTO's title; see xref:refguide:applib:index/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]
@@ -170,9 +170,9 @@ Alternatively, you might also consider simply editing the source file, ie renami
 The actual consumers of DTOs will generally obtain the XML of the view models either by requesting the XML directly, eg using the xref:vro:ROOT:about.adoc[RestfulObjects viewer], or may have the XML sent to them asynchronously using an ESB such as Apache Camel.
 
 In the former case, the consumer requests the DTO by calling the REST API with the appropriate HTTP `Accept` header.
-An appropriate implementation of xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[`ContentMappingService`] can then be used to return the appropriate DTO (as XML).
+An appropriate implementation of xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[`ContentMappingService`] can then be used to return the appropriate DTO (as XML).
 
-For the latter case, one design is simply for the application to instantiate the view model, then call the xref:system:generated:index/applib/services/jaxb/JaxbService.adoc[`JaxbService`] to obtain its corresponding XML.  This can then be published onto the ESB, for example using an http://activemq.apache.org[Apache ActiveMQ (TM)] queue.
+For the latter case, one design is simply for the application to instantiate the view model, then call the xref:refguide:applib:index/services/jaxb/JaxbService.adoc[`JaxbService`] to obtain its corresponding XML.  This can then be published onto the ESB, for example using an http://activemq.apache.org[Apache ActiveMQ (TM)] queue.
 
 However, rather than try to push all the data that might be needed by any of these external systems in a single XML event (which would require anticipating all the requirements, likely a hopeless task), a better design is to publish only the fact that something of note has changed - ie, that an action on a domain object has been invoked - and then let the consumers call back to obtain other information if required.
 This can once again be done by calling the REST API with an appropriate HTTP `Accept` header.
@@ -184,7 +184,7 @@ In our case we focus on the validation (to determine the nature of the inbound m
 ====
 
 The (non-ASF) link:https://platform.incode.org[Incode Platform^]'s publishmq module provides an out-of-the-box solution of this design.
-It provides an implementation of the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber], but which simply publishes instances of xref:refguide:schema:ixn.adoc[`InteractionDto`] to an ActiveMQ queue.
+It provides an implementation of the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber], but which simply publishes instances of xref:refguide:schema:ixn.adoc[`InteractionDto`] to an ActiveMQ queue.
 Camel (or similar) can then be hooked up to consume these events from this queue, and use a processor to parse the action memento to determine what has changed on the source system.
 Thereafter, a subsequent Camel processor can then call back to the source - via the xref:vro:ROOT:about.adoc[Restful Objects viewer] - to enrich the message with additional details using a DTO.
 
diff --git a/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc b/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc
index df77040..8ae4e95 100644
--- a/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc
+++ b/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc
@@ -51,7 +51,7 @@ For example, using a Javascript framework such as Angular/Ionic/ReactJs/Vue etc,
 +
 REST is designed to be machine-readable, and so is an excellent choice for synchronous data interchange scenarios.
 +
-The framework provides xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[SPI]s to allow custom repreentations to be returned as required.
+The framework provides xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[SPI]s to allow custom repreentations to be returned as required.
 
 * as the basis for a generic UI.
 +
@@ -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:system:generated:index/applib/annotation/Action.adoc[`@Action`] and xref:system:generated:index/applib/annotation/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:refguide:applib:index/annotation/Action.adoc[`@Action`] and xref:refguide:applib:index/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/Column.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
index facf8a7..f76b2fb 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:system:generated:index/applib/annotation/Property.adoc#optionality[`@Property#optionality`] attribute.
+Isis also provides xref:refguide:applib:index/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:system:generated:index/applib/annotation/Property.adoc#optionality[`@Property#optionality`] attribute for discussion on one or two minor edge cases.
+But see the documentation for xref:refguide:applib:index/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:system:generated:index/applib/annotation/Property.adoc#maxLength[`@Property#maxLength`] attribute.
+Apache Isis also provides xref:refguide:applib:index/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/Discriminator.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Discriminator.adoc
index f5068ba..877e676 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Discriminator.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Discriminator.adoc
@@ -23,11 +23,11 @@ This value is used internally to generate a string representation of an objects
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
-(see xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`])
+(see xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`])
 * in the serialization of `OidDto` in the xref:refguide:schema:cmd[command] and xref:refguide:schema:ixn.adoc[interaction] schemas
 * in the URLs of the xref:vro:ROOT:about.adoc[RestfulObjects viewer]
 * in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer]
-* in XML snapshots generated by the xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[`XmlSnapshotService`]
+* in XML snapshots generated by the xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService.adoc[`XmlSnapshotService`]
 
 == Examples
 
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 dfac251..75a7b18 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:system:generated:index/applib/annotation/Property.adoc#optionality[`@Property#optionality()`] /
-xref:system:generated:index/applib/annotation/Parameter.adoc#optionality[`@Parameter#optionality()`] annotation.
+xref:refguide:applib:index/annotation/Property.adoc#optionality[`@Property#optionality()`] /
+xref:refguide:applib:index/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: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:index/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/PersistenceCapable.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PersistenceCapable.adoc
index 01e408b..a2dd47c 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/PersistenceCapable.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/PersistenceCapable.adoc
@@ -22,11 +22,11 @@ This value is used internally to generate a string representation of an objects
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
-(see xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`])
+(see xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`])
 * in the serialization of `OidDto` in the xref:refguide:schema:cmd[command] and xref:refguide:schema:ixn.adoc[interaction] schemas
 * in the URLs of the xref:vro:ROOT:about.adoc[RestfulObjects viewer]
 * in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer]
-* in XML snapshots generated by the xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[`XmlSnapshotService`]
+* in XML snapshots generated by the xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService.adoc[`XmlSnapshotService`]
 
 
 The actual format of the object type used by Apache Isis for the concatenation of `schema()` and `@PersistenceCapable#table()`.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
index cb86eb0..015fbdc 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
@@ -7,7 +7,7 @@
 
 The `@javax.jdo.annotation.PrimaryKey` annotation is used by JDO/DataNucleus to indicate that a property is used as the primary key for an entity with application-managed identity.
 
-Apache Isis also uses this annotation in a very minimal way: to ensure that the framework's own logic to initialize newly instantiated objects (eg using xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService#create(...)`] does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).
+Apache Isis also uses this annotation in a very minimal way: to ensure that the framework's own logic to initialize newly instantiated objects (eg using xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService#create(...)`] does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).
 
 [NOTE]
 ====
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
index eeb1928..bd2fac3 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
@@ -8,7 +8,7 @@ The JAXB `@XmlJavaTypeAdapter` annotation is used with the framework-provided
 `PersistentEntityAdapter` to instruct JAXB to serialize references to persistent entities using the canonical
 `OidDto` complex type: the object's type and its identifier.
 This is the formal XML equivalent to the `Bookmark`
-provided by the xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`].
+provided by the xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`].
 
 For example:
 
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 5508283..b01fe30 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
@@ -16,7 +16,7 @@ xref:refguide:applib-ant:ViewModel.adoc[`@DomainObject(nature=VIEW_MODEL)`] anno
 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
-xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[`ContentMappingService`].
+xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[`ContentMappingService`].
 +
 This provides a stable and versioned API to access data in XML format using whatever client-side technology may be appropriate.
 
@@ -31,7 +31,7 @@ This adapter converts any references to such domain entities using the `oidDto`
 [TIP]
 ====
 The memento string for view models is converted into a form compatible with use within a URL.
-This is performed by the xref:system:generated:index/applib/services/urlencoding/UrlEncodingService.adoc[`UrlEncodingService`], the default implementation of which simply encodes to base 64. If the view model XML graph is too large to be serialized to a string, then an alternative implementation (eg which maps XML strings to a GUID, say) can be configured using the technique described in xref:userguide:btb:about.adoc#replacing-default-service-implementations[here] in the user guide.
+This is performed by the xref:refguide:applib:index/services/urlencoding/UrlEncodingService.adoc[`UrlEncodingService`], the default implementation of which simply encodes to base 64. If the view model XML graph is too large to be serialized to a string, then an alternative implementation (eg which maps XML strings to a GUID, say) can be configured using the technique described in xref:userguide:btb:about.adoc#replacing-default-service-implementations[here] in the user guide.
 ====
 
 == Example
@@ -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: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.
+Behaviour can therefore be provided using xref:userguide:fun:overview.adoc#mixins[mixins] (annotated with xref:refguide:applib:index/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/jee.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/jee.adoc
index ecc79cf..07fa4ed 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/about/jee.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/about/jee.adoc
@@ -49,7 +49,7 @@ The table below lists the JEE annotations currently recognized.  Expect to see m
 |xref:refguide:applib-ant:XmlJavaTypeAdapter.adoc[`javax.xml.bind` +
 `.annotation` +
 `XmlJavaTypeAdapter`]
-|JAXB annotation defining how to serialize an entity.  Used in conjunction with the (framework provided) `PersistentEntityAdapter` class to serialize persistent entities into a canonical OID (equivalent to the `Bookmark` provided by the xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`]).
+|JAXB annotation defining how to serialize an entity.  Used in conjunction with the (framework provided) `PersistentEntityAdapter` class to serialize persistent entities into a canonical OID (equivalent to the `Bookmark` provided by the xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`]).
 |Domain
 |
 
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 fbd8340..d8a9c88 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:system:generated:index/applib/annotation/Action.adoc[`@Action`]
+|xref:refguide:applib:index/annotation/Action.adoc[`@Action`]
 |Domain semantics for actions
 |Domain
 |
 
-|xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`]
+|xref:refguide:applib:index/annotation/ActionLayout.adoc[`@ActionLayout`]
 |User interface hints for actions
 |UI
 |Yes
 
-|xref:system:generated:index/applib/annotation/Collection.adoc[`@Collection`]
+|xref:refguide:applib:index/annotation/Collection.adoc[`@Collection`]
 |Domain semantics for collections
 |Domain
 |
 
-|xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`]
+|xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`]
 |User interface hints for collections
 |UI
 |Yes
 
-|xref:system:generated:index/applib/annotation/DomainObject.adoc[`@DomainObject`]
+|xref:refguide:applib:index/annotation/DomainObject.adoc[`@DomainObject`]
 |Domain semantics for domain object (entities and optionally view models)
 |Domain
 |
 
-|xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`]
+|xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`]
 |User interface hints for domain object (entities and optionally view models)
 |UI
 |Yes
 
-|xref:system:generated:index/applib/annotation/DomainService.adoc[`@DomainService`]
+|xref:refguide:applib:index/annotation/DomainService.adoc[`@DomainService`]
 |Class is a domain service (rather than an entity or view model)
 |Domain
 |
 
-|xref:system:generated:index/applib/annotation/DomainServiceLayout.adoc[`@DomainServiceLayout`]
+|xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[`@DomainServiceLayout`]
 |User interface hints for domain services
 |UI
 |
 
-|xref:system:generated:index/applib/annotation/Parameter.adoc[`@Parameter`]
+|xref:refguide:applib:index/annotation/Parameter.adoc[`@Parameter`]
 |Domain semantics for action parameters
 |Domain
 |
 
-|xref:system:generated:index/applib/annotation/ParameterLayout.adoc[`@ParameterLayout`]
+|xref:refguide:applib:index/annotation/ParameterLayout.adoc[`@ParameterLayout`]
 |Layout hints for an action parameter (currently: its label position either to top or the left).
 |UI
 |Yes
 
-|xref:system:generated:index/applib/annotation/Property.adoc[`@Property`]
+|xref:refguide:applib:index/annotation/Property.adoc[`@Property`]
 |Domain semantics for properties
 |Domain
 |
 
-|xref:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`]
+|xref:refguide:applib:index/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 f1bdb8d..8dd6599 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:system:generated:index/applib/annotation/Facets.adoc[`@Facets`]
+|xref:refguide:applib:index/annotation/Facets.adoc[`@Facets`]
 |Install arbitrary facets within the Apache Isis metamodel.
 |(any)
 |
 
-|xref:system:generated:index/applib/annotation/HomePage.adoc[`@HomePage`]
+|xref:refguide:applib:index/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:system:generated:index/applib/annotation/MemberOrder.adoc[`@MemberOrder`]
+|xref:refguide:applib:index/annotation/MemberOrder.adoc[`@MemberOrder`]
 |Ordering of properties, collections and actions, and also associating actions with either a property or a collection.
 |UI
 |Yes
 
 
-|xref:system:generated:index/applib/annotation/MinLength.adoc[`@MinLength`]
+|xref:refguide:applib:index/annotation/MinLength.adoc[`@MinLength`]
 |Minimum number of characters required for an auto-complete search argument.
 |UI
 |
 
 
-|xref:system:generated:index/applib/annotation/Programmatic.adoc[`@Programmatic`]
+|xref:refguide:applib:index/annotation/Programmatic.adoc[`@Programmatic`]
 |Ignore a public method, excluded from the Apache Isis metamodel.
 |Domain
 |
 
-|xref:system:generated:index/applib/annotation/Title.adoc[`@Title`]
+|xref:refguide:applib:index/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 5072158..e43ce52 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,33 +3,33 @@
 
 * xref:refguide:applib-ant:about.adoc[Annotations]
 
-** 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:index/annotation/Action.adoc[Action]
+** xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout]
+** xref:refguide:applib:index/annotation/Collection.adoc[Collection]
+** xref:refguide:applib:index/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: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:index/annotation/DomainObject.adoc[DomainObject]
+** xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout]
+** xref:refguide:applib:index/annotation/DomainService.adoc[DomainService]
+** xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout]
+** xref:refguide:applib:index/annotation/Facets.adoc[Facets]
+** xref:refguide:applib:index/annotation/HomePage.adoc[HomePage]
+** xref:refguide:applib:index/annotation/MemberOrder.adoc[MemberOrder]
 ** xref:refguide:applib-ant:NotPersistent.adoc[NotPersistent.]
 ** xref:refguide:applib-ant:Nullable.adoc[Nullable]
-** 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:index/annotation/MinLength.adoc[MinLength]
+** xref:refguide:applib:index/annotation/Parameter.adoc[Parameter]
+** xref:refguide:applib:index/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: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:index/annotation/Programmatic.adoc[Programmatic]
+** xref:refguide:applib:index/annotation/Property.adoc[Property]
+** xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayout]
+** xref:refguide:applib:index/annotation/InteractionScope.adoc[RequestScoped]
+** xref:refguide:applib:index/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/ViewModel.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/ViewModel.adoc
index c428967..6a7945b 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/ViewModel.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/ViewModel.adoc
@@ -4,7 +4,7 @@
 
 
 [#ViewModel]
-include::system:generated:page$index/applib/ViewModel.adoc[]
+include::refguide:applib:page$index/ViewModel.adoc[]
 
 
 See also the xref:userguide:fun:view-models.adoc#view-model-interface[`ViewModel` interface] in the user guide.
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 2504d6d..243809a 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
@@ -6,8 +6,8 @@
 
 This section catalogues the various domain event classes defined by Apache Isis.
 
-These events are broadcast on the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`].
-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.
+These events are broadcast on the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`].
+The domain events are broadcast as a result of being specified in the xref:refguide:applib:index/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`],  xref:refguide:applib:index/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`] or xref:refguide:applib:index/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 95f2f9c..c321eaa 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:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`]
+<.> The `Default` nested static class is the default for the xref:refguide:applib:index/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 fe23535..1cc249e 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:system:generated:index/applib/annotation/Collection.adoc#domainEvent[`@Collection#domainEvent()`] annotation attribute.
+<1> The `Default` nested static class is the default for the xref:refguide:applib:index/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 6e9e037..3136f87 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:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`] annotation attribute.
+<1> The `Default` nested static class is the default for the xref:refguide:applib:index/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.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent.adoc
index f2bd037..e98ea55 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/events/lifecycleevent.adoc
@@ -30,7 +30,7 @@ The lifecycle event classes are listed in the table below:
 `ObjectCreatedEvent`]
 |(abstract class). +
 `ObjectCreatedEvent.Default` is the concrete implementation that is used.
-|Broadcast when an object is first instantiated using the xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`]'s
+|Broadcast when an object is first instantiated using the xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`]'s
 `#instantiate(...)` method.
 
 
@@ -45,7 +45,7 @@ The lifecycle event classes are listed in the table below:
 `ObjectPersistedEvent`]
 |(abstract class). +
 `ObjectPersistedEvent.Default` is the concrete implementation that is used.
-|Broadcast when an object is first saved (inserted) into the database using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s
+|Broadcast when an object is first saved (inserted) into the database using the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s
 `#persist(...)` method.
 
 
@@ -53,7 +53,7 @@ The lifecycle event classes are listed in the table below:
 `ObjectPersistingEvent`]
 |(abstract class). +
 `ObjectPersistingEvent.Default` is the concrete implementation that is used.
-|Broadcast when an object is about to be saved (inserted) into the database using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s
+|Broadcast when an object is about to be saved (inserted) into the database using the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s
 `#persist(...)` method.
 
 
@@ -61,7 +61,7 @@ The lifecycle event classes are listed in the table below:
 `ObjectRemovingEvent`]
 |(abstract class). +
 `ObjectRemovingEvent.Default` is the concrete implementation that is used.
-|Broadcast when an object is about to be deleted from the database using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s
+|Broadcast when an object is about to be deleted from the database using the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s
 `#remove(...)` method.
 
 
@@ -70,7 +70,7 @@ The lifecycle event classes are listed in the table below:
 |(abstract class). +
 `ObjectUpdatedEvent.Default` is the concrete implementation that is used.
 |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:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
+This is done either explicitly when the current transaction is flushed using the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
 
 
 |xref:applib-classes:events.adoc#ObjectUpdatingEvent[`o.a.i.applib.` +
@@ -81,7 +81,7 @@ This is done either explicitly when the current transaction is flushed using the
 |(abstract class). +
 `ObjectUpdatingEvent.Default` is the concrete implementation that is used.
 |Broadcast when an object is about to be updated in the database.
-This is done either explicitly when the current transaction is flushed using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
+This is done either explicitly when the current transaction is flushed using the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
 
 
 |===
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 405972c..996e609 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
@@ -6,9 +6,9 @@
 
 
 
-Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first instantiated using the xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryServuce`]'s `#instantiate(...)` method.
+Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first instantiated using the xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryServuce`]'s `#instantiate(...)` method.
 
-`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`].
+`ObjectCreatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib:index/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 4cee6d1..23ca407 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
@@ -5,7 +5,7 @@
 :page-partial:
 
 
-Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is first saved (inserted) into the database using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
+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:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
 
 
-`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`].
+`ObjectPersistedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib:index/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 e3c1ee9..8b4367b 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
@@ -5,8 +5,8 @@
 :page-partial:
 
 
-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:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
+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:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#persist(...)` method.
 
 
-`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`].
+`ObjectPersistingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib:index/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 b511f5c..0150b21 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
@@ -5,8 +5,8 @@
 :page-partial:
 
 
-Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be deleted from the database using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#remove(...)` method.
+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:index/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#remove(...)` method.
 
 
-`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`].
+`ObjectRemovingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib:index/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 288fcb9..4cc0193 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
@@ -7,7 +7,7 @@
 
 
 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:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
+This is done either explicitly when the current transaction is flushed using the xref:refguide:applib:index/services/repository/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:system:generated:index/applib/annotation/DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent`].
+`ObjectUpdatedEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib:index/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 04bd829..6ed2b6b 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
@@ -7,7 +7,7 @@
 
 
 Subclass of xref:applib-classes:events.adoc#AbstractLifecycleEvent[`AbstractLifecycleEvent`], broadcast when an object is about to be updated in the database.
-This is done either explicitly when the current transaction is flushed using the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`]'s `#flush(...)` method, else is done implicitly when the transaction commits at the end of the user request.
+This is done either explicitly when the current transaction is flushed using the xref:refguide:applib:index/services/repository/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:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[`@DomainObject#updatingLifecycleEvent`].
+`ObjectUpdatingEvent.Default` is the implementation that is used by default, but this can be overridden using xref:refguide:applib:index/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 f089046..8e5bc7c 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
@@ -6,8 +6,8 @@
 
 This section catalogues the various UI event classes defined by Apache Isis.
 
-These events are broadcast on the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`].  The domain
-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.
+These events are broadcast on the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`].  The domain
+events are broadcast as a result of being specified in the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#titleUiEvent[`@DomainObjectLayout#titleUiEvent()`],  xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#iconUiEvent[`@DomainObjectLayout#iconUiEvent()`] or xref:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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:system:generated:index/applib/annotation/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:refguide:applib:index/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 018ee3e..84f5ef9 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:system:generated:index/applib/annotation/DomainObjectLayout.adoc#cssClassFa[`@DomainObjectLayout#cssClassFa()`] attribute, then these will take precedence.
+xref:refguide:applib:index/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 36d82c6..bdaba00 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:system:generated:index/applib/annotation/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:refguide:applib:index/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 9789718..556f79b 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,12 +10,12 @@ 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:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`].
+The component class `ServiceActionLayoutData` defines action metadata, being broadly equivalent to the "layout" annotations for actions, ie xref:refguide:applib:index/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.
 
 All of the classes in this package are JAXB-annotated, meaning that they can be serialized to/from XML (in the `http://isis.apache.org/applib/layout/menubars/bootstrap3` XSD namespace).
-This ability to serialize to/from XML is used by the xref:system:generated:index/applib/services/menu/MenuBarsLoaderService.adoc[`MenuBarsLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
+This ability to serialize to/from XML is used by the xref:refguide:applib:index/services/menu/MenuBarsLoaderService.adoc[`MenuBarsLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
 It also allows the menu bars to be exposed through the REST API provided by the xref:vro:ROOT:about.adoc[Restful Objects viewer], as either XML or JSON.
 
 The service action component also allows a link to be associated with it.
@@ -57,7 +57,7 @@ The service action class reside in the `org.apache.isis.applib.layout.component`
 * `ServiceActionLayoutData` class
 
 +
-which correspond to the xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`] annotation.
+which correspond to the xref:refguide:applib:index/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 6befbb0..4008677 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,10 +17,10 @@ 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: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`]
+The component classes, meanwhile, are broadly equivalent to the "layout" annotations (xref:refguide:applib:index/annotation/PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`], xref:refguide:applib:index/annotation/ActionLayout.adoc[`@ActionLayout`] and xref:refguide:applib:index/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:system:generated:index/applib/services/grid/GridLoaderService.adoc[`GridLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
+This ability to serialize to/from XML is used by the xref:refguide:applib:index/services/grid/GridLoaderService.adoc[`GridLoaderService`], the default implementation of which reads the grid layout for a domain class from a `.layout.xml` file on the classpath.
 It also allows the grid to be exposed through the REST API provided by the xref:vro:ROOT:about.adoc[Restful Objects viewer], as either XML or JSON.
 
 The various components (properties, collections, actions and domain object) also allow a link to be associated with each.
@@ -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:system:generated:index/applib/annotation/PropertyLayout.adoc[`@PropertyLayout`] annotation;
+** `PropertyLayoutData`, corresponding to the xref:refguide:applib:index/annotation/PropertyLayout.adoc[`@PropertyLayout`] annotation;
 
-** `CollectionLayoutData`, corresponding to the xref:system:generated:index/applib/annotation/CollectionLayout.adoc[`@CollectionLayout`] annotation;
+** `CollectionLayoutData`, corresponding to the xref:refguide:applib:index/annotation/CollectionLayout.adoc[`@CollectionLayout`] annotation;
 
-** `ActionLayoutData`, corresponding to the xref:system:generated:index/applib/annotation/ActionLayout.adoc[`@ActionLayout`] annotation;
+** `ActionLayoutData`, corresponding to the xref:refguide:applib:index/annotation/ActionLayout.adoc[`@ActionLayout`] annotation;
 
-** `DomainObjectLayoutData`, corresponding to the xref:system:generated:index/applib/annotation/DomainObjectLayout.adoc[`@DomainObjectLayout`] annotation.
+** `DomainObjectLayoutData`, corresponding to the xref:refguide:applib:index/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/roles-mixins-contributees/contributee.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
index 909a64d..4f3c768 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
@@ -10,7 +10,7 @@ The interfaces listed in this chapter act as contributees; they allow domain ser
 == `HasUniqueId`
 
 The `HasUniqueId` interface is a mix-in for any domain objects that are uniquely identified, in particular to represent a system-level request or interaction.
-The canonical usage is where the unique identifier is actually a transaction id, as implemented by auditing entries or commands, or for xref:system:generated:index/applib/services/iactn/InteractionContext.adoc[`Interaction`]s persisted as published events.
+The canonical usage is where the unique identifier is actually a transaction id, as implemented by auditing entries or commands, or for xref:refguide:applib:index/services/iactn/InteractionContext.adoc[`Interaction`]s persisted as published events.
 
 The interface is defined is:
 
@@ -43,11 +43,11 @@ public interface RepresentsInteractionMemberExecution extends HasUniqueId {
 
 Here the (inherited) `getTransactionId()` is intended to be interpreted as an interaction (cf xref:refguide:schema:ixn[`InteractionDto`]) that has at least one member execution (cf xref:refguide:schema:about.adoc#ixn/memberExecutionDto.adoc[`memberExecutionDto`]).
 
-If the interaction (almost certainly an action) calls other actions by way of xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory]), then there may be several member executions, each with a unique sequence number, within the same transaction Id.
+If the interaction (almost certainly an action) calls other actions by way of xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory]), then there may be several member executions, each with a unique sequence number, within the same transaction Id.
 
 The purpose of this interface is to allow mixins to be defined, though the framework itself defines none.
 
-Currently the only implementation of this interface is that for `PublishedObjects` applib interface as defined by the xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
+Currently the only implementation of this interface is that for `PublishedObjects` applib interface as defined by the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
 
 [[HasUserName]]
 == `HasUsername`
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Dto.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Dto.adoc
index 603c3be..5ddde2a 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Dto.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Dto.adoc
@@ -63,4 +63,4 @@ The `IsisSchemas` parameter to the action can be used to optionally ignore the c
 
 == Related Services
 
-The `Dto_downloadXml` and `Dto_downloadXsd` delegate to the xref:system:generated:index/applib/services/jaxb/JaxbService.adoc[`JaxbService`] to actually generate the XML/XSD.
+The `Dto_downloadXml` and `Dto_downloadXsd` delegate to the xref:refguide:applib:index/services/jaxb/JaxbService.adoc[`JaxbService`] to actually generate the XML/XSD.
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Object.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Object.adoc
index 708b91e..6356a6a 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Object.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/mixins/Object.adoc
@@ -35,7 +35,7 @@ public void clearHints() {
 
 === Related Services
 
-This mixin uses the xref:system:generated:index/applib/services/hint/HintStore.adoc[`HintStore`] service to store and retrieve UI hints for each rendered object, per user.
+This mixin uses the xref:refguide:applib:index/services/hint/HintStore.adoc[`HintStore`] service to store and retrieve UI hints for each rendered object, per user.
 
 
 
@@ -60,12 +60,12 @@ public Object downloadLayoutXml(
 <1> either current, complete, normalized or minimal.
 
 See the documentation on xref:userguide:fun:ui.adoc#object-layout[layout XML] and also
-the xref:system:generated:index/applib/services/layout/LayoutService.adoc[`LayoutService`] for more information on these styles
+the xref:refguide:applib:index/services/layout/LayoutService.adoc[`LayoutService`] for more information on these styles
 
 
 === Related Services
 
-This mixin calls xref:system:generated:index/applib/services/layout/LayoutService.adoc[`LayoutService`] to obtain the layout XML.
+This mixin calls xref:refguide:applib:index/services/layout/LayoutService.adoc[`LayoutService`] to obtain the layout XML.
 
 
 
@@ -88,7 +88,7 @@ public void rebuildMetamodel() {
 
 === Related Services
 
-This mixin calls xref:system:generated:index/applib/services/metamodel/MetaModelService.adoc[`MetaModelService`] and the xref:system:generated:index/applib/services/grid/GridService.adoc[`GridService`] to invalidate their caches.
+This mixin calls xref:refguide:applib:index/services/metamodel/MetaModelService.adoc[`MetaModelService`] and the xref:refguide:applib:index/services/grid/GridService.adoc[`GridService`] to invalidate their caches.
 
 
 
@@ -109,7 +109,7 @@ public URL openRestApi() { /* ... */ }
 
 === Related Services
 
-This mixin calls xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`] to build the URL.
+This mixin calls xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`] to build the URL.
 
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedAt.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedAt.adoc
index 1e8a605..a89d08a 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedAt.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/roles-mixins-contributees/roles/HoldsUpdatedAt.adoc
@@ -18,7 +18,7 @@ public interface HoldsUpdatedAt {
 }
 ----
 
-The current time is obtained from the xref:system:generated:index/applib/services/clock/ClockService.adoc[`ClockService`].
+The current time is obtained from the xref:refguide:applib:index/services/clock/ClockService.adoc[`ClockService`].
 
 Entities that implement this interface often also implement xref:applib-classes:about.adoc#HoldsUpdatedBy[`HoldsUpdatedBy`] role interface; as a convenience the xref:applib-classes:about.adoc#Timestampable[`Timestampable`] interface combines the two roles.
 
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 fb199d1..7fbd5ec 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: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()`]).
+Apache Isis will automatically apply such specifications as validation rules on properties (as per xref:refguide:applib:index/annotation/Property.adoc#mustSatisfy[`@Property#mustSatisfy()`]) and on action parameters (as per xref:refguide:applib:index/annotation/Parameter.adoc#mustSatisfy[`@Parameter#mustSatisfy()`]).
 
 [#specification]
 == `Specification`
diff --git a/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc b/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
index 0ec5f33..10eb532 100644
--- a/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
+++ b/api/applib/src/main/adoc/modules/applib-classes/pages/utility.adoc
@@ -9,7 +9,7 @@ classes designed to simplify the coding of some common tasks.
 
 
 
-include::system:generated:page$index/applib/util/Enums.adoc.adoc[leveloffset=+1]
-include::system:generated:page$index/applib/util/ObjectContracts.adoc[leveloffset=+1]
-include::system:generated:page$index/applib/util/Reasons.adoc[leveloffset=+1]
-include::system:generated:page$index/applib/util/TitleBuffer.adoc[leveloffset=+1]
+include::refguide:applib:page$index/util/Enums.adoc.adoc[leveloffset=+1]
+include::refguide:applib:page$index/util/ObjectContracts.adoc[leveloffset=+1]
+include::refguide:applib:page$index/util/Reasons.adoc[leveloffset=+1]
+include::refguide:applib:page$index/util/TitleBuffer.adoc[leveloffset=+1]
diff --git a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
index 882555f..2438746 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/lifecycle.adoc
@@ -20,7 +20,7 @@ The lifecycle callback methods supported by Apache Isis are:
 equivalent
 
 |created()
-|called when an object has just been created using xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService#create(..)`] or xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`]
+|called when an object has just been created using xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService#create(..)`] or xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`]
 |xref:applib-classes:events.adoc#ObjectCreatedEvent[ObjectCreatedEvent]
 
 |loaded()
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 8019277..f323156 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
@@ -5,9 +5,9 @@
 
 
 
-The `created()` lifecycle callback method is called when a  domain object has just been instantiated using xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService`]
+The `created()` lifecycle callback method is called when a  domain object has just been instantiated using xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService`]
 
-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.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:refguide:applib:index/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 c55d4a6..8956756 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:system:generated:index/applib/annotation/DomainObject.adoc#loadedLifecycleEvent[`@DomainObject#loadedLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:refguide:applib:index/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 3187867..2d7a11e 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:system:generated:index/applib/annotation/DomainObject.adoc#persistedLifecycleEvent[`@DomainObject#persistedLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:refguide:applib:index/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 8baddf5..92e925a 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:system:generated:index/applib/annotation/DomainObject.adoc#persistingLifecycleEvent[`@DomainObject#persistingLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:refguide:applib:index/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 8255e53..62dcbea 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:system:generated:index/applib/annotation/DomainObject.adoc#removingLifecycleEvent[`@DomainObject#removingLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:refguide:applib:index/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 503c230..c755bd9 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:system:generated:index/applib/annotation/DomainObject.adoc#updatedLifecycleEvent[`@DomainObject#updatedLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:refguide:applib:index/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 feec9f6..d9bd342 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:system:generated:index/applib/annotation/DomainObject.adoc#updatingLifecycleEvent[`@DomainObject#updatingLifecycleEvent()`] event.
+An alternative means to interact with the lifecycle is by setting up a subscriber on the xref:refguide:applib:index/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 cdfb549..f808eb1 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:system:generated:index/applib/annotation/DomainObject.adoc#autoCompleteRepository[`@DomainObject` +
+Alternatively, can specify for a class using xref:refguide:applib:index/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 bb7ecff..31c1e4a 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: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
+<.> the xref:refguide:applib:index/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: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
+<1> the xref:refguide:applib:index/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/prefixes/default.adoc b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/default.adoc
index 7d7406b..ddf4628 100644
--- a/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/default.adoc
+++ b/api/applib/src/main/adoc/modules/applib-methods/pages/prefixes/default.adoc
@@ -8,7 +8,7 @@
 The `default...()` supporting method is called for action parameters to return the initial argument value.
 This may be some sensible default (eg today's date, or 0 or 1), or -- for an action that is modifying the state of an object -- might default to the current value of a corresponding property.
 
-The method is _also_ called for properties in the case when an object is newly instantiated using xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`] or xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService#create(...)`].
+The method is _also_ called for properties in the case when an object is newly instantiated using xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`] or xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService#create(...)`].
 This is a much less common use case.
 If a default is not specified then properties are initialized to a default based on their type (eg 0 or `false`).
 
@@ -153,7 +153,7 @@ public class ShoppingCartItem {
 
 There are, in fact, two other ways to set properties of a newly instantiated object to default values.
 
-The first is to use the xref:refguide:applib-methods:lifecycle.adoc#created[`created()`] callback, called by the framework when xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`] or xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService#create(...)`] is called.
+The first is to use the xref:refguide:applib-methods:lifecycle.adoc#created[`created()`] callback, called by the framework when xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`] or xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService#create(...)`] is called.
 This method is called after any services have been injected into the domain object.
 
 The second is more straightforward: simply initialize properties in the constructor.
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 91d7e64..b167987 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
@@ -10,7 +10,7 @@ This value is used internally to generate a string representation of an service
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
- (see xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[`BookmarkService`])
+ (see xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[`BookmarkService`])
 * in the serialization of `OidDto` in the xref:refguide:schema:cmd[command] and xref:refguide:schema:ixn.adoc[interaction] schemas
 * in the URLs of the xref:vro:ROOT:about.adoc[RestfulObjects viewer]
 * in the URLs of the xref:vw:ROOT:about.adoc[Wicket viewer] (specifically, for bookmarked actions)
@@ -36,7 +36,7 @@ public class OrderMenu {
 
 The rules of precedence are:
 
-1. xref:system:generated:index/applib/annotation/DomainService.adoc#objectType[`@DomainService#objectType()`]
+1. xref:refguide:applib:index/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 1f94b72..7f8196b 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: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].
+This may be specified using annotations such as xref:refguide:applib:index/annotation/MemberOrder.adoc[`@MemberOrder`], xref:refguide:applib:index/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 0e11438..091966c 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:system:generated:index/applib/annotation/Title.adoc[`@Title`] annotation.
+In many cases, though, you may be able to use the xref:refguide:applib:index/annotation/Title.adoc[`@Title`] annotation.
 
 r
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
index 970f5fc..7284713 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
@@ -16,18 +16,18 @@ image::reference-services/categories.png[width="600px"]
 What distinguishes API from SPI is primarily whether it is called by the domain application itself, or is called by the framework:
 
 * All of the API domain services provide a default implementation, and so can always be called by domain objects.
-* Most of the SPI domain services also have a default implementation, although in many cases this is a fallback implementation (such as ``AuditerServiceLogging`` for the xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber]).
+* Most of the SPI domain services also have a default implementation, although in many cases this is a fallback implementation (such as ``AuditerServiceLogging`` for the xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber]).
 
 In one sense all API domain services are also SPI, in that they can be overridden by the domain programmer providing another domain service implementing the same type.
-For example, the framework-provided implementation of xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService`] could be overridden this way, perhaps for more monitoring or caching purposes.
+For example, the framework-provided implementation of xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService`] could be overridden this way, perhaps for more monitoring or caching purposes.
 This is most easily done using the Spring link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[`@Order`] annotation.
 Generally speaking in such cases higher precedence implementation will be used instead of the framework-provided implementation.
 For a small number of services, though, _all_ available implementations are delegated to.
-One example is the (aforementioned) xref:system:generated:index/applib/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] - all configured implementations will be delegated to.
+One example is the (aforementioned) xref:refguide:applib:index/services/publishing/spi/EntityPropertyChangeSubscriber.adoc[EntityPropertyChangeSubscriber] - all configured implementations will be delegated to.
 
-A small number of domain services can be considered both API and SPI; a good example is the xref:system:generated:index/applib/services/email/EmailService.adoc[`EmailService`] that is of direct use for domain objects wishing to send out emails, but is also used by the framework to support the xref:vw:ROOT:features.adoc#user-registration[user registration] functionality supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
-The same is true of the xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[`EventBusService`]; this can be used by domain objects to broadcast arbitrary events, but is also used by the framework to automatically emit events for
-xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`] etc.
+A small number of domain services can be considered both API and SPI; a good example is the xref:refguide:applib:index/services/email/EmailService.adoc[`EmailService`] that is of direct use for domain objects wishing to send out emails, but is also used by the framework to support the xref:vw:ROOT:features.adoc#user-registration[user registration] functionality supported by the xref:vw:ROOT:about.adoc[Wicket viewer].
+The same is true of the xref:refguide:applib:index/services/eventbus/EventBusService.adoc[`EventBusService`]; this can be used by domain objects to broadcast arbitrary events, but is also used by the framework to automatically emit events for
+xref:refguide:applib:index/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`] etc.
 For these hybrid services we have categorized the service as an API service.
 
 This body of this guide has one page per domain service, alphabetically.
@@ -87,9 +87,9 @@ public class Customer {
 
 For objects that are already persisted, the service is automatically injected just after the object is rehydrated by JDO/DataNucleus.
 
-For transient objects (instantiated programmatically), the xref:system:generated:index/applib/services/factory/FactoryService.adoc[`FactoryService#viewModel(...)`] or the xref:system:generated:index/applib/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`]'s will automatically inject the services.
+For transient objects (instantiated programmatically), the xref:refguide:applib:index/services/factory/FactoryService.adoc[`FactoryService#viewModel(...)`] or the xref:refguide:applib:index/services/repository/RepositoryService.adoc[`RepositoryService#detachedEntity(...)`]'s will automatically inject the services.
 
-Alternatively the object can be instantiated simply using `new`, then services injected using xref:system:generated:index/applib/services/inject/ServiceInjector.adoc[`ServiceInjector`]'s ``injectServicesInto(...)`` method.
+Alternatively the object can be instantiated simply using `new`, then services injected using xref:refguide:applib:index/services/inject/ServiceInjector.adoc[`ServiceInjector`]'s ``injectServicesInto(...)`` method.
 
 [#overriding-the-services]
 == Overriding the services
@@ -98,7 +98,7 @@ The framework provides default implementations for many of the domain services.
 This is convenient, but sometimes you will want to replace the default implementation with your own service implementation.
 This is most commonly done using the Spring link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[@Order] annotation.
 Inspect the source code of the default implementation to determine which value to use.
-The xref:system:generated:index/applib/annotation/OrderPrecedence.adoc[OrderPrecedence] class provides some pre-defined precedences.
+The xref:refguide:applib:index/annotation/OrderPrecedence.adoc[OrderPrecedence] class provides some pre-defined precedences.
 
 
 Spring offers a number of other mechanisms to specify the ordering; these can also be used.
@@ -106,11 +106,11 @@ Spring offers a number of other mechanisms to specify the ordering; these can al
 For some domain services, all framework will delegate to all available implementation, using a chain-of-responsibility pattern):
 These include:
 
-xref:system:generated:index/applib/services/conmap/ContentMappingService.adoc[`ContentMappingService`],
-xref:system:generated:index/applib/services/grid/GridSystemService.adoc[`GridSystemService`], and
-xref:system:generated:index/applib/services/routing/RoutingService.adoc[`RoutingService`].
+xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[`ContentMappingService`],
+xref:refguide:applib:index/services/grid/GridSystemService.adoc[`GridSystemService`], and
+xref:refguide:applib:index/services/routing/RoutingService.adoc[`RoutingService`].
 
-For example, suppose you wanted to provide your own implementation of xref:system:generated:index/applib/services/i18n/LocaleProvider.adoc[`LocaleProvider`].
+For example, suppose you wanted to provide your own implementation of xref:refguide:applib:index/services/i18n/LocaleProvider.adoc[`LocaleProvider`].
 The default implementation has these annotations:
 
 [source,java]
@@ -147,51 +147,51 @@ image::reference-services/commands-and-events.png[width="960px"]
 
 To explain:
 
-* the (request-scoped) xref:system:generated:index/applib/services/iactn/InteractionContext.adoc[`InteractionContext`] domain service acts as a factory for the ``Interaction`` object, which keeps track of the call-graph of executions (``Interaction.Execution``) of either action invocations or property edits.
+* the (request-scoped) xref:refguide:applib:index/services/iactn/InteractionContext.adoc[`InteractionContext`] domain service acts as a factory for the ``Interaction`` object, which keeps track of the call-graph of executions (``Interaction.Execution``) of either action invocations or property edits.
 +
-In the majority of cases there is likely to be just a single top-level node of this graph, but for applications that use the xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] extensively each successive call results in a new child execution.
+In the majority of cases there is likely to be just a single top-level node of this graph, but for applications that use the xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory] extensively each successive call results in a new child execution.
 
 * the `Interaction` also holds a reference to the `Command`, which represents the top-level intention to invoke the action / edit the property.
 
 * before and after each action invocation/property edit, a xref:applib-classes:events/domainevent.adoc[domain event] is may be broadcast to all subscribers.
-Whether this occurs depends on whether the action/property has been annotated (using xref:system:generated:index/applib/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`] or xref:system:generated:index/applib/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`]).
+Whether this occurs depends on whether the action/property has been annotated (using xref:refguide:applib:index/annotation/Action.adoc#domainEvent[`@Action#domainEvent()`] or xref:refguide:applib:index/annotation/Property.adoc#domainEvent[`@Property#domainEvent()`]).
 +
 (Note that subscribers will also receive events for vetoing the action/property; this is not shown on the diagram).
 
 * As each execution progresses, and objects that are modified are "enlisted" into the (internal) xref:core:runtime-services:ChangedObjectsService.adoc[`ChangedObjectsServiceInternal`] domain service.
-Metrics as to which objects are merely loaded into memory are also captured using the xref:system:generated:index/applib/services/metrics/MetricsService.adoc[`MetricsService`] (not shown on the diagram).
+Metrics as to which objects are merely loaded into memory are also captured using the xref:refguide:applib:index/services/metrics/MetricsService.adoc[`MetricsService`] (not shown on the diagram).
 
 * At the end of each execution, details of that execution are published through the (internal)
 xref:core:runtime-services:ExecutionPublisher.adoc[`ExecutionPublisher`] domain service.
-This is only done for actions/properties annotated appropriate (with xref:system:generated:index/applib/annotation/Action.adoc#exectionPublishing[`@Action#exectionPublishing()`] or xref:system:generated:index/applib/annotation/Property.adoc#exectionPublishing[`@Property#exectionPublishing()`]).
+This is only done for actions/properties annotated appropriate (with xref:refguide:applib:index/annotation/Action.adoc#exectionPublishing[`@Action#exectionPublishing()`] or xref:refguide:applib:index/annotation/Property.adoc#exectionPublishing[`@Property#exectionPublishing()`]).
 +
-The internal service delegates in turn to any registered xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]s (there may be more than one).
+The internal service delegates in turn to any registered xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber]s (there may be more than one).
 
 * At the end of each transaction, details of all changed objects are published, through the (internal) xref:core:runtime-services:EntityChangesPublisher.adoc[`EntityChangesPublisher`] to any registered `EntityChangesSubscriber` implementations and
 through the (internal) xref:core:runtime-services:EntityPropertyChangePublisher.adoc[`EntityPropertyChangePublisher`] to any registered `EntityPropertyChangeSubscriber` implementations.
-Only domain objects specified to be published with xref:system:generated:index/applib/annotation/DomainObject.adoc#entityChangePublishing[`@DomainObject#entityChangePublishing()`] are published. +
+Only domain objects specified to be published with xref:refguide:applib:index/annotation/DomainObject.adoc#entityChangePublishing[`@DomainObject#entityChangePublishing()`] are published. +
 +
 [NOTE]
 ====
-Note that it's possible for there to be more than one transaction per top-level interaction, by virtue of the xref:system:generated:index/applib/services/xactn/TransactionService.adoc[`TransactionService`].
+Note that it's possible for there to be more than one transaction per top-level interaction, by virtue of the xref:refguide:applib:index/services/xactn/TransactionService.adoc[`TransactionService`].
 ====
 
-* At the end of the entire interaction footnote:[although rare, there can be multiple transactions in a single interaction], details of the top-level `Command` are sent to each xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber].
+* At the end of the entire interaction footnote:[although rare, there can be multiple transactions in a single interaction], details of the top-level `Command` are sent to each xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber].
 This captures whether the command succeeded or failed.
 +
 The xref:extensions:command-log:about.adoc[Command Log] extension uses this to persist a log of commands, for auditing or to support regression testing with the xref:extensions:command-replay:about.adoc[Command Replay] extension.
 
 
-Implementations of xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] can use the `Command#getMemento()` method to obtain a XML equivalent of that `Command`, reified using the xref:refguide:schema:cmd.adoc[`cmd.xsd`] schema.
+Implementations of xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber] can use the `Command#getMemento()` method to obtain a XML equivalent of that `Command`, reified using the xref:refguide:schema:cmd.adoc[`cmd.xsd`] schema.
 This can be converted back into a `CommandDto` using the `CommandDtoUtils` utility class (part of the applib).
 
-Similarly, implementations of xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] can use the `InteractionDtoUtils` utility class to obtain a `InteractionDto` representing the interaction, either just for a single execution or for the entire call-graph.
+Similarly, implementations of xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] can use the `InteractionDtoUtils` utility class to obtain a `InteractionDto` representing the interaction, either just for a single execution or for the entire call-graph.
 This can be converted into XML in a similar fashion.
 
 Likewise, the `PublishedObjects` class passed to the `PublisherService` at the end of the interaction provides the `PublishedObjects#getDto()` method which returns a `ChangesDto` instance.
 This can be converted into XML using the `ChangesDtoUtils` utility class.
 
-One final point: multiple xref:system:generated:index/applib/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] implementations are supported because different implementations may have different responsibilities.
+One final point: multiple xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] implementations are supported because different implementations may have different responsibilities.
 
 However, the SPI can also be used for profiling; each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that execution, and thus could be used for application profiling.
 The framework provides a default `PublisherServiceLogging` implementation that logs this using LOG4J2.
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-api.adoc
index 6b8c345..f49b89c 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-api.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-api.adoc
@@ -19,36 +19,36 @@ Domain service APIs for the application layer allow the domain objects to contro
 //NOTE: TODO: v2: this has been replaced by `WrapperFactory#async(...)`
 
 
-|xref:system:generated:index/applib/services/command/CommandExecutorService.adoc[CommandExecutorService]
+|xref:refguide:applib:index/services/command/CommandExecutorService.adoc[CommandExecutorService]
 |Executes the specified `Command`.
 
 
 
-|xref:system:generated:index/applib/services/iactn/InteractionContext.adoc[InteractionContext]
+|xref:refguide:applib:index/services/iactn/InteractionContext.adoc[InteractionContext]
 |Request-scoped access to the current member execution (action invocation or property edit), represented as the `Interaction` context.
 
 
 
-|xref:system:generated:index/applib/services/message/MessageService.adoc[MessageService]
+|xref:refguide:applib:index/services/message/MessageService.adoc[MessageService]
 |Methods to inform or warn the user, or to raise errors.
 
 
-|xref:system:generated:index/applib/services/sudo/SudoService.adoc[SudoService]
+|xref:refguide:applib:index/services/sudo/SudoService.adoc[SudoService]
 |Typically for use in testing while running xref:testing:fixtures:services/FixtureScripts.adoc[fixture scripts], allows a block of code to run as a specified user account.
 
 
 
-|xref:system:generated:index/applib/services/title/TitleService.adoc[TitleService]
+|xref:refguide:applib:index/services/title/TitleService.adoc[TitleService]
 |Methods to programmatically obtain the title or icon of a domain object.
 
 
 
-|xref:system:generated:index/applib/services/xactn/TransactionService.adoc[TransactionService]
+|xref:refguide:applib:index/services/xactn/TransactionService.adoc[TransactionService]
 |Methods for managing transactions.
 
 
 
-|xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory]
+|xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory]
 |Interact with another domain object "as if" through the UI (enforcing business rules, firing domain events)
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-spi.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-spi.adoc
index e78ce7c..36fcde6 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-spi.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/_application-layer-spi.adoc
@@ -19,17 +19,17 @@ Domain service SPIs influence how the framework handles application layer concer
 
 
 
-|xref:system:generated:index/applib/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber]
+|xref:refguide:applib:index/services/publishing/spi/CommandSubscriber.adoc[CommandSubscriber]
 |SPI service to listen on command instances, ie representations of an action invocation or property edit.
 Used for command/auditing and background services.
 
 
 
-|xref:system:generated:index/applib/services/health/HealthCheckService.adoc[HealthCheckService]
+|xref:refguide:applib:index/services/health/HealthCheckService.adoc[HealthCheckService]
 |Performs a health check so that the runtime infrastructure can determine if the application is still healthy (and perform remedial action, such as restarting the app, if not).
 
 
-|xref:system:generated:index/applib/services/homepage/HomePageResolverService.adoc[HomePageResolverService]
+|xref:refguide:applib:index/services/homepage/HomePageResolverService.adoc[HomePageResolverService]
 |Returns the home page object, if any is defined.
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/_core-domain-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/_core-domain-api.adoc
index 49e1192..9b3852d 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/_core-domain-api.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/_core-domain-api.adoc
@@ -13,35 +13,35 @@ The core/domain APIs provide general-purpose services to the domain objects, for
 |Description
 
 
-|xref:system:generated:index/applib/services/clock/ClockService.adoc[ClockService]
+|xref:refguide:applib:index/services/clock/ClockService.adoc[ClockService]
 |Access the current time (and for testing, allow the time to be changed)
 
 
-|xref:system:generated:index/applib/services/confview/ConfigurationViewService.adoc[ConfigurationViewService] & xref:system:generated:index/applib/services/confview/ConfigurationMenu.adoc[ConfigurationMenu]
-|Backing service which creates the list of configuration properties for xref:system:generated:index/applib/services/confview/ConfigurationMenu.adoc[ConfigurationMenu].
+|xref:refguide:applib:index/services/confview/ConfigurationViewService.adoc[ConfigurationViewService] & xref:refguide:applib:index/services/confview/ConfigurationMenu.adoc[ConfigurationMenu]
+|Backing service which creates the list of configuration properties for xref:refguide:applib:index/services/confview/ConfigurationMenu.adoc[ConfigurationMenu].
 
 
-|xref:system:generated:index/applib/services/eventbus/EventBusService.adoc[EventBusService]
+|xref:refguide:applib:index/services/eventbus/EventBusService.adoc[EventBusService]
 |Programmatically post events to the internal event bus.  Also used by Apache Isis itself to broadcast domain, UI and lifecycle events.
 
 
-|xref:system:generated:index/applib/services/factory/FactoryService.adoc[FactoryService]
+|xref:refguide:applib:index/services/factory/FactoryService.adoc[FactoryService]
 |Methods to instantiate and initialize domain objects
 
 
-|xref:system:generated:index/applib/services/scratchpad/Scratchpad.adoc[Scratchpad]
+|xref:refguide:applib:index/services/scratchpad/Scratchpad.adoc[Scratchpad]
 |Request-scoped service for interchanging information between and aggregating over multiple method calls.
 
 
-|xref:system:generated:index/applib/services/inject/ServiceInjector.adoc[ServiceInjector]
+|xref:refguide:applib:index/services/inject/ServiceInjector.adoc[ServiceInjector]
 |Programmatically inject services into arbitrary objects.
 
 
-|xref:system:generated:index/applib/services/registry/ServiceRegistry.adoc[ServiceRegistry]
+|xref:refguide:applib:index/services/registry/ServiceRegistry.adoc[ServiceRegistry]
 |Registry of all domain services, for service locator pattern.
 
 
-|xref:system:generated:index/applib/services/user/UserService.adoc[UserService]
+|xref:refguide:applib:index/services/user/UserService.adoc[UserService]
 |Methods to access the currently-logged on user.
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-api.adoc
index 2fc3428..6ce17e0 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-api.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-api.adoc
@@ -15,23 +15,23 @@ TIP: see also the xref:mappings:ROOT:about.adoc[Bounded Context Mappings] catalo
 |Description
 
 
-|xref:system:generated:index/applib/services/bookmark/BookmarkService.adoc[BookmarkService]
+|xref:refguide:applib:index/services/bookmark/BookmarkService.adoc[BookmarkService]
 |Convert object reference to a serializable "bookmark", and vice versa.
 
 
 
-|xref:system:generated:index/applib/services/email/EmailService.adoc[EmailService]
+|xref:refguide:applib:index/services/email/EmailService.adoc[EmailService]
 |Send a HTML email, optionally with attachments.
 
 
 
-|xref:system:generated:index/applib/services/jaxb/JaxbService.adoc[JaxbService]
+|xref:refguide:applib:index/services/jaxb/JaxbService.adoc[JaxbService]
 |Marshal and unmarshal JAXB-annotated view models to/from XML.
 
 
 
 
-|xref:system:generated:index/applib/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService]
+|xref:refguide:applib:index/services/xmlsnapshot/XmlSnapshotService.adoc[XmlSnapshotService]
 |Generate an XML representation of an object and optionally a graph of related objects.
 
 
diff --git a/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-spi.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-spi.adoc
index 4d4f8e3..9258038 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-spi.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/partials/_integration-spi.adoc
@@ -16,29 +16,29 @@ TIP: see also the xref:mappings:ROOT:about.adoc[Bounded Context Mappings] catalo
 
 
 
-|xref:system:generated:index/applib/services/commanddto/processor/spi/CommandDtoProcessorService.adoc.adoc[CommandDtoProcessorService]
+|xref:refguide:applib:index/services/commanddto/processor/spi/CommandDtoProcessorService.adoc.adoc[CommandDtoProcessorService]
 |SPI to support representation of commands as XML over REST, in particular to support master/slave replay of commands.
 
 
-|xref:system:generated:index/applib/services/command/CommandExecutorService.adoc[CommandExecutorService]
+|xref:refguide:applib:index/services/command/CommandExecutorService.adoc[CommandExecutorService]
 |Service used to execute commands.
 One use case is to replay commands from a primary onto a secondary (see xref:extensions:command-replay:about.adoc[Command Replay] ; another is in support of async commands (using
-xref:system:generated:index/applib/services/wrapper/WrapperFactory.adoc[WrapperFactory] ).
... 1394 lines suppressed ...