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

danhaywood pushed a commit to branch CAUSEWAY-2485
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/CAUSEWAY-2485 by this push:
     new 151c2fe3fc CAUSEWAY-2485: completes @DomainObjectLayout#paged
151c2fe3fc is described below

commit 151c2fe3fc0f86cae924713ec08ec187c2fa2f5a
Author: danhaywood <[email protected]>
AuthorDate: Wed Apr 5 08:17:26 2023 +0200

    CAUSEWAY-2485: completes @DomainObjectLayout#paged
---
 .../_interactions/InteractionDtoVm.layout.xml      | 11 +++---
 .../associateWith/ActionAssociateWithPage.java     |  2 +-
 .../child/ActionAssociateWithChildVm.layout.xml    | 11 +++---
 .../jdo/ActionCommandPublishingJdo.java            |  2 +-
 .../jpa/ActionCommandPublishingJpa.java            |  2 +-
 .../Action/domainEvent/ActionDomainEventPage.java  |  2 +-
 .../jdo/ActionExecutionPublishingJdo.java          |  2 +-
 .../jpa/ActionExecutionPublishingJpa.java          |  2 +-
 .../actions/Action/hidden/ActionHiddenPage.java    |  2 +-
 .../Action/restrictTo/ActionRestrictToPage.java    |  2 +-
 .../Action/semantics/ActionSemanticsPage.java      |  2 +-
 .../actions/Action/typeOf/ActionTypeOfPage.java    |  2 +-
 .../Action/typeOf/child/ActionTypeOfVm.layout.xml  | 11 +++---
 .../ActionLayoutAssociateWithPage.java             |  2 +-
 .../cssClass/ActionLayoutCssClassPage.java         |  2 +-
 .../cssClassFa/ActionLayoutCssClassFaPage.java     |  2 +-
 .../describedAs/ActionLayoutDescribedAsPage.java   |  2 +-
 .../fieldSet/ActionLayoutFieldSetPage.java         |  2 +-
 .../hidden/ActionLayoutHiddenPage.java             |  2 +-
 .../ActionLayout/named/ActionLayoutNamedPage.java  |  2 +-
 .../position/ActionLayoutPositionPage.java         |  2 +-
 .../promptStyle/ActionLayoutPromptStylePage.java   |  2 +-
 .../ActionLayoutRedirectPolicyPage.java            |  2 +-
 .../sequence/ActionLayoutSequencePage.java         |  2 +-
 .../Collection/hidden/CollectionHiddenPage.java    |  2 +-
 .../Collection/typeOf/CollectionTypeOfPage.java    |  2 +-
 .../cssClass/CollectionLayoutCssClassPage.java     |  2 +-
 .../CollectionLayoutDefaultViewPage.java           |  2 +-
 .../CollectionLayoutDescribedAsPage.java           |  2 +-
 .../hidden/CollectionLayoutHiddenPage.java         |  2 +-
 .../named/CollectionLayoutNamedPage.java           |  2 +-
 .../paged/CollectionLayoutPagedPage.java           |  2 +-
 .../sequence/CollectionLayoutSequencePage.java     |  2 +-
 .../sortedBy/CollectionLayoutSortedByPage.java     |  2 +-
 .../CollectionLayoutTableDecoratorPage.java        |  2 +-
 .../aliased/DomainObjectAliasedPage.java           |  2 +-
 .../autoComplete/DomainObjectAutoCompletePage.java |  2 +-
 .../bounded/DomainObjectBoundingPage.java          |  2 +-
 .../editing/DomainObjectEditingPage.java           |  2 +-
 .../DomainObjectEntityChangePublishingVm.java      |  2 +-
 .../DomainObjectIntrospectionPage.java             |  2 +-
 .../mixinMethod/DomainObjectMixinMethodPage.java   |  2 +-
 .../nature/DomainObjectNaturePage.java             |  2 +-
 .../DomainObjectXxxLifecycleEventPage.java         |  2 +-
 .../DomainObjectLayoutBookmarkingPage.java         |  2 +-
 .../DomainObjectLayoutCssClassPage.layout.xml      | 11 +++---
 .../DomainObjectLayoutNamedPage-description.adoc   |  4 +--
 .../DomainObjectLayoutPagedPage-description.adoc   | 42 +++++++++++++++++++---
 .../paged/DomainObjectLayoutPagedPage.java         | 27 ++------------
 .../paged/DomainObjectLayoutPagedPage.layout.xml   | 22 +++++++++---
 ...jectLayoutPagedPage_actionReturningObjects.java | 27 ++++++++++++++
 .../DomainObjectLayoutTableDecoratorPage.java      |  2 +-
 .../DomainObjectLayoutXxxUiEventPage.java          |  2 +-
 .../jdo/PropertyCommandPublishingJdo.java          |  2 +-
 .../jpa/PropertyCommandPublishingJpa.java          |  2 +-
 .../Property/editing/PropertyEditingPage.java      |  2 +-
 .../PropertyEditingReasonDisabledPage.java         |  2 +-
 .../jdo/PropertyExecutionPublishingJdo.java        |  2 +-
 .../jpa/PropertyExecutionPublishingJpa.java        |  2 +-
 .../fileAccept/PropertyFileAcceptPage.java         |  2 +-
 .../Property/hidden/PropertyHiddenPage.java        |  2 +-
 .../hidden/child/PropertyHiddenChildVm.java        |  2 +-
 .../hidden/child/PropertyHiddenChildVm.layout.xml  | 11 +++---
 .../Property/maxLength/PropertyMaxLengthPage.java  |  2 +-
 .../mustSatisfy/PropertyMustSatisfyPage.java       |  2 +-
 .../optionality/PropertyOptionalityPage.java       |  2 +-
 .../projecting/PropertyProjectingPage.java         |  2 +-
 .../PropertyProjectingChildEntity.layout.xml       | 11 +++---
 .../regexPattern/PropertyRegexPatternPage.java     |  2 +-
 .../cssClass/PropertyLayoutCssClassPage.java       |  2 +-
 .../describedAs/PropertyLayoutDescribedAsPage.java |  2 +-
 .../hidden/PropertyLayoutHiddenPage.java           |  2 +-
 .../hidden/child/PropertyLayoutHiddenChildVm.java  |  2 +-
 .../child/PropertyLayoutHiddenChildVm.layout.xml   | 11 +++---
 .../PropertyLayoutLabelPositionPage.java           |  2 +-
 .../multiLine/PropertyLayoutMultiLinePage.java     |  2 +-
 .../named/PropertyLayoutNamedPage.java             |  2 +-
 .../renderDay/PropertyLayoutRenderDayPage.java     |  2 +-
 .../repainting/PropertyLayoutRepaintingPage.java   |  2 +-
 .../PropertyLayoutTypicalLengthPage.java           |  2 +-
 .../child/XmlSnapshotChildVm.layout.xml            | 11 +++---
 .../peer/XmlSnapshotPeerVm.layout.xml              | 11 +++---
 .../peer/child/XmlSnapshotPeerChildVm.layout.xml   | 11 +++---
 83 files changed, 225 insertions(+), 143 deletions(-)

diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml
index e27e4030c3..c3a65fe798 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml
@@ -48,12 +48,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithPage.java
index efb324e475..b436af657c 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithPage.java
@@ -69,7 +69,7 @@ public class ActionAssociateWithPage implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "Action#choicesFrom/ActionLayout#associateWith";
+        return "@Action#choicesFrom/ActionLayout#associateWith";
     }
 
 //tag::class-properties[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml
index ed31dc8b27..257580e0f5 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml
@@ -34,12 +34,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
index a991c0a271..42bf8659c2 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
@@ -66,7 +66,7 @@ public class ActionCommandPublishingJdo
     }
 
     @ObjectSupport public String title() {
-        return "Action#commandPublishing (JDO)";
+        return "@Action#commandPublishing (JDO)";
     }
 
 //tag::property[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
index 4efbfea040..2e5bc95e7b 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
@@ -71,7 +71,7 @@ public class ActionCommandPublishingJpa
     }
 
     @ObjectSupport public String title() {
-        return "Action#commandPublishing (JPA)";
+        return "@Action#commandPublishing (JPA)";
     }
 
     @Id
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
index a618b1debf..3b42c05953 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java
@@ -44,7 +44,7 @@ public class ActionDomainEventPage implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "Action#domainEvent";
+        return "@Action#domainEvent";
     }
 
     @Property()
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
index 19f9302b07..34786e821c 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
@@ -65,7 +65,7 @@ public class ActionExecutionPublishingJdo
     }
 
     @ObjectSupport public String title() {
-        return "Action#executionPublishing (JDO)";
+        return "@Action#executionPublishing (JDO)";
     }
 
 //tag::property[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
index eb5b50ab51..20b4a121f7 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
@@ -70,7 +70,7 @@ public class ActionExecutionPublishingJpa
     }
 
     @ObjectSupport public String title() {
-        return "Action#executionPublishing (JPA)";
+        return "@Action#executionPublishing (JPA)";
     }
 
     @Id
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenPage.java
index a6c7c118df..f3b54add58 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenPage.java
@@ -59,7 +59,7 @@ public class ActionHiddenPage implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "Action#hidden";
+        return "@Action#hidden";
     }
 
     @Property()
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
index 45561a6ff1..c7fcb082cb 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToPage.java
@@ -62,7 +62,7 @@ public class ActionRestrictToPage implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "Action#restrictTo";
+        return "@Action#restrictTo";
     }
 
     @Property()
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
index 04fb124ece..16d92dccd5 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsPage.java
@@ -78,7 +78,7 @@ public class ActionSemanticsPage implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "Action#semantics";
+        return "@Action#semantics";
     }
 
     @Property()
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
index 51a48a53b7..65da5f5646 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfPage.java
@@ -55,7 +55,7 @@ public class ActionTypeOfPage implements 
HasAsciiDocDescription {
 //end::class-collections-children[]
 
     @ObjectSupport public String title() {
-        return "Action#typeOf";
+        return "@Action#typeOf";
     }
 
 //tag::class-collections-children[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml
index ed31dc8b27..257580e0f5 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml
@@ -34,12 +34,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
index 9a01dbcb6b..e394c3c25e 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/associateWith/ActionLayoutAssociateWithPage.java
@@ -46,7 +46,7 @@ import lombok.Setter;
 public class ActionLayoutAssociateWithPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#associateWith";
+        return "@ActionLayout#associateWith";
     }
 
 //tag::act_and_prop[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
index 71f67641e4..8386715e1c 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClass/ActionLayoutCssClassPage.java
@@ -42,7 +42,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutCssClassPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#cssClass";
+        return "@ActionLayout#cssClass";
     }
 
 //tag::act[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
index 0dd5fc7cdc..212d22fc81 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/cssClassFa/ActionLayoutCssClassFaPage.java
@@ -43,7 +43,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutCssClassFaPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#cssClassFa";
+        return "@ActionLayout#cssClassFa";
     }
 
 //tag::actLeftAndRight[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
index fe27153639..a1869ab902 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/describedAs/ActionLayoutDescribedAsPage.java
@@ -42,7 +42,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutDescribedAsPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#describedAs";
+        return "@ActionLayout#describedAs";
     }
 
 //tag::act[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
index 3bb51de01c..e65522c61a 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/fieldSet/ActionLayoutFieldSetPage.java
@@ -42,7 +42,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutFieldSetPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#fieldSet...";
+        return "@ActionLayout#fieldSet...";
     }
 
     @Action
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
index a99b804d29..b439f54c17 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/hidden/ActionLayoutHiddenPage.java
@@ -43,7 +43,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutHiddenPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#hidden";
+        return "@ActionLayout#hidden";
     }
 
 //tag::act[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
index 61cf95d65c..9eb2d9844d 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/named/ActionLayoutNamedPage.java
@@ -42,7 +42,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutNamedPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#named";
+        return "@ActionLayout#named";
     }
 
 //tag::act[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
index 954a95b7f4..36f5a23397 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionPage.java
@@ -47,7 +47,7 @@ import lombok.Setter;
 public class ActionLayoutPositionPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#position";
+        return "@ActionLayout#position";
     }
 
     @Property(optionality = Optionality.OPTIONAL)
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
index 1eb2ce8023..a82b2de074 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStylePage.java
@@ -47,7 +47,7 @@ import lombok.Setter;
 public class ActionLayoutPromptStylePage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#promptStyle";
+        return "@ActionLayout#promptStyle";
     }
 
     @Property(editing = Editing.DISABLED)
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
index 670dfed91e..eb4c0eb840 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/redirectPolicy/ActionLayoutRedirectPolicyPage.java
@@ -49,7 +49,7 @@ implements HasAsciiDocDescription
 //end::act[]
 
     @ObjectSupport public String title() {
-        return "ActionLayout#redirectPolicy";
+        return "@ActionLayout#redirectPolicy";
     }
 
 //tag::act[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
index 345ed39f8b..abdc3ce609 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/sequence/ActionLayoutSequencePage.java
@@ -42,7 +42,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutSequencePage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "ActionLayout#sequence";
+        return "@ActionLayout#sequence";
     }
 
 //tag::act1and2[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenPage.java
index 73bc2aabd0..acede92261 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/hidden/CollectionHiddenPage.java
@@ -53,7 +53,7 @@ import lombok.Setter;
 public class CollectionHiddenPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Collection#hidden";
+        return "@Collection#hidden";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
index 0d4bf09522..eb3beb85ac 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/typeOf/CollectionTypeOfPage.java
@@ -52,7 +52,7 @@ import lombok.Setter;
 public class CollectionTypeOfPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Collection#typeOf";
+        return "@Collection#typeOf";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
index 48666cc425..b7a9c8d06c 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/cssClass/CollectionLayoutCssClassPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class CollectionLayoutCssClassPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#cssClass";
+        return "@CollectionLayout#cssClass";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
index c4a1c1bf52..6586701a7b 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/defaultView/CollectionLayoutDefaultViewPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class CollectionLayoutDefaultViewPage implements HasAsciiDocDescription 
{
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#defaultView";
+        return "@CollectionLayout#defaultView";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
index ed85516b73..374f265cb8 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/describedAs/CollectionLayoutDescribedAsPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class CollectionLayoutDescribedAsPage implements HasAsciiDocDescription 
{
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#describedAs";
+        return "@CollectionLayout#describedAs";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
index 4b37f8e8b0..c2a9721e8b 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/hidden/CollectionLayoutHiddenPage.java
@@ -50,7 +50,7 @@ import lombok.Setter;
 public class CollectionLayoutHiddenPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#hidden";
+        return "@CollectionLayout#hidden";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
index 67641ea2c1..f247a7eb10 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/named/CollectionLayoutNamedPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class CollectionLayoutNamedPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#named";
+        return "@CollectionLayout#named";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
index 0578e0e3ca..44d5881cd9 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/paged/CollectionLayoutPagedPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class CollectionLayoutPagedPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#paged";
+        return "@CollectionLayout#paged";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
index c0d3fcb490..e4178c333d 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sequence/CollectionLayoutSequencePage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class CollectionLayoutSequencePage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#sequence";
+        return "@CollectionLayout#sequence";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
index 8a1436cebf..306a2ab3fe 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/sortedBy/CollectionLayoutSortedByPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class CollectionLayoutSortedByPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#sortedBy";
+        return "@CollectionLayout#sortedBy";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tableDecorator/CollectionLayoutTableDecoratorPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tableDecorator/CollectionLayoutTableDecoratorPage.java
index c8c3f792be..4a54a4d2e7 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tableDecorator/CollectionLayoutTableDecoratorPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/tableDecorator/CollectionLayoutTableDecoratorPage.java
@@ -50,7 +50,7 @@ import lombok.Setter;
 public class CollectionLayoutTableDecoratorPage implements 
HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "CollectionLayout#tableDecorator";
+        return "@CollectionLayout#tableDecorator";
     }
 
 //tag::collection[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
index 63e7c95a6c..4cf9a19cc0 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/aliased/DomainObjectAliasedPage.java
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectAliasedPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#aliased";
+        return "@DomainObject#aliased";
     }
 
 }
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
index d7be07156c..c30f1d7cee 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/autoComplete/DomainObjectAutoCompletePage.java
@@ -39,7 +39,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectAutoCompletePage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#autoComplete...";
+        return "@DomainObject#autoComplete...";
     }
 
 }
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
index 1089b0d87c..26af23aff9 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/bounded/DomainObjectBoundingPage.java
@@ -40,7 +40,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectBoundingPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#bounding";
+        return "@DomainObject#bounding";
     }
 
     /*
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
index b400591f86..5cc2f0d150 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/editing/DomainObjectEditingPage.java
@@ -40,7 +40,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectEditingPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#editing";
+        return "@DomainObject#editing";
     }
 
 }
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
index 988499e08f..ec72575be4 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
@@ -41,7 +41,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectEntityChangePublishingVm implements 
HasAsciiDocDescription, ExposeCapturedChanges {
 
     @ObjectSupport public String title() {
-        return "DomainObject#entityChangePublishing";
+        return "@DomainObject#entityChangePublishing";
     }
 
 }
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
index f4b89ef7ec..64e0f09adc 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/introspection/DomainObjectIntrospectionPage.java
@@ -40,7 +40,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectIntrospectionPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#introspection";
+        return "@DomainObject#introspection";
     }
 
 }
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
index 7e8c2d8a40..1f930224d6 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/mixinMethod/DomainObjectMixinMethodPage.java
@@ -36,7 +36,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectMixinMethodPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#mixinMethod";
+        return "@DomainObject#mixinMethod";
     }
 
 }
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
index 5d0ab8c0d2..4ac4495055 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/DomainObjectNaturePage.java
@@ -39,7 +39,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport;
 public class DomainObjectNaturePage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#nature";
+        return "@DomainObject#nature";
     }
 }
 //end::class[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
index 15cd15b379..caadb3379b 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/DomainObjectXxxLifecycleEventPage.java
@@ -42,7 +42,7 @@ import 
org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
 public class DomainObjectXxxLifecycleEventPage implements 
HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObject#xxxLifecyleEvent";
+        return "@DomainObject#xxxLifecyleEvent";
     }
 
     @XmlJavaTypeAdapter(PersistentEntityAdapter.class)
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
index 8b9b517c95..01c878cb3e 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingPage.java
@@ -41,7 +41,7 @@ import org.apache.causeway.applib.annotation.*;
 public class DomainObjectLayoutBookmarkingPage implements 
HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObjectLayout#bookmarking";
+        return "@DomainObjectLayout#bookmarking";
     }
 
     @Action
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.layout.xml
index db8737c04a..173168c3fb 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassPage.layout.xml
@@ -40,12 +40,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc
index c72fe88cc6..b1e29d1232 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc
@@ -20,6 +20,6 @@ In terms of code:
 ----
 include::DomainObjectLayoutNamed.java[tags=class]
 ----
-<.> provides the description.
-The viewer renders this in a tooltip.
+<.> overrides the default name.
+The viewer renders this name in a tooltip.
 
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage-description.adoc
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage-description.adoc
index 0afcdf6879..51a40a1ee5 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage-description.adoc
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage-description.adoc
@@ -1,9 +1,41 @@
 :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 `paged` attribute ...
+The 
link:https://causeway.apache.org/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html#paged[@DomainObjectLayout#paged]
 is used to specify how many instances of the domain object should be shown, 
per page, in both parented collections (those belonging to an object) and 
standalone collections (those returned from an action invocation).
 
-WARNING: TODO[CAUSEWAY-3309]
-Add link to object once visited as a bookmark
-Number of domain objects per page in collections
+NOTE: for parented collections, the `paged` value can be overridden on a 
case-by-case basis using 
link:https://causeway.apache.org/refguide/2.0.0-SNAPSHOT/applib/index/annotation/CollectionLayout.html#paged[@CollectionLayout#paged].
+
+
+
+
+=== How this demo works
+
+The collection on the left hand side shows a set of objects that have been 
annotated with `paged` of 5.
+Accordingly, only 5 objects are shown per page.
+
+The associated action "actionReturningCollection" returns these same objects 
as a standalone collection.
+Here again the `paged` value _is_ honoured.
+
+In terms of code:
+
+[source,java,indent=0]
+----
+include::DomainObjectLayoutPaged.java[tags=class]
+----
+<.> provides the description.
+The viewer renders this in a tooltip.
+
+
+=== Related configuration property
+
+To set the global default for `paged`, use this configuration property:
+
+[source,yaml]
+.application.yaml
+----
+causeway:
+  applib:
+    annotation:
+      domain-object-layout:
+        paged: 15
+----
 
-link:https://causeway.apache.org/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html#paged[@DomainObjectLayout#paged]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
index 7faa457e6d..fb88658128 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.java
@@ -34,34 +34,13 @@ import org.apache.causeway.applib.annotation.*;
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.DomainObjectLayoutPagedVm")
-@DomainObject(
-        nature=Nature.VIEW_MODEL)
-@DomainObjectLayout(
-        paged=3)
+@Named("demo.DomainObjectLayoutPagedPage")
+@DomainObject(nature=Nature.VIEW_MODEL)
 public class DomainObjectLayoutPagedPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObjectLayout#paged";
+        return "@DomainObjectLayout#paged";
     }
 
-    @Collection
-    private List<DomainObjectLayoutPagedPage> samples;
-    public List<DomainObjectLayoutPagedPage> getSamples() {
-        if(samples==null) {
-            samples = List.of(
-                    new DomainObjectLayoutPagedPage(),
-                    new DomainObjectLayoutPagedPage(),
-                    new DomainObjectLayoutPagedPage(),
-                    new DomainObjectLayoutPagedPage());
-        }
-        return samples;
-    }
-
-    @Property(optionality = Optionality.OPTIONAL)
-    @XmlElement(required = false)
-    @Getter @Setter
-    private String uuid = UUID.randomUUID().toString();
-
 }
 //end::class[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.layout.xml
index b4f853de75..e164bae209 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage.layout.xml
@@ -26,17 +26,31 @@
 
        <bs3:row>
                <bs3:col span="6">
+                       <bs3:row>
+                               <bs3:col span="12">
                        <cpt:fieldSet name="Other" id="other" 
unreferencedProperties="true"/>
+               </bs3:col>
+                       </bs3:row>
+                       <bs3:row>
+                               <bs3:col span="12">
+                                       <cpt:collection id="objects">
+                                               <cpt:action 
id="actionReturningObjects"/>
+                                       </cpt:collection>
+                               </bs3:col>
+                       </bs3:row>
                </bs3:col>
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
new file mode 100644
index 0000000000..f8fc490b43
--- /dev/null
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedPage_actionReturningObjects.java
@@ -0,0 +1,27 @@
+package demoapp.dom.domain.objects.DomainObjectLayout.paged;
+
+import demoapp.dom._infra.values.ValueHolderRepository;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.MemberSupport;
+
+@Action()
+@RequiredArgsConstructor
+public class DomainObjectLayoutPagedPage_actionReturningObjects {
+
+    @SuppressWarnings("unused")
+    private final DomainObjectLayoutPagedPage page;
+
+    @MemberSupport
+    public List<? extends DomainObjectLayoutPaged> act() {
+        return objectRepository.all();
+    }
+
+    @Inject ValueHolderRepository<String, ? extends DomainObjectLayoutPaged> 
objectRepository;
+
+}
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
index e69d4e56ea..68cbe7e0d6 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorPage.java
@@ -42,7 +42,7 @@ import org.apache.causeway.applib.annotation.*;
 public class DomainObjectLayoutTableDecoratorPage implements 
HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "DomainObjectLayout#tableDecorator";
+        return "@DomainObjectLayout#tableDecorator";
     }
 
     @Action
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
index be0a572cf5..3d7b0ca72f 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventPage.java
@@ -48,7 +48,7 @@ public class DomainObjectLayoutXxxUiEventPage implements 
HasAsciiDocDescription
     public static class LayoutUiEvent extends 
org.apache.causeway.applib.events.ui.LayoutUiEvent<DomainObjectLayoutXxxUiEventPage>
 { }
 
     @ObjectSupport public String title() {
-        return "DomainObjectLayout#xxxUiEvent (should be overwritten by 
ui-title-event-listener)";
+        return "@DomainObjectLayout#xxxUiEvent (should be overwritten by 
ui-title-event-listener)";
     }
 
     @ObjectSupport public String layout() {
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
index 65ad1eeb24..a84462fee2 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
@@ -62,7 +62,7 @@ public class PropertyCommandPublishingJdo
     }
 
     @ObjectSupport public String title() {
-        return "Property#commandPublishing (JDO)";
+        return "@Property#commandPublishing (JDO)";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
index af1f23a863..6a32616e1b 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
@@ -67,7 +67,7 @@ public class PropertyCommandPublishingJpa
     }
 
     @ObjectSupport public String title() {
-        return "Property#commandPublishing (JPA)";
+        return "@Property#commandPublishing (JPA)";
     }
 
     @Id
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
index 6ba7d1b4e0..8e370bc14f 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingPage.java
@@ -50,7 +50,7 @@ public class PropertyEditingPage implements 
HasAsciiDocDescription {
 //end::class[]
 
     @ObjectSupport public String title() {
-        return "Property#editing";
+        return "@Property#editing";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
index 6f922f754f..40da767b10 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
@@ -50,7 +50,7 @@ public class PropertyEditingReasonDisabledPage implements 
HasAsciiDocDescription
 //end::class[]
 
     @ObjectSupport public String title() {
-        return "Property#editingReasonDisabled";
+        return "@Property#editingReasonDisabled";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
index ff3437412f..9de13115dd 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
@@ -61,7 +61,7 @@ public class PropertyExecutionPublishingJdo
     }
 
     @ObjectSupport public String title() {
-        return "Property#executionPublishing (JDO)";
+        return "@Property#executionPublishing (JDO)";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
index c7ebd44a80..e3c25a1977 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
@@ -67,7 +67,7 @@ public class PropertyExecutionPublishingJpa
     }
 
     @ObjectSupport public String title() {
-        return "Property#executionPublishing (JDO)";
+        return "@Property#executionPublishing (JDO)";
     }
 
     @Id
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
index e7a2287b8f..38ec8519fc 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class PropertyFileAcceptPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Property#fileAccept";
+        return "@Property#fileAccept";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenPage.java
index 1f5f583c9d..2e51595c6a 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenPage.java
@@ -56,7 +56,7 @@ import lombok.Setter;
 public class PropertyHiddenPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Property#hidden";
+        return "@Property#hidden";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
index fd2d895f04..2e2965a371 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
@@ -65,7 +65,7 @@ public class PropertyHiddenChildVm implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "Property#hidden (child object)";
+        return "@Property#hidden (child object)";
     }
 
 //tag::variants-nowhere[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml
index 6e8afa2c57..e3d93da996 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml
@@ -36,12 +36,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
index 8f553c4536..828e8d3069 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthPage.java
@@ -47,7 +47,7 @@ import lombok.Setter;
 public class PropertyMaxLengthPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Property#maxLength";
+        return "@Property#maxLength";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
index 02822499d9..9987647531 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyPage.java
@@ -47,7 +47,7 @@ import lombok.Setter;
 public class PropertyMustSatisfyPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Property#mustSatisfy";
+        return "@Property#mustSatisfy";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
index 7d31986875..13776cdb4f 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityPage.java
@@ -50,7 +50,7 @@ public class PropertyOptionalityPage implements 
HasAsciiDocDescription {
 //end::class[]
 
     @ObjectSupport public String title() {
-        return "Property#optionality";
+        return "@Property#optionality";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
index a8f7207997..11e72be17f 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingPage.java
@@ -54,7 +54,7 @@ import lombok.Setter;
 public class PropertyProjectingPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Property#projecting";
+        return "@Property#projecting";
     }
 
 //tag::property[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml
index c7814d6fab..63d09b9839 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml
@@ -33,12 +33,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
index ae7187e05e..5db437ed99 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class PropertyRegexPatternPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "Property#regexPattern";
+        return "@Property#regexPattern";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
index 33b6dae97f..49b886b060 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassPage.java
@@ -48,7 +48,7 @@ import lombok.Setter;
 public class PropertyLayoutCssClassPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#cssClass";
+        return "@PropertyLayout#cssClass";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
index 03406ffd13..d8ea9bcf1a 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsPage.java
@@ -48,7 +48,7 @@ import lombok.Setter;
 public class PropertyLayoutDescribedAsPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#describedAs";
+        return "@PropertyLayout#describedAs";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
index ed364cd791..17465bb132 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenPage.java
@@ -57,7 +57,7 @@ import lombok.Setter;
 public class PropertyLayoutHiddenPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#hidden";
+        return "@PropertyLayout#hidden";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
index d3b01a585e..f50beb4b89 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
@@ -66,7 +66,7 @@ public class PropertyLayoutHiddenChildVm implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#hidden (child object)";
+        return "@PropertyLayout#hidden (child object)";
     }
 
 //tag::variants-nowhere[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml
index be03363438..fd924b2830 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml
@@ -37,12 +37,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
index c4c3db096a..1b1ae1598d 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionPage.java
@@ -49,7 +49,7 @@ import lombok.Setter;
 public class PropertyLayoutLabelPositionPage implements HasAsciiDocDescription 
{
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#labelPosition";
+        return "@PropertyLayout#labelPosition";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
index 185e5d29fa..b125e6b0ab 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLinePage.java
@@ -48,7 +48,7 @@ import lombok.Setter;
 public class PropertyLayoutMultiLinePage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#multiLine";
+        return "@PropertyLayout#multiLine";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
index 94b89d1345..d1ea3ebf07 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedPage.java
@@ -48,7 +48,7 @@ import lombok.Setter;
 public class PropertyLayoutNamedPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#named";
+        return "@PropertyLayout#named";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayPage.java
index dfb9e87251..a1b3c3e707 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayPage.java
@@ -60,7 +60,7 @@ public class PropertyLayoutRenderDayPage implements 
HasAsciiDocDescription {
     }
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#renderDay";
+        return "@PropertyLayout#renderDay";
     }
 
 //tag::render-not-specified[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
index e1625d02e0..fa715d18e8 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingPage.java
@@ -50,7 +50,7 @@ import lombok.Setter;
 public class PropertyLayoutRepaintingPage implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#repainting";
+        return "@PropertyLayout#repainting";
     }
 
     @Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
index 9720061489..4f23463b90 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthPage.java
@@ -48,7 +48,7 @@ import lombok.Setter;
 public class PropertyLayoutTypicalLengthPage implements HasAsciiDocDescription 
{
 
     @ObjectSupport public String title() {
-        return "PropertyLayout#typicalLength";
+        return "@PropertyLayout#typicalLength";
     }
 
 //tag::annotation[]
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml
index ed31dc8b27..257580e0f5 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml
@@ -34,12 +34,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml
index 6c4dc3a94f..cc9d58819c 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml
@@ -43,12 +43,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml
 
b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml
index ed31dc8b27..257580e0f5 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml
@@ -34,12 +34,15 @@
                <bs3:col span="6">
                        <cpt:fieldSet name="Description" id="description" >
                                <cpt:action id="clearHints" position="PANEL" />
-                               <cpt:action id="downloadLayoutXml"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="rebuildMetamodel" 
position="PANEL"/>
-                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadLayout"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="inspectMetamodel"  
position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-                               <cpt:action id="downloadJdoMetadata"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadMetamodelXml"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="downloadJdoMetamodel"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentCommands"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentExecutions"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="recentAuditTrailEntries"  
position="PANEL_DROPDOWN"/>
+                               <cpt:action id="impersonateWithRoles"  
position="PANEL_DROPDOWN"/>
                                <cpt:action id="openRestApi" 
position="PANEL_DROPDOWN" />
                                <cpt:property id="description"/>
                        </cpt:fieldSet>

Reply via email to