You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/01/10 10:41:23 UTC

[isis] branch master updated: ISIS-2939: recreate doc index

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new c2ad681  ISIS-2939: recreate doc index
c2ad681 is described below

commit c2ad681221f980a918f6a6705a2de822bb0fee89
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 10 11:36:41 2022 +0100

    ISIS-2939: recreate doc index
    
    - also revert mignotes
---
 .../index/{annotations => annotation}/Action.adoc  | 20 +++++++++-
 .../{annotations => annotation}/ActionLayout.adoc  | 22 ++++++++++-
 .../BookmarkPolicy.adoc                            |  0
 .../{annotations => annotation}/Bounding.adoc      |  0
 .../{annotations => annotation}/Collection.adoc    |  8 ++++
 .../CollectionLayout.adoc                          | 16 ++++++++
 .../{annotations => annotation}/DomainObject.adoc  | 24 +++++++++++-
 .../DomainObjectLayout.adoc                        | 16 ++++++++
 .../{annotations => annotation}/DomainService.adoc |  6 +++
 .../DomainServiceLayout.adoc                       |  6 +++
 .../DomainServiceLayout~MenuBar.adoc               |  0
 .../Domain~Exclude.adoc                            |  0
 .../Domain~Include.adoc                            |  0
 .../index/{annotations => annotation}/Editing.adoc |  0
 .../EntityChangeKind.adoc                          |  0
 .../{annotations => annotation}/HomePage.adoc      |  1 +
 .../InteractionScope.adoc                          |  1 +
 .../{annotations => annotation}/Introspection.adoc |  0
 .../{annotations => annotation}/LabelPosition.adoc |  0
 .../LogicalTypeName.adoc                           |  0
 .../{annotations => annotation}/MemberSupport.adoc |  4 +-
 .../{annotations => annotation}/MinLength.adoc     |  1 +
 .../index/{annotations => annotation}/Module.adoc  |  4 +-
 .../index/{annotations => annotation}/Nature.adoc  |  0
 .../NatureOfService.adoc                           |  0
 .../{annotations => annotation}/Navigable.adoc     |  0
 .../ObjectLifecycle.adoc                           |  4 +-
 .../{annotations => annotation}/ObjectSupport.adoc |  4 +-
 .../{annotations => annotation}/Optionality.adoc   |  0
 .../{annotations => annotation}/Parameter.adoc     | 14 ++++++-
 .../ParameterLayout.adoc                           | 33 ++++++++++++++++-
 .../PriorityPrecedence.adoc                        |  0
 .../{annotations => annotation}/Programmatic.adoc  |  1 +
 .../{annotations => annotation}/Projecting.adoc    |  0
 .../{annotations => annotation}/PromptStyle.adoc   |  0
 .../{annotations => annotation}/Property.adoc      | 26 +++++++++++++
 .../PropertyLayout.adoc                            | 43 +++++++++++++++++++++-
 .../{annotations => annotation}/Publishing.adoc    |  0
 .../{annotations => annotation}/Redirect.adoc      |  0
 .../{annotations => annotation}/RenderDay.adoc     |  2 +
 .../{annotations => annotation}/Repainting.adoc    |  0
 .../{annotations => annotation}/RestrictTo.adoc    |  0
 .../{annotations => annotation}/SemanticsOf.adoc   |  0
 .../{annotations => annotation}/Snapshot.adoc      |  0
 .../{annotations => annotation}/TimePrecision.adoc |  0
 .../index/{annotations => annotation}/Title.adoc   |  6 ++-
 .../index/{annotations => annotation}/Value.adoc   |  0
 .../ValueSemantics.adoc                            | 36 ++++++++++++++++++
 .../index/{annotations => annotation}/Where.adoc   |  0
 .../index/layout/component/ActionLayoutData.adoc   |  6 +--
 .../layout/component/CollectionLayoutData.adoc     |  2 +-
 .../layout/component/DomainObjectLayoutData.adoc   |  2 +-
 .../index/layout/component/PropertyLayoutData.adoc |  6 +--
 .../layout/component/ServiceActionLayoutData.adoc  |  2 +-
 .../index/layout/menubars/bootstrap3/BS3Menu.adoc  |  2 +-
 .../layout/menubars/bootstrap3/BS3MenuBar.adoc     |  2 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.adoc    |  2 +-
 .../pages/index/services/grid/GridService.adoc     |  8 ++--
 .../index/services/grid/GridSystemService.adoc     |  6 +--
 .../services/homepage/HomePageResolverService.adoc |  2 +-
 .../pages/index/services/metamodel/BeanSort.adoc   |  4 +-
 .../index/services/routing/RoutingService.adoc     |  2 +-
 .../pages/index/services/swagger/Visibility.adoc   |  2 +-
 .../applib/pages/index/util/TitleBuffer.adoc       | 20 +++++-----
 .../value/semantics/ValueSemanticsProvider.adoc    |  2 +-
 .../index/secman/applib/SecmanConfiguration.adoc   | 36 ------------------
 ...PermissionsEvaluationServiceAllowBeatsVeto.adoc | 21 -----------
 ...PermissionsEvaluationServiceVetoBeatsAllow.adoc | 21 -----------
 .../seed/IsisExtSecmanAdminRoleAndPermissions.adoc |  4 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.adoc |  2 +-
 .../applib/user/seed/IsisExtSecmanAdminUser.adoc   |  2 +-
 .../PermissionsEvaluationServiceForSecman.adoc}    |  7 ++--
 .../shirorealmldap/realm/impl/IsisLdapRealm.adoc   | 30 ---------------
 .../index/base/applib/utils/TitleBuilder.adoc      | 23 ------------
 .../applib/classrules/ArchitectureDomainRules.adoc | 28 +++++++-------
 .../applib/classrules/ArchitectureJdoRules.adoc    |  4 +-
 .../applib/classrules/ArchitectureJpaRules.adoc    |  4 +-
 .../pages/index/specsupport/applib/specs/V.adoc    | 14 -------
 .../modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc | 10 -----
 .../modules/eclipse/attachments/isis-templates.xml | 32 ++++++++--------
 .../userguide/modules/fun/pages/modules.adoc       |  2 +-
 .../isis/commons/internal/ioc/_IocContainer.java   |  6 +--
 core/adoc/modules/_overview/pages/about.adoc       | 15 ++++----
 .../demomodule/dom/PdfJsDemoObjectWithBlob.java    | 26 ++++++-------
 .../dom/PdfJsDemoObjectWithBlobMenu.java           | 18 ++++-----
 .../snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt    |  2 +-
 .../simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt        |  4 +-
 87 files changed, 395 insertions(+), 284 deletions(-)

diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Action.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc
similarity index 92%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Action.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc
index 8994645..5216100 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/Action.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc
@@ -131,7 +131,7 @@ Indicates where (in the UI) the action is not visible to the user.
 
 It is also possible to suppress an action's visibility using _ActionLayout#hidden()_ .
 
-For xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] actions, the action's visibility is dependent upon its _DomainService#nature() nature_ .
+For xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] actions, the action's visibility is dependent upon its _DomainService#nature() nature_ .
 
 [#restrictTo]
 === restrictTo
@@ -162,3 +162,21 @@ This is only provided as a fallback; usually the framework can infer the element
 For downloading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ).
 
 The value should be of the form "file_extension|audio/*|video/*|image/*|media_type".
+
+include::hooks/Action_010-examples-and-usage.adoc[]
+
+include::hooks/Action_021-associating.adoc[]
+
+include::hooks/Action_022-action-semantics.adoc[]
+
+include::hooks/Action_023-deployment-modes.adoc[]
+
+include::hooks/Action_024-domain-events.adoc[]
+
+include::hooks/Action_025-execution-publishing.adoc[]
+
+include::hooks/Action_026-command-processing.adoc[]
+
+include::hooks/Action_027-collection-types.adoc[]
+
+include::hooks/Action_030-see-also.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/ActionLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/ActionLayout.adoc
similarity index 91%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/ActionLayout.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/ActionLayout.adoc
index 3a74f53..5af503d 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/ActionLayout.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/ActionLayout.adoc
@@ -115,7 +115,7 @@ Note that it is also possible to associate an action with a collection using _Ac
 
 Whether (and how) this action can be bookmarked in the UI.
 
-For bookmarkable actions, either _org.apache.isis.applib.annotations.BookmarkPolicy#AS_ROOT_ and _org.apache.isis.applib.annotations.BookmarkPolicy#AS_CHILD_ can be used (they are treated identically).
+For bookmarkable actions, either _org.apache.isis.applib.annotation.BookmarkPolicy#AS_ROOT_ and _org.apache.isis.applib.annotation.BookmarkPolicy#AS_CHILD_ can be used (they are treated identically).
 
 [#cssClass]
 === cssClass
@@ -194,3 +194,23 @@ Supported by the Wicket viewer.
 The order of this member relative to other members in the same (layout) group, given in _Dewey-decimal_ notation.
 
 An alternative is to use the `Xxx.layout.xml` file, where `Xxx` is the domain object name.
+
+include::hooks/ActionLayout_010-examples-and-usage.adoc[]
+
+include::hooks/ActionLayout_021-promptStyle.adoc[]
+
+include::hooks/ActionLayout_022-position.adoc[]
+
+include::hooks/ActionLayout_023-describedAs.adoc[]
+
+include::hooks/ActionLayout_024-cssClass.adoc[]
+
+include::hooks/ActionLayout_025-cssClassFa.adoc[]
+
+include::hooks/ActionLayout_026-bookmarking.adoc[]
+
+include::hooks/ActionLayout_027-hidden.adoc[]
+
+include::hooks/ActionLayout_028-named.adoc[]
+
+include::hooks/ActionLayout_029-redirect.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/BookmarkPolicy.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/BookmarkPolicy.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/BookmarkPolicy.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/BookmarkPolicy.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Bounding.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Bounding.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Bounding.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Bounding.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Collection.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc
similarity index 93%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Collection.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc
index 5fc6fbf..2ec70ad 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/Collection.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc
@@ -66,3 +66,11 @@ Indicates when the collection is not visible to the user.
 The type-of the elements held within the collection.
 
 This is only provided as a fallback; usually the framework can infer the element type of the collection from the collection method's generic type.
+
+include::hooks/Collection_010-examples-and-usage.adoc[]
+
+include::hooks/Collection_021_domainEvent.adoc[]
+
+include::hooks/Collection_022_hidden.adoc[]
+
+include::hooks/Collection_023_typeOf.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/CollectionLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/CollectionLayout.adoc
similarity index 91%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/CollectionLayout.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/CollectionLayout.adoc
index 86eafaf..b8e22f6 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/CollectionLayout.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/CollectionLayout.adoc
@@ -123,3 +123,19 @@ Whenever there is a collection of type _java.util.SortedSet_ , the domain entity
 However, in some circumstances the ordering of collection may be different to the entity's natural ordering. For example, the entity may represent an interval of time sorted by its _startDate_ ascending, but the collection may wish to sort by _startDate_ .
 
 The purpose of this annotation is to provide a _java.util.Comparator_ such that the collection may be sorted in an order more suitable to the context.
+
+include::hooks/CollectionLayout_010-examples-and-usage.adoc[]
+
+include::hooks/CollectionLayout_021-defaultView.adoc[]
+
+include::hooks/CollectionLayout_022-paged.adoc[]
+
+include::hooks/CollectionLayout_023-describedAs.adoc[]
+
+include::hooks/CollectionLayout_024-sortedBy.adoc[]
+
+include::hooks/CollectionLayout_025-cssClass.adoc[]
+
+include::hooks/CollectionLayout_026-named.adoc[]
+
+include::hooks/CollectionLayout_027-hidden.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainObject.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc
similarity index 95%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/DomainObject.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc
index ce816ea..ae2faf7 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainObject.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc
@@ -1,7 +1,7 @@
 = @DomainObject
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Domain semantics for domain objects (entities and view models; for services see xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] ).
+Domain semantics for domain objects (entities and view models; for services see xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] ).
 
 == API
 
@@ -307,3 +307,25 @@ public class Order {
 ----
 
 This subclass must provide a no-arg constructor; the fields are set reflectively. It must also use `Object` as its generic type. This is to allow mixins to also emit the same event.
+
+include::hooks/DomainObject_010-examples-and-usage.adoc[]
+
+include::hooks/DomainObject_021-logicalTypeName.adoc[]
+
+include::hooks/DomainObject_022-nature.adoc[]
+
+include::hooks/DomainObject_023-editing.adoc[]
+
+include::hooks/DomainObject_024-domain-events.adoc[]
+
+include::hooks/DomainObject_025-lifecycle-events.adoc[]
+
+include::hooks/DomainObject_026-entityChangePublishing.adoc[]
+
+include::hooks/DomainObject_027-bounding.adoc[]
+
+include::hooks/DomainObject_028-autoCompleteRepository.adoc[]
+
+include::hooks/DomainObject_029-mixinMethod.adoc[]
+
+include::hooks/DomainObject_040-see-also.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainObjectLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
similarity index 92%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/DomainObjectLayout.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
index 1879be1..efa7458 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainObjectLayout.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
@@ -162,3 +162,19 @@ This subclass must provide a no-arg constructor; the fields are set reflectively
 Which subclass of xref:refguide:applib:index/events/ui/TitleUiEvent.adoc[TitleUiEvent] should be used to obtain a title.
 
 This subclass must provide a no-arg constructor; the fields are set reflectively.
+
+include::hooks/DomainObjectLayout_010-examples-and-usage.adoc[]
+
+include::hooks/DomainObjectLayout_021-describedAs.adoc[]
+
+include::hooks/DomainObjectLayout_022-cssClass.adoc[]
+
+include::hooks/DomainObjectLayout_023-cssClassFa.adoc[]
+
+include::hooks/DomainObjectLayout_024-named.adoc[]
+
+include::hooks/DomainObjectLayout_025-bookmarking.adoc[]
+
+include::hooks/DomainObjectLayout_026-paged.adoc[]
+
+include::hooks/DomainObjectLayout_027-ui-events.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainService.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
similarity index 93%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/DomainService.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
index 08646f0..eb39e98 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
@@ -41,3 +41,9 @@ The nature of this service, either in the UI or REST only
 The logical name of this object's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.CustomerService_ for a class 'org.mycompany.services.CustomerService'
 
 This value, if specified, is used in the serialized form of the object's xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] . A xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] is used by the framework to uniquely identify an object over time (same concept as a URN). Otherwise, if not specified, the fully qualified class name is used instead.
+
+include::hooks/DomainService_010-examples-and-usage.adoc[]
+
+include::hooks/DomainService_021-objectType.adoc[]
+
+include::hooks/DomainService_022-nature.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainServiceLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainServiceLayout.adoc
similarity index 90%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/DomainServiceLayout.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/DomainServiceLayout.adoc
index c04423c..06daef0 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainServiceLayout.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainServiceLayout.adoc
@@ -40,3 +40,9 @@ The menubar in which the menu that holds this service's actions should reside.
 Name of this class (overriding the name derived from its name in code).
 
 A typical use case is if the desired name is a reserved Java keyword, such as `default` or `package`.
+
+include::hooks/DomainServiceLayout_010-examples-and-usage.adoc[]
+
+include::hooks/DomainServiceLayout_021-menuBar.adoc[]
+
+include::hooks/DomainServiceLayout_022-named.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/DomainServiceLayout~MenuBar.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainServiceLayout~MenuBar.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/DomainServiceLayout~MenuBar.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/DomainServiceLayout~MenuBar.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Domain~Exclude.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Domain~Exclude.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Domain~Exclude.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Domain~Exclude.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Domain~Include.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Domain~Include.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Domain~Include.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Domain~Include.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Editing.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Editing.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Editing.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Editing.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/EntityChangeKind.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/EntityChangeKind.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/EntityChangeKind.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/EntityChangeKind.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/HomePage.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/HomePage.adoc
similarity index 95%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/HomePage.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/HomePage.adoc
index 28b0847..e411cd7 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/HomePage.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/HomePage.adoc
@@ -14,3 +14,4 @@ The view model is instantiated through a no-arg constructor, so must in effect b
 }
 ----
 
+include::hooks/HomePage_010-examples-and-usage.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/InteractionScope.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/InteractionScope.adoc
similarity index 95%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/InteractionScope.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/InteractionScope.adoc
index cd86362..da73b44 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/InteractionScope.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/InteractionScope.adoc
@@ -16,3 +16,4 @@ _@InteractionScope_ may be used as a meta-annotation to create custom composed a
 }
 ----
 
+include::hooks/InteractionScope_010-examples-and-usage.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Introspection.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Introspection.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Introspection.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Introspection.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/LabelPosition.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/LabelPosition.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/LabelPosition.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/LabelPosition.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/LogicalTypeName.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/LogicalTypeName.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/LogicalTypeName.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/LogicalTypeName.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/MemberSupport.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/MemberSupport.adoc
similarity index 66%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/MemberSupport.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/MemberSupport.adoc
index e58f6e7..59e426b 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/MemberSupport.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/MemberSupport.adoc
@@ -5,9 +5,9 @@ Indicates that a method is a supporting-method, one that contributes (hide, vali
 
 For _mixins_ is also allowed to be placed on the mixin's main method.
 
-By placing the xref:refguide:applib:index/annotations/MemberSupport.adoc[MemberSupport] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized by the meta-model and cannot be ignored.
+By placing the xref:refguide:applib:index/annotation/MemberSupport.adoc[MemberSupport] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized by the meta-model and cannot be ignored.
 
-It is complementary to xref:refguide:applib:index/annotations/ObjectSupport.adoc[ObjectSupport] and xref:refguide:applib:index/annotations/ObjectLifecycle.adoc[ObjectLifecycle] , and in some sense acts as the semantic counterpart to xref:refguide:applib:index/annotations/Programmatic.adoc[Programmatic] .
+It is complementary to xref:refguide:applib:index/annotation/ObjectSupport.adoc[ObjectSupport] and xref:refguide:applib:index/annotation/ObjectLifecycle.adoc[ObjectLifecycle] , and in some sense acts as the semantic counterpart to xref:refguide:applib:index/annotation/Programmatic.adoc[Programmatic] .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/MinLength.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/MinLength.adoc
similarity index 94%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/MinLength.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/MinLength.adoc
index 8799d04..38bdf78 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/MinLength.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/MinLength.adoc
@@ -13,3 +13,4 @@ Specify the minimum number of characters for an auto-complete search argument.
 }
 ----
 
+include::hooks/MinLength_010-examples-and-usage.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Module.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Module.adoc
similarity index 63%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Module.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Module.adoc
index af1bddf..e9c0b18 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/Module.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Module.adoc
@@ -3,9 +3,9 @@
 
 Intended to be annotated on the root marker class of a (Maven) module which contains a single coherent set of functionality, possibly including domain services.
 
-A xref:refguide:applib:index/annotations/Module.adoc[Module] (because it's a meta-annotation) is also a Spring _Configuration @Configuration_ , which means that the functionality can be depended upon transitively using Spring's _Import @Import_ annotation. Normally the import graph mirrors the dependencies in Maven.
+A xref:refguide:applib:index/annotation/Module.adoc[Module] (because it's a meta-annotation) is also a Spring _Configuration @Configuration_ , which means that the functionality can be depended upon transitively using Spring's _Import @Import_ annotation. Normally the import graph mirrors the dependencies in Maven.
 
-Also, a xref:refguide:applib:index/annotations/Module.adoc[Module] also declares the Spring _ComponentScan @ComponentScan_ (with no parameters), which means that any domain services in the same package or subpackages are automatically found and registered.
+Also, a xref:refguide:applib:index/annotation/Module.adoc[Module] also declares the Spring _ComponentScan @ComponentScan_ (with no parameters), which means that any domain services in the same package or subpackages are automatically found and registered.
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Nature.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Nature.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Nature.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Nature.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/NatureOfService.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/NatureOfService.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/NatureOfService.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/NatureOfService.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Navigable.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Navigable.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Navigable.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Navigable.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/ObjectLifecycle.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/ObjectLifecycle.adoc
similarity index 66%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/ObjectLifecycle.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/ObjectLifecycle.adoc
index 1edb189..9d141c4 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/ObjectLifecycle.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/ObjectLifecycle.adoc
@@ -5,9 +5,9 @@ Indicates that a method is an _Object_ lifecycle callback method, one of (create
 
 May only be placed on _domain object_ methods, not _mixins_ nor _domain services_ .
 
-By placing the xref:refguide:applib:index/annotations/ObjectLifecycle.adoc[ObjectLifecycle] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized by the meta-model and cannot be ignored.
+By placing the xref:refguide:applib:index/annotation/ObjectLifecycle.adoc[ObjectLifecycle] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized by the meta-model and cannot be ignored.
 
-It is complementary to xref:refguide:applib:index/annotations/MemberSupport.adoc[MemberSupport] and xref:refguide:applib:index/annotations/ObjectSupport.adoc[ObjectSupport] , and in some sense acts as the semantic counterpart to xref:refguide:applib:index/annotations/Programmatic.adoc[Programmatic] .
+It is complementary to xref:refguide:applib:index/annotation/MemberSupport.adoc[MemberSupport] and xref:refguide:applib:index/annotation/ObjectSupport.adoc[ObjectSupport] , and in some sense acts as the semantic counterpart to xref:refguide:applib:index/annotation/Programmatic.adoc[Programmatic] .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/ObjectSupport.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/ObjectSupport.adoc
similarity index 66%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/ObjectSupport.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/ObjectSupport.adoc
index 9795af1..d8e05ec 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/ObjectSupport.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/ObjectSupport.adoc
@@ -5,9 +5,9 @@ Indicates that a method is a supporting-method, one that contributes (disabled,
 
 May only be placed on _domain object_ methods, not _mixins_ nor _domain services_ .
 
-By placing the xref:refguide:applib:index/annotations/ObjectSupport.adoc[ObjectSupport] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized by the meta-model and cannot be ignored.
+By placing the xref:refguide:applib:index/annotation/ObjectSupport.adoc[ObjectSupport] annotation on a method, a contract with the meta-model is enforced, such that this method must be recognized by the meta-model and cannot be ignored.
 
-It is complementary to xref:refguide:applib:index/annotations/MemberSupport.adoc[MemberSupport] and xref:refguide:applib:index/annotations/ObjectLifecycle.adoc[ObjectLifecycle] , and in some sense acts as the semantic counterpart to xref:refguide:applib:index/annotations/Programmatic.adoc[Programmatic] .
+It is complementary to xref:refguide:applib:index/annotation/MemberSupport.adoc[MemberSupport] and xref:refguide:applib:index/annotation/ObjectLifecycle.adoc[ObjectLifecycle] , and in some sense acts as the semantic counterpart to xref:refguide:applib:index/annotation/Programmatic.adoc[Programmatic] .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Optionality.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Optionality.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Optionality.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Optionality.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Parameter.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Parameter.adoc
similarity index 90%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Parameter.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Parameter.adoc
index 26b6848..a3f8273 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/Parameter.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Parameter.adoc
@@ -85,7 +85,7 @@ If more than one is provided, then all must be satisfied (in effect "AND"ed toge
 
 Whether this parameter is optional or is mandatory (ie required).
 
-For parameters the default value, _org.apache.isis.applib.annotations.Optionality#DEFAULT_ , is taken to mean that the parameter is required.
+For parameters the default value, _org.apache.isis.applib.annotation.Optionality#DEFAULT_ , is taken to mean that the parameter is required.
 
 [#regexPattern]
 === regexPattern
@@ -103,3 +103,15 @@ The default value, `0` , means that no flags have been specified.
 === regexPatternReplacement
 
 Replacement text for the pattern in generated error message.
+
+include::hooks/Parameter_010-examples-and-usage.adoc[]
+
+include::hooks/Parameter_021-optionality.adoc[]
+
+include::hooks/Parameter_022-maxLength.adoc[]
+
+include::hooks/Parameter_023-mustSatisfy.adoc[]
+
+include::hooks/Parameter_024-regexPattern.adoc[]
+
+include::hooks/Parameter_025-fileAccept.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/ParameterLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/ParameterLayout.adoc
similarity index 84%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/ParameterLayout.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/ParameterLayout.adoc
index 748b2e5..788bbec 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/ParameterLayout.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/ParameterLayout.adoc
@@ -14,7 +14,8 @@ Collects together all layout hints for action parameters in a single annotation.
   LabelPosition labelPosition() default LabelPosition.NOT_SPECIFIED;     // <.>
   String named() default "";     // <.>
   int multiLine() default -1;     // <.>
-  RenderDay renderDay() default RenderDay.NOT_SPECIFIED;     // <.>
+  @Deprecated(forRemoval = true, since = "2.0.0-M7")
+RenderDay renderDay() default RenderDay.NOT_SPECIFIED;     // <.>
   int typicalLength() default -1;     // <.>
 }
 ----
@@ -47,6 +48,13 @@ For string parameters (and properties), whether to render as a text area over mu
 <.> xref:#renderDay[renderDay]
 +
 --
+[WARNING]
+====
+[red]#_deprecated:_#
+
+instead use _ValueSemantics#dateRenderAdjustDays()_
+====
+
 For date parameters (and properties) only, instructs the viewer that the date should be rendered as one day prior to the actually stored date.
 --
 <.> xref:#typicalLength[typicalLength]
@@ -93,6 +101,13 @@ If set to > 1, then _#labelPosition()_ defaults to _LabelPosition#TOP top_ .
 [#renderDay]
 === renderDay
 
+[WARNING]
+====
+[red]#_deprecated:_#
+
+instead use _ValueSemantics#dateRenderAdjustDays()_
+====
+
 For date parameters (and properties) only, instructs the viewer that the date should be rendered as one day prior to the actually stored date.
 
 This is intended to be used so that an exclusive end date of an interval can be rendered as 1 day before the actual value stored.
@@ -114,3 +129,19 @@ Here, the interval of the [1-may-2013,1-jun-2013) would be rendered as the dates
 The typical entry length of a field, use to determine the optimum width for display
 
 Note: the Wicket viewer does not use this information.
+
+include::hooks/ParameterLayout_010-examples-and-usage.adoc[]
+
+include::hooks/ParameterLayout_021-labelPosition.adoc[]
+
+include::hooks/ParameterLayout_022-multiLine.adoc[]
+
+include::hooks/ParameterLayout_023-describedAs.adoc[]
+
+include::hooks/ParameterLayout_024-cssClass.adoc[]
+
+include::hooks/ParameterLayout_025-renderDay.adoc[]
+
+include::hooks/ParameterLayout_026-named.adoc[]
+
+include::hooks/ParameterLayout_027-typicalLength.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/PriorityPrecedence.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/PriorityPrecedence.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/PriorityPrecedence.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/PriorityPrecedence.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Programmatic.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Programmatic.adoc
similarity index 96%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Programmatic.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Programmatic.adoc
index b566d27..7cadcb9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/Programmatic.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Programmatic.adoc
@@ -16,3 +16,4 @@ It can also be added to a type, meaning that the type is ignored from the metamo
 }
 ----
 
+include::hooks/Programmatic_010-examples-and-usage.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Projecting.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Projecting.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Projecting.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Projecting.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/PromptStyle.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/PromptStyle.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/PromptStyle.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/PromptStyle.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Property.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc
similarity index 94%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Property.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc
index b9c3aa0..7ea41b0 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/Property.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc
@@ -241,3 +241,29 @@ The default value, `0` , means that no flags have been specified.
 === regexPatternReplacement
 
 Replacement text for the pattern in generated error message.
+
+include::hooks/Property_010-examples-and-usage.adoc[]
+
+include::hooks/Property_021-optionality.adoc[]
+
+include::hooks/Property_022-editing.adoc[]
+
+include::hooks/Property_023-maxLength.adoc[]
+
+include::hooks/Property_024-mustSatisfy.adoc[]
+
+include::hooks/Property_025-projecting.adoc[]
+
+include::hooks/Property_026-domain-events.adoc[]
+
+include::hooks/Property_027-execution-publishing.adoc[]
+
+include::hooks/Property_028-command-processing.adoc[]
+
+include::hooks/Property_029-regexPattern.adoc[]
+
+include::hooks/Property_030-snapshot.adoc[]
+
+include::hooks/Property_031-fileAccept.adoc[]
+
+include::hooks/Property_033-hidden.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/PropertyLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/PropertyLayout.adoc
similarity index 86%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/PropertyLayout.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/PropertyLayout.adoc
index 4c21380..852032e 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/PropertyLayout.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/PropertyLayout.adoc
@@ -19,7 +19,8 @@ Collects together all layout hints for a property of a domain object.
   String named() default "";     // <.>
   Navigable navigable() default Navigable.NOT_SPECIFIED;     // <.>
   PromptStyle promptStyle() default PromptStyle.NOT_SPECIFIED;     // <.>
-  RenderDay renderDay() default RenderDay.NOT_SPECIFIED;     // <.>
+  @Deprecated(forRemoval = true, since = "2.0.0-M7")
+RenderDay renderDay() default RenderDay.NOT_SPECIFIED;     // <.>
   Repainting repainting() default Repainting.NOT_SPECIFIED;     // <.>
   String sequence() default "";     // <.>
   int typicalLength() default -1;     // <.>
@@ -79,6 +80,13 @@ How the properties of this domain object are be edited, either _PromptStyle#DIAL
 <.> xref:#renderDay[renderDay]
 +
 --
+[WARNING]
+====
+[red]#_deprecated:_#
+
+instead use _ValueSemantics#dateRenderAdjustDays()_
+====
+
 For date properties (and parameters) only, instructs the viewer that the date should be rendered as one day prior to the actually stored date.
 --
 <.> xref:#repainting[repainting]
@@ -176,6 +184,13 @@ How the properties of this domain object are be edited, either _PromptStyle#DIAL
 [#renderDay]
 === renderDay
 
+[WARNING]
+====
+[red]#_deprecated:_#
+
+instead use _ValueSemantics#dateRenderAdjustDays()_
+====
+
 For date properties (and parameters) only, instructs the viewer that the date should be rendered as one day prior to the actually stored date.
 
 This is intended to be used so that an exclusive end date of an interval can be rendered as 1 day before the actual value stored.
@@ -201,7 +216,7 @@ Setting this attribute to `RepaintPolicy.NO_REPAINT` is used as a hint to the vi
 
 Note that for this to work, the viewer will also ensure that none of the property's parent component (such as a tab group panel) are re-rendered.
 
-Design note: we considered implementing this an "immutable" flag on the xref:refguide:applib:index/annotations/Property.adoc[Property] annotation (because this flag is typically appropriate for immutable/unchanging properties of a domain object). However, we decided not to do that, on the basis that it might be interpreted as having a deeper impact within the framework than simply a hint for rendering.
+Design note: we considered implementing this an "immutable" flag on the xref:refguide:applib:index/annotation/Property.adoc[Property] annotation (because this flag is typically appropriate for immutable/unchanging properties of a domain object). However, we decided not to do that, on the basis that it might be interpreted as having a deeper impact within the framework than simply a hint for rendering.
 
 [#sequence]
 === sequence
@@ -216,3 +231,27 @@ An alternative is to use the `Xxx.layout.xml` file, where `Xxx` is the domain ob
 The typical entry length of a field, use to determine the optimum width for display.
 
 Note: the Wicket viewer does not use this information.
+
+include::hooks/PropertyLayout_010-examples-and-usage.adoc[]
+
+include::hooks/PropertyLayout_021_labelPosition.adoc[]
+
+include::hooks/PropertyLayout_022_promptStyle.adoc[]
+
+include::hooks/PropertyLayout_023_multiLine.adoc[]
+
+include::hooks/PropertyLayout_024_navigable.adoc[]
+
+include::hooks/PropertyLayout_025_describedAs.adoc[]
+
+include::hooks/PropertyLayout_026_cssClass.adoc[]
+
+include::hooks/PropertyLayout_027_renderDay.adoc[]
+
+include::hooks/PropertyLayout_028_repainting.adoc[]
+
+include::hooks/PropertyLayout_029_named.adoc[]
+
+include::hooks/PropertyLayout_030_hidden.adoc[]
+
+include::hooks/PropertyLayout_31_typicalLength.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Publishing.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Publishing.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Publishing.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Publishing.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Redirect.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Redirect.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Redirect.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Redirect.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/RenderDay.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/RenderDay.adoc
similarity index 98%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/RenderDay.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/RenderDay.adoc
index 33a8eb2..876eee4 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/RenderDay.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/RenderDay.adoc
@@ -1,6 +1,8 @@
 = RenderDay _(enum)_
 :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 [...]
 
+WARNING: [red]#_deprecated:_#
+
 How to render days.
 
 == API
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Repainting.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Repainting.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Repainting.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Repainting.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/RestrictTo.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/RestrictTo.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/RestrictTo.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/RestrictTo.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/SemanticsOf.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/SemanticsOf.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/SemanticsOf.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/SemanticsOf.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Snapshot.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Snapshot.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Snapshot.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Snapshot.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/TimePrecision.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/TimePrecision.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/TimePrecision.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/TimePrecision.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Title.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Title.adoc
similarity index 83%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Title.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Title.adoc
index 1dfe2e2..5e9a271 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/Title.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Title.adoc
@@ -21,7 +21,7 @@ If more than one property is used, the order can be specified (using the same De
 <.> xref:#sequence[sequence]
 +
 --
-The order (in Dewey decimal notation) that the property annotated with xref:refguide:applib:index/annotations/Title.adoc[Title] appears with respect to other properties also annotated with xref:refguide:applib:index/annotations/Title.adoc[Title] .
+The order (in Dewey decimal notation) that the property annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] appears with respect to other properties also annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] .
 --
 <.> xref:#prepend[prepend]
 +
@@ -44,7 +44,7 @@ The length to abbreviate this title element to.
 [#sequence]
 === sequence
 
-The order (in Dewey decimal notation) that the property annotated with xref:refguide:applib:index/annotations/Title.adoc[Title] appears with respect to other properties also annotated with xref:refguide:applib:index/annotations/Title.adoc[Title] .
+The order (in Dewey decimal notation) that the property annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] appears with respect to other properties also annotated with xref:refguide:applib:index/annotation/Title.adoc[Title] .
 
 [#prepend]
 === prepend
@@ -60,3 +60,5 @@ The string to append to this property if non-empty.
 === abbreviatedTo
 
 The length to abbreviate this title element to.
+
+include::hooks/Title_010-examples-and-usage.adoc[]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Value.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Value.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Value.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Value.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/ValueSemantics.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/ValueSemantics.adoc
similarity index 74%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/ValueSemantics.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/ValueSemantics.adoc
index 69df296..a70688f 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotations/ValueSemantics.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/ValueSemantics.adoc
@@ -9,6 +9,7 @@ Collects all the value-type specific customization attributes.
 .ValueSemantics.java
 ----
 @interface ValueSemantics {
+  public final static int AS_DAY_BEFORE;     // <.>
   String provider() default "";     // <.>
   int maxTotalDigits() default 65;     // <.>
   int minIntegerDigits() default 1;     // <.>
@@ -17,9 +18,15 @@ Collects all the value-type specific customization attributes.
   FormatStyle dateFormatStyle() default FormatStyle.MEDIUM;     // <.>
   FormatStyle timeFormatStyle() default FormatStyle.MEDIUM;     // <.>
   TimePrecision timePrecision() default TimePrecision.SECOND;     // <.>
+  int dateRenderAdjustDays() default 0;     // <.>
 }
 ----
 
+<.> xref:#AS_DAY_BEFORE[AS_DAY_BEFORE]
++
+--
+eg. @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)
+--
 <.> xref:#provider[provider]
 +
 --
@@ -60,9 +67,19 @@ If associated with a temporal time value, the rendering style of a localized tim
 --
 If associated with a temporal time value, the time of day precision, used for editing a time field in the UI.default = _TimePrecision#SECOND_
 --
+<.> xref:#dateRenderAdjustDays[dateRenderAdjustDays]
++
+--
+If associated with a date or date-time value, instructs whether the date should be rendered as _n_ days after the actually stored date. For negative _n_ its days before respectively.
+--
 
 == Members
 
+[#AS_DAY_BEFORE]
+=== AS_DAY_BEFORE
+
+eg. @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)
+
 [#provider]
 === provider
 
@@ -102,3 +119,22 @@ If associated with a temporal time value, the rendering style of a localized tim
 === timePrecision
 
 If associated with a temporal time value, the time of day precision, used for editing a time field in the UI.default = _TimePrecision#SECOND_
+
+[#dateRenderAdjustDays]
+=== dateRenderAdjustDays
+
+If associated with a date or date-time value, instructs whether the date should be rendered as _n_ days after the actually stored date. For negative _n_ its days before respectively.
+
+This is intended to be used so that an exclusive end date of an interval can be rendered as 1 day before the actual value stored.
+
+For example:
+
+----
+
+public LocalDate getStartDate() { ... }
+
+@ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)
+public LocalDate getEndDate() { ... }
+----
+
+Here, the interval of the [1-may-2013,1-jun-2013) would be rendered as the dates 1-may-2013 for the start date but using 31-may-2013 (the day before) for the end date. What is stored In the domain object, itself, however, the value stored is 1-jun-2013.
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotations/Where.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Where.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/annotations/Where.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/Where.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/ActionLayoutData.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/ActionLayoutData.adoc
index 9e51469..ba3c2f8 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/ActionLayoutData.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/ActionLayoutData.adoc
@@ -1,7 +1,7 @@
 = ActionLayoutData
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the layout of a single action, broadly corresponding to _org.apache.isis.applib.annotations.ActionLayout_ .
+Describes the layout of a single action, broadly corresponding to _org.apache.isis.applib.annotation.ActionLayout_ .
 
 == API
 
@@ -27,8 +27,8 @@ class ActionLayoutData {
   void setHidden(Where hidden)
   String getNamed()
   void setNamed(String named)
-  org.apache.isis.applib.annotations.ActionLayout.Position getPosition()
-  void setPosition(org.apache.isis.applib.annotations.ActionLayout.Position position)
+  org.apache.isis.applib.annotation.ActionLayout.Position getPosition()
+  void setPosition(org.apache.isis.applib.annotation.ActionLayout.Position position)
   PromptStyle getPromptStyle()
   void setPromptStyle(PromptStyle promptStyle)
   Redirect getRedirect()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
index 0d16720..c275aec 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/CollectionLayoutData.adoc
@@ -1,7 +1,7 @@
 = CollectionLayoutData
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the layout of a single collection, broadly corresponds to the _org.apache.isis.applib.annotations.CollectionLayout_ annotation.
+Describes the layout of a single collection, broadly corresponds to the _org.apache.isis.applib.annotation.CollectionLayout_ annotation.
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/DomainObjectLayoutData.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/DomainObjectLayoutData.adoc
index 7da6a1a..39b82d7 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/DomainObjectLayoutData.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/DomainObjectLayoutData.adoc
@@ -1,7 +1,7 @@
 = DomainObjectLayoutData
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the layout of the title and icon of a domain object, broadly corresponding to _org.apache.isis.applib.annotations.DomainObjectLayout_ .
+Describes the layout of the title and icon of a domain object, broadly corresponding to _org.apache.isis.applib.annotation.DomainObjectLayout_ .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/PropertyLayoutData.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/PropertyLayoutData.adoc
index 99ae750..3095cfd 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/PropertyLayoutData.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/PropertyLayoutData.adoc
@@ -1,7 +1,7 @@
 = PropertyLayoutData
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the layout of a single property, broadly corresponds to the _org.apache.isis.applib.annotations.PropertyLayout_ annotation.
+Describes the layout of a single property, broadly corresponds to the _org.apache.isis.applib.annotation.PropertyLayout_ annotation.
 
 == API
 
@@ -27,8 +27,8 @@ class PropertyLayoutData {
   void setNamed(String named)
   PromptStyle getPromptStyle()
   void setPromptStyle(PromptStyle promptStyle)
-  RenderDay getRenderDay()
-  void setRenderDay(RenderDay renderDay)
+  int getDateRenderAdjustDays()
+  void setDateRenderAdjustDays(int dateRenderAdjustDays)
   Integer getTypicalLength()
   void setTypicalLength(Integer typicalLength)
   Repainting getRepainting()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
index 6b16a08..7ccabb2 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
@@ -1,7 +1,7 @@
 = ServiceActionLayoutData
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the layout of a single action, broadly corresponding to _org.apache.isis.applib.annotations.ActionLayout_ .
+Describes the layout of a single action, broadly corresponding to _org.apache.isis.applib.annotation.ActionLayout_ .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
index 3c0a65b..8d2e36e 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
@@ -1,7 +1,7 @@
 = BS3Menu
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotations/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
+Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
index a158bd2..5c9e43e 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
@@ -1,7 +1,7 @@
 = BS3MenuBar
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotations/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
+Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
index f7e9d1c..76973d6 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
@@ -1,7 +1,7 @@
 = BS3MenuBars
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within xref:refguide:applib:index/annotations/DomainServiceLayout.adoc[DomainServiceLayout] .
+Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridService.adoc
index 4ce4983..e8e6bf0 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridService.adoc
@@ -59,7 +59,7 @@ Returns a normalized grid for the domain class obtained previously using _#load(
 <.> xref:#complete__Grid[complete(Grid)]
 +
 --
-Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:refguide:applib:index/annotations/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotations/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotations/PropertyLayout.adoc[PropertyLayout] and xref:refguide:applib:index/annotations/CollectionLayout.adoc[CollectionLayout] .
+Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayout] and xref:refguide:applib:index/annotation/CollectionLayout.adoc[CollectionLayout] .
 --
 <.> xref:#minimal__Grid[minimal(Grid)]
 +
@@ -122,12 +122,12 @@ The default implementation searches through all available xref:refguide:applib:i
 
 Returns a normalized grid for the domain class obtained previously using _#load(Class)_ .
 
-If a "normalized" grid is persisted as the `layout.xml` , then the expectation is that the _MemberOrder_ annotation can be removed from the domain class because the binding of properties/collections/actions will be within the XML. However, the layout annotations ( xref:refguide:applib:index/annotations/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotations/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotations/PropertyLayout.adoc[PropertyLa [...]
+If a "normalized" grid is persisted as the `layout.xml` , then the expectation is that the _MemberOrder_ annotation can be removed from the domain class because the binding of properties/collections/actions will be within the XML. However, the layout annotations ( xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayou [...]
 
 [#complete__Grid]
 === complete(Grid)
 
-Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:refguide:applib:index/annotations/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotations/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotations/PropertyLayout.adoc[PropertyLayout] and xref:refguide:applib:index/annotations/CollectionLayout.adoc[CollectionLayout] .
+Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] with additional metadata, broadly speaking corresponding to the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayout] and xref:refguide:applib:index/annotation/CollectionLayout.adoc[CollectionLayout] .
 
 If a "completed" grid is persisted as the `layout.xml` , then there should be no need for any of the layout annotations, nor the _MemberOrder_ annotations, to be required in the domain class itself.
 
@@ -136,7 +136,7 @@ If a "completed" grid is persisted as the `layout.xml` , then there should be no
 
 Modifies the provided xref:refguide:applib:index/layout/grid/Grid.adoc[Grid] , removing all metadata except the basic grid structure.
 
-If a "minimal" grid is persisted as the `layout.xml` , then the expectation is that most of the layout annotations ( xref:refguide:applib:index/annotations/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotations/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotations/PropertyLayout.adoc[PropertyLayout] , xref:refguide:applib:index/annotations/CollectionLayout.adoc[CollectionLayout] , but also _MemberOrder_ ) will still be retained in the doma [...]
+If a "minimal" grid is persisted as the `layout.xml` , then the expectation is that most of the layout annotations ( xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] , xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout] , xref:refguide:applib:index/annotation/PropertyLayout.adoc[PropertyLayout] , xref:refguide:applib:index/annotation/CollectionLayout.adoc[CollectionLayout] , but also _MemberOrder_ ) will still be retained in the domain c [...]
 
 include::hooks/GridService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc
index 9162298..4734ed6 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc
@@ -92,21 +92,21 @@ For example, this layout could define two columns in ratio 4:8.
 
 Validates and normalizes a grid, modifying the grid so that all of the domain object's members (properties, collections, actions) are bound to regions of the grid.
 
-This is done using existing metadata, most notably that of the _org.apache.isis.applib.annotations.MemberOrder_ annotation. Such a grid, if persisted as the layout XML file for the domain class, allows the _org.apache.isis.applib.annotations.MemberOrder_ annotation to be removed from the source code of the domain class (but other annotations must be retained).
+This is done using existing metadata, most notably that of the _org.apache.isis.applib.annotation.MemberOrder_ annotation. Such a grid, if persisted as the layout XML file for the domain class, allows the _org.apache.isis.applib.annotation.MemberOrder_ annotation to be removed from the source code of the domain class (but other annotations must be retained).
 
 [#complete__G_Class]
 === complete(G, Class)
 
 Takes a normalized grid and enriches it with all the available metadata (taken from Apache Isis' internal metadata) that can be represented in the layout XML.
 
-Such a grid, if persisted as the layout XML file for the domain class, allows all layout annotations ( _org.apache.isis.applib.annotations.ActionLayout_ , _org.apache.isis.applib.annotations.PropertyLayout_ , _org.apache.isis.applib.annotations.CollectionLayout_ ) to be removed from the source code of the domain class.
+Such a grid, if persisted as the layout XML file for the domain class, allows all layout annotations ( _org.apache.isis.applib.annotation.ActionLayout_ , _org.apache.isis.applib.annotation.PropertyLayout_ , _org.apache.isis.applib.annotation.CollectionLayout_ ) to be removed from the source code of the domain class.
 
 [#minimal__G_Class]
 === minimal(G, Class)
 
 Takes a normalized grid and strips out removes all members, leaving only the grid structure.
 
-Such a grid, if persisted as the layout XML file for the domain class, requires that the _org.apache.isis.applib.annotations.MemberOrder_ annotation is retained in the source code of said class in order to bind members to the regions of the grid.
+Such a grid, if persisted as the layout XML file for the domain class, requires that the _org.apache.isis.applib.annotation.MemberOrder_ annotation is retained in the source code of said class in order to bind members to the regions of the grid.
 
 include::hooks/GridSystemService_010-implementation.adoc[]
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
index 0bb13ea..6547da9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/homepage/HomePageResolverService.adoc
@@ -1,7 +1,7 @@
 = HomePageResolverService _(interface)_
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-This service simply provides access to the home page object (if any) annotated with xref:refguide:applib:index/annotations/HomePage.adoc[HomePage] .
+This service simply provides access to the home page object (if any) annotated with xref:refguide:applib:index/annotation/HomePage.adoc[HomePage] .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/BeanSort.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/BeanSort.adoc
index 9be4b46..847d273 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/BeanSort.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/BeanSort.adoc
@@ -78,7 +78,7 @@ A non concrete type, that is a placeholder for a its concrete implementer.
 <.> xref:#VETOED[VETOED]
 +
 --
-Type must not be added to the meta-model, eg. by means of _Vetoed_ , _Profile_ or xref:refguide:applib:index/annotations/Programmatic.adoc[Programmatic]
+Type must not be added to the meta-model, eg. by means of _Vetoed_ , _Profile_ or xref:refguide:applib:index/annotation/Programmatic.adoc[Programmatic]
 --
 
 == Members
@@ -138,4 +138,4 @@ A non concrete type, that is a placeholder for a its concrete implementer.
 [#VETOED]
 === VETOED
 
-Type must not be added to the meta-model, eg. by means of _Vetoed_ , _Profile_ or xref:refguide:applib:index/annotations/Programmatic.adoc[Programmatic]
+Type must not be added to the meta-model, eg. by means of _Vetoed_ , _Profile_ or xref:refguide:applib:index/annotation/Programmatic.adoc[Programmatic]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/routing/RoutingService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/routing/RoutingService.adoc
index 34c6bef..f97ff89 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/routing/RoutingService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/routing/RoutingService.adoc
@@ -13,7 +13,7 @@ For example, an action returning `OrderItem` might instead render the owning `Or
 * if an action returns `null` or is `void`, then return some other "useful" object.
 +
 --
-For example, return the home page (eg as defined by the _org.apache.isis.applib.annotations.HomePage_ annotation).
+For example, return the home page (eg as defined by the _org.apache.isis.applib.annotation.HomePage_ annotation).
 --
 
 Currently this service is used only by the Wicket viewer; it is ignored by the Restful Objects viewer.
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/swagger/Visibility.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/swagger/Visibility.adoc
index 2b832b5..5b47603 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/swagger/Visibility.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/swagger/Visibility.adoc
@@ -41,7 +41,7 @@ As _#PRIVATE_ , also including any prototype actions (where _Action#restrictTo()
 
 Specification for use by third-party clients, ie public use and not under the control of the authors of the backend Apache Isis application.
 
-The generated swagger spec is therefore restricted only to include only view models ( _DomainObject#nature()_ of _org.apache.isis.applib.annotations.Nature#VIEW_MODEL_ ) and to REST domain services ( _DomainService#nature()_ of _NatureOfService#REST_ ). Exposing entities also would couple the REST client too deeply to the backend implementation.
+The generated swagger spec is therefore restricted only to include only view models ( _DomainObject#nature()_ of _org.apache.isis.applib.annotation.Nature#VIEW_MODEL_ ) and to REST domain services ( _DomainService#nature()_ of _NatureOfService#REST_ ). Exposing entities also would couple the REST client too deeply to the backend implementation.
 
 [#PRIVATE]
 === PRIVATE
diff --git a/antora/components/refguide-index/modules/applib/pages/index/util/TitleBuffer.adoc b/antora/components/refguide-index/modules/applib/pages/index/util/TitleBuffer.adoc
index 8559c16..0bc4f3e 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/util/TitleBuffer.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/util/TitleBuffer.adoc
@@ -157,14 +157,14 @@ Creates a new, empty, xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuff
 
 Creates a new xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] , containing the title of the specified object.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#TitleBuffer__Object_String]
 === TitleBuffer(Object, String)
 
 Creates a new title object, containing the title of the specified object.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#TitleBuffer__String]
 === TitleBuffer(String)
@@ -176,7 +176,7 @@ Creates a new title object, containing the specified text.
 
 Determines if the specified object's title is empty (or null).
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#isEmpty__String]
 === isEmpty(String)
@@ -191,14 +191,14 @@ Determines if the specified text is empty. Will return true if either: the speci
 
 Append the title of the specified object to this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#append__Object_String]
 === append(Object, String)
 
 Appends the title of the specified object, or the specified text if the objects title is null or empty. Prepends a space if there is already some text in this title object.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#append__String]
 === append(String)
@@ -210,14 +210,14 @@ Appends a space (if there is already some text in this title object) and then th
 
 Appends the joining string and the title of the specified object. If the object is empty then nothing will be appended.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#append__String_Object_String]
 === append(String, Object, String)
 
 Append the `joiner` text, a space, and the title of the specified object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If the title of the specified object is null then use the `defaultValue` text. If both the objects title and the default value are null or equate to a zero-length string then no text will be appended ; not even the joiner text.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#append__String_String]
 === append(String, String)
@@ -239,7 +239,7 @@ Concatenate the the title value (the result of calling an objects label() method
 
 Concatenate the title of the object value or the specified default value if the title is equal to null or is empty, to this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] .
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#concat__String]
 === concat(String)
@@ -256,14 +256,14 @@ Concatenate the joiner text and the text to the text of this xref:refguide:appli
 
 Concatenate the joiner text and the title of the object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] . If no object yet exists in the object then the joiner text is omitted.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#concat__String_Object_String]
 === concat(String, Object, String)
 
 Concatenate the joiner text and the title of the object to the text of this xref:refguide:applib:index/util/TitleBuffer.adoc[TitleBuffer] object. If no object yet exists in the object then defaultValue is used instead.
 
-Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotations.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
+Note: this method only obtains the title using either `title()` or `toString()` ; it doesn't honour other mechanisms for specifying the title, such as _org.apache.isis.applib.annotation.Title_ annotation. If that functionality is required, first call _TitleService#titleOf(Object)_ on the object and pass in the resultant string.
 
 [#toString__]
 === toString()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/value/semantics/ValueSemanticsProvider.adoc b/antora/components/refguide-index/modules/applib/pages/index/value/semantics/ValueSemanticsProvider.adoc
index b223957..9961eca 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/value/semantics/ValueSemanticsProvider.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/value/semantics/ValueSemanticsProvider.adoc
@@ -3,7 +3,7 @@
 
 Provides a mechanism for providing a set of value semantics.
 
-This interface is used by xref:refguide:applib:index/annotations/Value.adoc[Value] to allow these semantics to be provided through a single point. Alternatively, xref:refguide:applib:index/annotations/Value.adoc[Value] supports this information being provided via the configuration files.
+This interface is used by xref:refguide:applib:index/annotation/Value.adoc[Value] to allow these semantics to be provided through a single point. Alternatively, xref:refguide:applib:index/annotation/Value.adoc[Value] supports this information being provided via the configuration files.
 
 Whatever the class that implements this interface, it must also expose either a `public` no-arg constructor, or (for implementations that also are `Facet` s) a `public` constructor that accepts a `FacetHolder` , and `IsisConfiguration` and a `ValueSemanticsProviderContext` . This constructor is then used by the framework to instantiate the object reflectively.
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/SecmanConfiguration.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/SecmanConfiguration.adoc
deleted file mode 100644
index 2f9b3da..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/SecmanConfiguration.adoc
+++ /dev/null
@@ -1,36 +0,0 @@
-= SecmanConfiguration
-: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 [...]
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-- use `application.yml` config properties instead; defaults are
-
-* `isis.extensions.secman.seed.admin.user-name=secman-admin`
-* `isis.extensions.secman.seed.admin.namespace-permissions.sticky=isis ...`
-* `isis.extensions.secman.seed.admin.password=pass`
-* `isis.extensions.secman.seed.admin.role-name=isis-ext-secman-admin`
-* `isis.extensions.secman.seed.admin.user-name=sven`
-* `isis.extensions.secman.seed.regular-user.role-name=isis-ext-secman-user`
-* `isis.extensions.secman.seed.admin.namespace-permissions.additional=`
-* `isis.extensions.secman.delegated-users.auto-create-policy=AUTO_CREATE_AS_UNLOCKED`
-====
-
-Applications consuming secman must instantiate a _org.springframework.context.annotation.Bean_ of this type; secman then uses this bean to configure itself.
-
-The typical place to create this bean is in the top-level `AppManifest` _org.springframework.context.annotation.Configuration_ class.
-
-This class is implemented as a builder (courtesy of Lombok) but it provides reasonable defaults.
-
-== API
-
-[source,java]
-.SecmanConfiguration.java
-----
-class SecmanConfiguration {
-  Stream<String> streamAdminNamespacePermissions()
-  boolean isStickyAdminNamespace(String featureFqn)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.adoc
deleted file mode 100644
index dfcf86d..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.adoc
+++ /dev/null
@@ -1,21 +0,0 @@
-= PermissionsEvaluationServiceAllowBeatsVeto
-: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 [...]
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-- use `application.yml` config properties instead; corresponds to `isis.extensions.secman.permissions-evaluation-policy=ALLOW_BEATS_VETO` , with supported values `ALLOW_BEATS_VETO` (default) and `VETO_BEATS_ALLOW` 
-====
-
-An implementation whereby a VETO permission for a feature overrides an ALLOW (for same scope).
-
-== API
-
-[source,java]
-.PermissionsEvaluationServiceAllowBeatsVeto.java
-----
-class PermissionsEvaluationServiceAllowBeatsVeto {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.adoc
deleted file mode 100644
index 4488700..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.adoc
+++ /dev/null
@@ -1,21 +0,0 @@
-= PermissionsEvaluationServiceVetoBeatsAllow
-: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 [...]
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-- use `application.yml` config properties instead; corresponds to `isis.extensions.secman.permissions-evaluation-policy=VETO_BEATS_ALLOW` , with supported values `ALLOW_BEATS_VETO` (default) and `VETO_BEATS_ALLOW` 
-====
-
-An implementation whereby a VETO permission for a feature overrides an ALLOW (for same scope).
-
-== API
-
-[source,java]
-.PermissionsEvaluationServiceVetoBeatsAllow.java
-----
-class PermissionsEvaluationServiceVetoBeatsAllow {
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.adoc
index 7591208..4c56440 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.adoc
@@ -1,7 +1,7 @@
 = IsisExtSecmanAdminRoleAndPermissions
 :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 [...]
 
-Sets up the _SecmanConfiguration#getAdminRoleName() secman admin role_ with its initial set of permissions (the union of _SecmanConfiguration#getAdminStickyNamespacePermissions()_ and _SecmanConfiguration#getAdminAdditionalNamespacePermissions()_ ).
+Sets up the _Admin#getRoleName() secman admin role_ with its initial set of permissions (the union of _NamespacePermissions#getSticky()_ and _NamespacePermissions#getAdditional()_ ).
 
 == API
 
@@ -9,7 +9,7 @@ Sets up the _SecmanConfiguration#getAdminRoleName() secman admin role_ with its
 .IsisExtSecmanAdminRoleAndPermissions.java
 ----
 class IsisExtSecmanAdminRoleAndPermissions {
-  IsisExtSecmanAdminRoleAndPermissions(SecmanConfiguration configBean)
+  IsisExtSecmanAdminRoleAndPermissions(Secman config)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.adoc
index 9397879..7a63cd8 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.adoc
@@ -15,7 +15,7 @@ The permissions also provide the ability to lookup their user account using the
 .IsisExtSecmanRegularUserRoleAndPermissions.java
 ----
 class IsisExtSecmanRegularUserRoleAndPermissions {
-  IsisExtSecmanRegularUserRoleAndPermissions(SecmanConfiguration configBean)
+  IsisExtSecmanRegularUserRoleAndPermissions(Secman config)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/seed/IsisExtSecmanAdminUser.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/seed/IsisExtSecmanAdminUser.adoc
index cb0f8dd..966da8a 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/seed/IsisExtSecmanAdminUser.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/seed/IsisExtSecmanAdminUser.adoc
@@ -9,7 +9,7 @@ Sets up a user, as defined in
 .IsisExtSecmanAdminUser.java
 ----
 class IsisExtSecmanAdminUser {
-  IsisExtSecmanAdminUser(SecmanConfiguration configBean)
+  IsisExtSecmanAdminUser(Secman config)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAbstract.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/integration/permissions/PermissionsEvaluationServiceForSecman.adoc
similarity index 82%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAbstract.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/integration/permissions/PermissionsEvaluationServiceForSecman.adoc
index 72a2bea..0d878fa 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAbstract.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/integration/permissions/PermissionsEvaluationServiceForSecman.adoc
@@ -1,12 +1,13 @@
-= PermissionsEvaluationServiceAbstract
+= PermissionsEvaluationServiceForSecman
 :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 [...]
 
 == API
 
 [source,java]
-.PermissionsEvaluationServiceAbstract.java
+.PermissionsEvaluationServiceForSecman.java
 ----
-class PermissionsEvaluationServiceAbstract {
+class PermissionsEvaluationServiceForSecman {
+  PermissionsEvaluationServiceForSecman(IsisConfiguration isisConfiguration)
   ApplicationPermissionValueSet.Evaluation evaluate(ApplicationFeatureId targetMemberId, ApplicationPermissionMode mode, Collection<ApplicationPermissionValue> permissionValues)
 }
 ----
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc b/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc
index b37f7a6..85595ef 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/shirorealmldap/realm/impl/IsisLdapRealm.adoc
@@ -60,17 +60,6 @@ admin_role = *
 
 This 'ini' file can then be referenced by other realms (if multiple realm are configured with the Shiro security manager).
 
-Alternatively, permissions can be set directly using _#setPermissionsByRole(String)_ , where the string is the same information, formatted thus:
-
-----
-
-ldapRealm.permissionsByRole=\
-   user_role = *:ToDoItemsJdo:*:*,\
-               *:ToDoItem:*:*; \
-   self-install_role = *:ToDoItemsFixturesService:install:* ; \
-   admin_role = *
-----
-
 Alternatively, permissions can be extracted from the base itself with the parameter searchUserBase, the attribute list as userExtractedAttribute and the permission url as permissionByUserAttribute. The idea is to extract attribute from the user or the group of the user and map directly to permission rule in replacing the string {attribute} by the extracted attribute (can me multiple). See the sample for group and user attribute and mapping.
 
 == API
@@ -86,7 +75,6 @@ class IsisLdapRealm {
   void setUniqueMemberAttributeValueTemplate(String template)
   void setRolesByGroup(Map<String, String> rolesByGroup)
   void setResourcePath(String resourcePath)     // <.>
-  void setPermissionsByRole(String permissionsByRoleStr)     // <.>
   void setPermissionByUserAttribute(String permissionByUserAttr)
   void setPermissionByGroupAttribute(String permissionByGroupAttribute)
   void setUserExtractedAttribute(String userExtractedAttribute)
@@ -102,11 +90,6 @@ class IsisLdapRealm {
 --
 
 --
-<.> xref:#setPermissionsByRole__String[setPermissionsByRole(String)]
-+
---
-Specify permissions for each role using a formatted string.
---
 
 == Members
 
@@ -129,16 +112,3 @@ self-install_role = *:ToDoItemsFixturesService:install:*
 admin_role = *
 ----
 
-[#setPermissionsByRole__String]
-=== setPermissionsByRole(String)
-
-Specify permissions for each role using a formatted string.
-
-----
-
-ldapRealm.permissionsByRole=\
-   user_role = *:ToDoItemsJdo:*:*,\
-               *:ToDoItem:*:*; \
-   self-install_role = *:ToDoItemsFixturesService:install:* ; \
-   admin_role = *
-----
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
index 899e58e..15c9d51 100644
--- a/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
+++ b/antora/components/refguide-index/modules/subdomains/pages/index/base/applib/utils/TitleBuilder.adoc
@@ -15,29 +15,6 @@ class TitleBuilder {
   TitleBuilder withReference(String reference)
   String toString()
   TitleBuilder withName(Object object)
-  TitleBuilder withTupleElement(Object object)     // <.>
 }
 ----
 
-<.> xref:#withTupleElement__Object[withTupleElement(Object)]
-+
---
-[WARNING]
-====
-[red]#_deprecated:_#
-
-- this method does nothing...
-====
---
-
-== Members
-
-[#withTupleElement__Object]
-=== withTupleElement(Object)
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-- this method does nothing...
-====
diff --git a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc
index d788569..5a4e76c 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureDomainRules.adoc
@@ -1,7 +1,7 @@
 = ArchitectureDomainRules
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-A library of architecture tests to ensure coding conventions are followed for domain classes, for example as annotated with xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] or xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] but also more generally, for example repositories that are not necessarily part of the framework's metamodel.
+A library of architecture tests to ensure coding conventions are followed for domain classes, for example as annotated with xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] or xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] but also more generally, for example repositories that are not necessarily part of the framework's metamodel.
 
 == API
 
@@ -35,32 +35,32 @@ class ArchitectureDomainRules {
 <.> xref:#every_DomainObject_must_specify_logicalTypeName__[every_DomainObject_must_specify_logicalTypeName()]
 +
 --
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation must specify their _DomainObject#logicalTypeName() logicalTypeName_ .
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation must specify their _DomainObject#logicalTypeName() logicalTypeName_ .
 --
 <.> xref:#every_DomainService_must_specify_logicalTypeName__[every_DomainService_must_specify_logicalTypeName()]
 +
 --
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] annotation must specify their _DomainService#logicalTypeName() logicalTypeName_ .
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] annotation must specify their _DomainService#logicalTypeName() logicalTypeName_ .
 --
 <.> xref:#every_logicalTypeName_must_be_unique__[every_logicalTypeName_must_be_unique()]
 +
 --
-This rule requires that classes annotated the `logicalTypeName` must be unique across all non-abstract xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] s and xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] s
+This rule requires that classes annotated the `logicalTypeName` must be unique across all non-abstract xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] s and xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] s
 --
 <.> xref:#every_DomainObject_must_also_be_annotated_with_DomainObjectLayout__[every_DomainObject_must_also_be_annotated_with_DomainObjectLayout()]
 +
 --
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation must also be annotated with the xref:refguide:applib:index/annotations/DomainObjectLayout.adoc[DomainObjectLayout] annotation.
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation must also be annotated with the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] annotation.
 --
 <.> xref:#every_DomainService_must_also_be_annotated_with_DomainServiceLayout__[every_DomainService_must_also_be_annotated_with_DomainServiceLayout()]
 +
 --
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] annotation must also be annotated with the xref:refguide:applib:index/annotations/DomainServiceLayout.adoc[DomainServiceLayout] annotation.
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] annotation must also be annotated with the xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] annotation.
 --
 <.> xref:#every_jaxb_view_model_must_also_be_annotated_with_DomainObject_nature_VIEW_MODEL__[every_jaxb_view_model_must_also_be_annotated_with_DomainObject_nature_VIEW_MODEL()]
 +
 --
-This rule requires that classes annotated with the _XmlRootElement_ annotation must also be annotated with the xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation specifying a xref:refguide:applib:index/annotations/Nature.adoc[Nature] of _Nature#VIEW_MODEL VIEW_MODEL_ .
+This rule requires that classes annotated with the _XmlRootElement_ annotation must also be annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation specifying a xref:refguide:applib:index/annotation/Nature.adoc[Nature] of _Nature#VIEW_MODEL VIEW_MODEL_ .
 --
 <.> xref:#every_Action_mixin_must_follow_naming_convention__[every_Action_mixin_must_follow_naming_convention()]
 +
@@ -118,34 +118,34 @@ This rule requires that finders of repos reutrn either _java.util.Collection_ s
 [#every_DomainObject_must_specify_logicalTypeName__]
 === every_DomainObject_must_specify_logicalTypeName()
 
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation must specify their _DomainObject#logicalTypeName() logicalTypeName_ .
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation must specify their _DomainObject#logicalTypeName() logicalTypeName_ .
 
 [#every_DomainService_must_specify_logicalTypeName__]
 === every_DomainService_must_specify_logicalTypeName()
 
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] annotation must specify their _DomainService#logicalTypeName() logicalTypeName_ .
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] annotation must specify their _DomainService#logicalTypeName() logicalTypeName_ .
 
 [#every_logicalTypeName_must_be_unique__]
 === every_logicalTypeName_must_be_unique()
 
-This rule requires that classes annotated the `logicalTypeName` must be unique across all non-abstract xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] s and xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] s
+This rule requires that classes annotated the `logicalTypeName` must be unique across all non-abstract xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] s and xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] s
 
 [#every_DomainObject_must_also_be_annotated_with_DomainObjectLayout__]
 === every_DomainObject_must_also_be_annotated_with_DomainObjectLayout()
 
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation must also be annotated with the xref:refguide:applib:index/annotations/DomainObjectLayout.adoc[DomainObjectLayout] annotation.
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation must also be annotated with the xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[DomainObjectLayout] annotation.
 
 [#every_DomainService_must_also_be_annotated_with_DomainServiceLayout__]
 === every_DomainService_must_also_be_annotated_with_DomainServiceLayout()
 
-This rule requires that classes annotated with the xref:refguide:applib:index/annotations/DomainService.adoc[DomainService] annotation must also be annotated with the xref:refguide:applib:index/annotations/DomainServiceLayout.adoc[DomainServiceLayout] annotation.
+This rule requires that classes annotated with the xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] annotation must also be annotated with the xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] annotation.
 
 [#every_jaxb_view_model_must_also_be_annotated_with_DomainObject_nature_VIEW_MODEL__]
 === every_jaxb_view_model_must_also_be_annotated_with_DomainObject_nature_VIEW_MODEL()
 
-This rule requires that classes annotated with the _XmlRootElement_ annotation must also be annotated with the xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation specifying a xref:refguide:applib:index/annotations/Nature.adoc[Nature] of _Nature#VIEW_MODEL VIEW_MODEL_ .
+This rule requires that classes annotated with the _XmlRootElement_ annotation must also be annotated with the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation specifying a xref:refguide:applib:index/annotation/Nature.adoc[Nature] of _Nature#VIEW_MODEL VIEW_MODEL_ .
 
-This is required because the framework uses Spring to detect entities and view models (the xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation is actually a meta-annotation for Spring's _org.springframework.stereotype.Component_ annotation.
+This is required because the framework uses Spring to detect entities and view models (the xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation is actually a meta-annotation for Spring's _org.springframework.stereotype.Component_ annotation.
 
 [#every_Action_mixin_must_follow_naming_convention__]
 === every_Action_mixin_must_follow_naming_convention()
diff --git a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJdoRules.adoc b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJdoRules.adoc
index a91ae38..ef3f459 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJdoRules.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJdoRules.adoc
@@ -28,7 +28,7 @@ class ArchitectureJdoRules {
 <.> xref:#every_jdo_PersistenceCapable_must_be_annotated_with_DomainObject_nature_of_ENTITY__[every_jdo_PersistenceCapable_must_be_annotated_with_DomainObject_nature_of_ENTITY()]
 +
 --
-This rule requires that classes annotated with the JDO _javax.jdo.annotations.PersistenceCapable_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotations.Nature#ENTITY entity_ .
+This rule requires that classes annotated with the JDO _javax.jdo.annotations.PersistenceCapable_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotation.Nature#ENTITY entity_ .
 --
 <.> xref:#every_jdo_PersistenceCapable_must_be_annotated_with_Version__[every_jdo_PersistenceCapable_must_be_annotated_with_Version()]
 +
@@ -71,7 +71,7 @@ This rule requires that injected fields in classes annotated with the JDO _Persi
 [#every_jdo_PersistenceCapable_must_be_annotated_with_DomainObject_nature_of_ENTITY__]
 === every_jdo_PersistenceCapable_must_be_annotated_with_DomainObject_nature_of_ENTITY()
 
-This rule requires that classes annotated with the JDO _javax.jdo.annotations.PersistenceCapable_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotations.Nature#ENTITY entity_ .
+This rule requires that classes annotated with the JDO _javax.jdo.annotations.PersistenceCapable_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotation.Nature#ENTITY entity_ .
 
 [#every_jdo_PersistenceCapable_must_be_annotated_with_Version__]
 === every_jdo_PersistenceCapable_must_be_annotated_with_Version()
diff --git a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJpaRules.adoc b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJpaRules.adoc
index 2fc4bb2..b77ce4d 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJpaRules.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/archtestsupport/applib/classrules/ArchitectureJpaRules.adoc
@@ -32,7 +32,7 @@ class ArchitectureJpaRules {
 <.> xref:#every_jpa_Entity_must_be_annotated_with_DomainObject_nature_of_ENTITY__[every_jpa_Entity_must_be_annotated_with_DomainObject_nature_of_ENTITY()]
 +
 --
-This rule requires that classes annotated with the JPA _Entity_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotations.Nature#ENTITY entity_ .
+This rule requires that classes annotated with the JPA _Entity_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotation.Nature#ENTITY entity_ .
 --
 <.> xref:#every_jpa_Entity_must_be_annotated_with_XmlJavaAdapter_of_PersistentEntityAdapter__[every_jpa_Entity_must_be_annotated_with_XmlJavaAdapter_of_PersistentEntityAdapter()]
 +
@@ -90,7 +90,7 @@ This rule requires that concrete classes annotated with the JPA _Entity_ annotat
 [#every_jpa_Entity_must_be_annotated_with_DomainObject_nature_of_ENTITY__]
 === every_jpa_Entity_must_be_annotated_with_DomainObject_nature_of_ENTITY()
 
-This rule requires that classes annotated with the JPA _Entity_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotations/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotations.Nature#ENTITY entity_ .
+This rule requires that classes annotated with the JPA _Entity_ annotation must also be annotated with the Apache Isis xref:refguide:applib:index/annotation/DomainObject.adoc[DomainObject] annotation specifying that its _DomainObject#nature() nature_ is an _org.apache.isis.applib.annotation.Nature#ENTITY entity_ .
 
 [#every_jpa_Entity_must_be_annotated_with_XmlJavaAdapter_of_PersistentEntityAdapter__]
 === every_jpa_Entity_must_be_annotated_with_XmlJavaAdapter_of_PersistentEntityAdapter()
diff --git a/antora/components/refguide-index/modules/testing/pages/index/specsupport/applib/specs/V.adoc b/antora/components/refguide-index/modules/testing/pages/index/specsupport/applib/specs/V.adoc
deleted file mode 100644
index 75e3d77..0000000
--- a/antora/components/refguide-index/modules/testing/pages/index/specsupport/applib/specs/V.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= V
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-A set of converters for built-in value types; for use in Cucumber step definitions.
-
-== API
-
-[source,java]
-.V.java
-----
-class V {
-}
-----
-
diff --git a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
index fdf247a..6bb24ed 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
@@ -5,10 +5,6 @@
 
 (This page will be added to as development progresses).
 
-WARNING: `org.apache.isis.applib.annotation` was renamed to `org.apache.isis.applib.annotations` (plural), 
-which unfortunately affects all early adopters! This has come up as a requirement to ease migration for existing projects 
-from v1 to v2 using Spring's `@AliasFor` annotation. 
-
 == Programming Model
 
 [cols="2a,3a", options="header"]
@@ -18,12 +14,6 @@ from v1 to v2 using Spring's `@AliasFor` annotation.
 | previously
 | new
 
-| `org.apache.isis.applib.annotation.*`
-| renamed to `org.apache.isis.applib.annotations.*` (plural) 
-- this unfortunately affects all early adopters, 
-but it has come up as a requirement to ease migration for existing projects 
-from v1 to v2 using Spring's `@AliasFor` annotation 
-
 | `@ParameterLayout(renderDay=RenderDay.AS_DAY_BEFORE)` deprecated for removal
 | use `@ValueSemantics(dateRenderAdjustDays=ValueSemantics.AS_DAY_BEFORE)` instead
 
diff --git a/antora/components/setupguide/modules/eclipse/attachments/isis-templates.xml b/antora/components/setupguide/modules/eclipse/attachments/isis-templates.xml
index cce0859..5316c74 100644
--- a/antora/components/setupguide/modules/eclipse/attachments/isis-templates.xml
+++ b/antora/components/setupguide/modules/eclipse/attachments/isis-templates.xml
@@ -18,7 +18,7 @@
   under the License.
 -->
 <templates><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Action" enabled="true" name="isa">// {{ ${actionName} (action)&#13;
-${:import(org.apache.isis.applib.annotations.MemberOrder)}@MemberOrder(sequence="1")&#13;
+${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
 public ${ReturnType} ${actionName}(final ${ParameterType} ${parameterType}) {&#13;
 	return ${cursor}null; // TODO: business logic here&#13;
 }&#13;
@@ -110,7 +110,7 @@ public void removeFrom${ChildCollectionName}(final ${ChildElementType} ${childEl
 }</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Collection hiding" enabled="true" name="ischid">public boolean hide${CollectionName}() {&#13;
 	return ${cursor}false; // TODO: return true if hidden, false otherwise&#13;
 }</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Collection (list)" enabled="true" name="iscl">// {{ ${CollectionName} (Collection)&#13;
-${:import(java.util.List,java.util.ArrayList,org.apache.isis.applib.annotations.MemberOrder)}private List&lt;${ElementType}&gt; ${collectionName} = new ArrayList&lt;${ElementType}&gt;();&#13;
+${:import(java.util.List,java.util.ArrayList,org.apache.isis.applib.annotation.MemberOrder)}private List&lt;${ElementType}&gt; ${collectionName} = new ArrayList&lt;${ElementType}&gt;();&#13;
 @MemberOrder(sequence="1")&#13;
 public List&lt;${ElementType}&gt; get${CollectionName}() {&#13;
 	return ${collectionName};&#13;
@@ -146,7 +146,7 @@ protected void onAddTo${CollectionName}(final ${ElementType} ${elementName}) {&#
 }&#13;
 protected void onRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
 }</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Collection (set)" enabled="true" name="iscs">// {{ ${CollectionName} (Collection)&#13;
-${:import(java.util.Set,java.util.LinkedHashSet,org.apache.isis.applib.annotations.MemberOrder)}private Set&lt;${ElementType}&gt; ${collectionName} = new LinkedHashSet&lt;${ElementType}&gt;();&#13;
+${:import(java.util.Set,java.util.LinkedHashSet,org.apache.isis.applib.annotation.MemberOrder)}private Set&lt;${ElementType}&gt; ${collectionName} = new LinkedHashSet&lt;${ElementType}&gt;();&#13;
 @MemberOrder(sequence="1")&#13;
 public Set&lt;${ElementType}&gt; get${CollectionName}() {&#13;
 	return ${collectionName};&#13;
@@ -200,7 +200,7 @@ ${cursor}&#13;
     ${cursor}// TODO: append to TitleBuffer, typically value properties&#13;
 	return buf.toString();&#13;
 }</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Collection (1:n bidir, foreign key)" enabled="true" name="isjdc-1n-b-fk">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Persistent)}@Persistent(mappedBy="${elementNameInChild}", dependentElement="${trueOrFalse}")
+${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persistent)}@Persistent(mappedBy="${elementNameInChild}", dependentElement="${trueOrFalse}")
 private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
 @MemberOrder(sequence="1")
 public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
@@ -210,7 +210,7 @@ public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collect
 this.${collectionName} = ${collectionName};
 }
 // }}</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Collection (1:n bidir, join table)" enabled="true" name="isjdc-1n-b-jt">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Persitent,javax.jdo.annotations.Join)}@Persistent(mappedBy="${elementNameInChild}", dependentElement="${trueOrFalse}")
+${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persitent,javax.jdo.annotations.Join)}@Persistent(mappedBy="${elementNameInChild}", dependentElement="${trueOrFalse}")
 @Join
 private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
 @MemberOrder(sequence="1")
@@ -221,7 +221,7 @@ public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collect
 this.${collectionName} = ${collectionName};
 }
 // }}</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Collection (1:n unidir, foreign key)" enabled="true" name="isjdc-1n-u-fk">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Element)}
+${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Element)}
 @Element(column="${ColumnName}", dependent="${trueOrFalse}")
 private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
 @MemberOrder(sequence="1")
@@ -232,7 +232,7 @@ public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collect
 this.${collectionName} = ${collectionName};
 }
 // }}</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Collection (1:n unidir, join table)" enabled="true" name="isjdc-1n-u-jt">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Join,javax.jdo.annotations.Element)}@Join
+${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Join,javax.jdo.annotations.Element)}@Join
 @Element(dependent="${trueOrFalse}")
 private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
 @MemberOrder(sequence="1")
@@ -243,7 +243,7 @@ public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collect
 this.${collectionName} = ${collectionName};
 }
 // }}</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Collection (m:n bidir - child)" enabled="true" name="isjdc-mn-ub-c">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Persistent)}@Persistent(mappedBy="${ChildCollectionNameInParent}")
+${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persistent)}@Persistent(mappedBy="${ChildCollectionNameInParent}")
 private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();
 public SortedSet&lt;${ElementType}&gt; get${CollectionName}() {
 return ${collectionName};
@@ -252,7 +252,7 @@ public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collect
 this.${collectionName} = ${collectionName};
 }
 // }}</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Collection (m:n unidir &amp; bidir - parent)" enabled="true" name="isjdc-mn-ub-p">// {{ ${CollectionName} (Collection)
-${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Persistent,javax.jdo.annotations.Join,javax.jdo.annotations.Element)}@Persistent(table="${TableName}")
+${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Persistent,javax.jdo.annotations.Join,javax.jdo.annotations.Element)}@Persistent(table="${TableName}")
 @Join(column="${ThisEntityFieldName}")
 @Element(column="${RelatedEntityFieldName}")
 private SortedSet&lt;${ElementType}&gt; ${collectionName} = new TreeSet&lt;${ElementType}&gt;();@MemberOrder(sequence="1")
@@ -265,7 +265,7 @@ public void set${CollectionName}(final SortedSet&lt;${ElementType}&gt; ${collect
 }
 // }}</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Property (simple - 1:1 unidir &amp; bidir - parent)" enabled="true" name="isjdp">// {{ ${PropertyName} (property)&#13;
 private ${PropertyType} ${propertyName};&#13;
-${:import(org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Column)}@MemberOrder(sequence="1")&#13;
+${:import(org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Column)}@MemberOrder(sequence="1")&#13;
 @Column(allowsNull="${trueOrFalse}")&#13;
 public ${PropertyType} get${PropertyName}() {&#13;
 	return ${propertyName};&#13;
@@ -277,7 +277,7 @@ public void set${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
 &#13;
 </template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="JDO Property (1:1 child)" enabled="true" name="isjdp-11c">// {{ ${PropertyName} (property)
 private ${PropertyType} ${propertyName};
-${:import(org.apache.isis.applib.annotations.MemberOrder,javax.jdo.annotations.Column,javax.jdo.annotations.Persistent)}@MemberOrder(sequence="1")
+${:import(org.apache.isis.applib.annotation.MemberOrder,javax.jdo.annotations.Column,javax.jdo.annotations.Persistent)}@MemberOrder(sequence="1")
 @Column(allowsNull="${trueOrFalse}")
 @Persistent(mappedBy="${fieldOnChild}")
 public ${PropertyType} get${PropertyName}() {
@@ -314,7 +314,7 @@ public void updated() {&#13;
     // TODO: post-update&#13;
 }</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Property" enabled="true" name="isp">// {{ ${PropertyName} (property)&#13;
 private ${PropertyType} ${propertyName};&#13;
-${:import(org.apache.isis.applib.annotations.MemberOrder)}@MemberOrder(sequence="1")&#13;
+${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
 public ${PropertyType} get${PropertyName}() {&#13;
 	return ${propertyName};&#13;
 }&#13;
@@ -433,7 +433,7 @@ protected void onClear${PropertyName}(final ${PropertyType} old${PropertyName})
 }</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Isis Section" enabled="true" name="iss">// {{ ${SectionName}
 ${cursor}
 // }}</template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Search for all" enabled="true" name="issa">// {{ all ${TypePlural}&#13;
-${:import(org.apache.isis.applib.annotations.Exploration,java.util.List)}@Exploration&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,java.util.List)}@Exploration&#13;
 public List&lt;${Type}&gt; all${TypePlural}() {&#13;
 	return allInstances(${Type}.class);&#13;
 }&#13;
@@ -441,7 +441,7 @@ public List&lt;${Type}&gt; all${TypePlural}() {&#13;
 &#13;
 &#13;
 </template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Search for all matching" enabled="true" name="issafil">// {{ all ${TypePlural} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotations.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
 public List&lt;${Type}&gt; all${TypePlural}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
 	return allMatches(${Type}.class, filter);&#13;
 }&#13;
@@ -449,13 +449,13 @@ public List&lt;${Type}&gt; all${TypePlural}Matching(final Filter&lt;${Type}&gt;
 &#13;
 &#13;
 </template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Search for first matching" enabled="true" name="issffil">// {{ first ${Type} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotations.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
 public ${Type} first${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
 	return firstMatch(${Type}.class, filter);&#13;
 }&#13;
 // }}&#13;
 </template><template autoinsert="true" context="java-pathsToInclude" deleted="false" description="Search for unique matching" enabled="true" name="issufil">// {{ unique ${Type} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotations.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
 public ${Type} unique${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
 	return uniqueMatch(${Type}.class, filter);&#13;
 }&#13;
diff --git a/antora/components/userguide/modules/fun/pages/modules.adoc b/antora/components/userguide/modules/fun/pages/modules.adoc
index a9691c7..a5689b6 100644
--- a/antora/components/userguide/modules/fun/pages/modules.adoc
+++ b/antora/components/userguide/modules/fun/pages/modules.adoc
@@ -108,7 +108,7 @@ The above example could therefore be rewritten as:
 ----
 package com.mycompany.modules.customer;
 ...
-import org.apache.isis.applib.annotations.Module;
+import org.apache.isis.applib.annotation.Module;
 
 @Module
 @Import({
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java b/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java
index d0d25ed..55b3279 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/ioc/_IocContainer.java
@@ -64,7 +64,7 @@ public interface _IocContainer {
      * <p>
      *     If there is more than one implementation, then the one with the &quot;highest&quot;
      *     priority (either annotated with {@link org.springframework.context.annotation.Primary},
-     *     else with encountered with earliest {@link org.apache.isis.applib.annotations.PriorityPrecedence precedence})
+     *     else with encountered with earliest {@link org.apache.isis.applib.annotation.PriorityPrecedence precedence})
      *     is used instead.
      * </p>
      *
@@ -83,7 +83,7 @@ public interface _IocContainer {
      * <p>
      *     If there is more than one implementation, then the one with the &quot;highest&quot;
      *     priority (either annotated with {@link org.springframework.context.annotation.Primary},
-     *     else with encountered with earliest {@link org.apache.isis.applib.annotations.PriorityPrecedence precedence})
+     *     else with encountered with earliest {@link org.apache.isis.applib.annotation.PriorityPrecedence precedence})
      *     is used instead.
      * </p>
      *
@@ -103,7 +103,7 @@ public interface _IocContainer {
      * <p>
      *     If there is more than one implementation, then the one with the &quot;highest&quot;
      *     priority (either annotated with {@link org.springframework.context.annotation.Primary},
-     *     else with encountered with earliest {@link org.apache.isis.applib.annotations.PriorityPrecedence precedence})
+     *     else with encountered with earliest {@link org.apache.isis.applib.annotation.PriorityPrecedence precedence})
      *     is used instead.
      * </p>
      *
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 92b21ad..6df3557 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -624,7 +624,7 @@ org.junit.jupiter:junit-jupiter-api:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:testing:index/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc[IsisModuleTestingSpecSupportApplib], xref:refguide:testing:index/specsupport/applib/integration/ObjectFactoryForIntegration.adoc[ObjectFactoryForIntegration], xref:refguide:testing:index/specsupport/applib/specs/V.adoc[V]
+xref:refguide:testing:index/specsupport/applib/IsisModuleTestingSpecSupportApplib.adoc[IsisModuleTestingSpecSupportApplib], xref:refguide:testing:index/specsupport/applib/integration/ObjectFactoryForIntegration.adoc[ObjectFactoryForIntegration]
 ****
 
 |Apache Isis Tst - Unit Test Support (parent)
@@ -1474,9 +1474,9 @@ default (Java) programming model.
 
 .Components
 ****
-o.a.i.applib.annotations.DomainObject +
-o.a.i.applib.annotations.DomainService +
-o.a.i.applib.annotations.Value +
+o.a.i.applib.annotation.DomainObject +
+o.a.i.applib.annotation.DomainService +
+o.a.i.applib.annotation.Value +
 o.a.i.applib.services.clock.ClockService +
 o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandDto +
 o.a.i.applib.services.commanddto.conmap.ContentMappingServiceForCommandsDto +
@@ -1503,7 +1503,7 @@ org.jmock:jmock:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:applib:index/AbstractViewModel.adoc[AbstractViewModel], xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotations/Action.adoc[Action], xref:refguide:applib:index/annotations/ActionLayout.adoc[ActionLayout], xref:refguide:applib:index/ann [...]
+xref:refguide:applib:index/AbstractViewModel.adoc[AbstractViewModel], xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotation/Action.adoc[Action], xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout], xref:refguide:applib:index/annot [...]
 ****
 
 |Apache Isis Core - Code Gen (ByteBuddy)
@@ -4591,7 +4591,7 @@ org.springframework.security:spring-security-crypto:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:extensions:index/secman/applib/IsisModuleExtSecmanApplib.adoc[IsisModuleExtSecmanApplib], xref:refguide:extensions:index/secman/applib/SecmanConfiguration.adoc[SecmanConfiguration], xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermission.adoc[ApplicationPermission], xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode], xref:refguide:extensions:index/secman/applib/permission/dom/Applic [...]
+xref:refguide:extensions:index/secman/applib/IsisModuleExtSecmanApplib.adoc[IsisModuleExtSecmanApplib], xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermission.adoc[ApplicationPermission], xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode], xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionRepository.adoc[ApplicationPermissionRepository], xref:refguide:extensions:in [...]
 ****
 
 |Apache Isis Ext - Sec Man Encryption (Using jbcrypt)
@@ -4651,6 +4651,7 @@ Directory: /extensions/security/secman/integration
 o.a.i.extensions.secman.integration.authorizor.AuthorizorSecman +
 o.a.i.extensions.secman.integration.authorizor.AuthorizorSecman$PermissionCache +
 o.a.i.extensions.secman.integration.facets.TenantedAuthorizationPostProcessor$Register +
+o.a.i.extensions.secman.integration.permissions.PermissionsEvaluationServiceForSecman +
 o.a.i.extensions.secman.integration.spiimpl.ImpersonateMenuAdvisorForSecman +
 o.a.i.extensions.secman.integration.spiimpl.ImpersonateMenuAdvisorForSecman$Cache +
 o.a.i.extensions.secman.integration.spiimpl.TableColumnVisibilityServiceForSecman +
@@ -4666,7 +4667,7 @@ org.apache.isis.extensions:isis-extensions-secman-applib:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:extensions:index/secman/integration/IsisModuleExtSecmanIntegration.adoc[IsisModuleExtSecmanIntegration], xref:refguide:extensions:index/secman/integration/authenticator/AuthenticatorSecman.adoc[AuthenticatorSecman], xref:refguide:extensions:index/secman/integration/authenticator/AuthenticatorSecmanAutoConfiguration.adoc[AuthenticatorSecmanAutoConfiguration], xref:refguide:extensions:index/secman/integration/authorizor/AuthorizorSecman.adoc[AuthorizorSecman], xref:refguide:e [...]
+xref:refguide:extensions:index/secman/integration/IsisModuleExtSecmanIntegration.adoc[IsisModuleExtSecmanIntegration], xref:refguide:extensions:index/secman/integration/authenticator/AuthenticatorSecman.adoc[AuthenticatorSecman], xref:refguide:extensions:index/secman/integration/authenticator/AuthenticatorSecmanAutoConfiguration.adoc[AuthenticatorSecmanAutoConfiguration], xref:refguide:extensions:index/secman/integration/authorizor/AuthorizorSecman.adoc[AuthorizorSecman], xref:refguide:e [...]
 ****
 
 |Apache Isis Ext - Sec Man Persistence (Using JDO)
diff --git a/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
index 64400be..7391209 100644
--- a/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
+++ b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
@@ -27,19 +27,19 @@ import javax.jdo.annotations.VersionStrategy;
 
 import org.wicketstuff.pdfjs.Scale;
 
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.DomainObject;
-import org.apache.isis.applib.annotations.DomainObjectLayout;
-import org.apache.isis.applib.annotations.Editing;
-import org.apache.isis.applib.annotations.MemberOrder;
-import org.apache.isis.applib.annotations.MemberSupport;
-import org.apache.isis.applib.annotations.Optionality;
-import org.apache.isis.applib.annotations.Property;
-import org.apache.isis.applib.annotations.PropertyLayout;
-import org.apache.isis.applib.annotations.SemanticsOf;
-import org.apache.isis.applib.annotations.Title;
-import org.apache.isis.applib.annotations.Where;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.value.Blob;
 
 import org.isisaddons.wicket.pdfjs.cpt.applib.PdfJsViewer;
diff --git a/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
index 0b904aa..8519fff 100644
--- a/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
+++ b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
@@ -20,15 +20,15 @@ package org.isisaddons.wicket.pdfjs.fixture.demoapp.demomodule.dom;
 
 import java.util.List;
 
-import org.apache.isis.applib.annotations.Action;
-import org.apache.isis.applib.annotations.ActionLayout;
-import org.apache.isis.applib.annotations.BookmarkPolicy;
-import org.apache.isis.applib.annotations.DomainService;
-import org.apache.isis.applib.annotations.DomainServiceLayout;
-import org.apache.isis.applib.annotations.MemberOrder;
-import org.apache.isis.applib.annotations.NatureOfService;
-import org.apache.isis.applib.annotations.ParameterLayout;
-import org.apache.isis.applib.annotations.SemanticsOf;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.repository.RepositoryService;
 
 @DomainService(
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt
index 649348c..25781d8 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt
@@ -1007,7 +1007,7 @@ object RESTFUL_DOMAIN_TYPES : Response() {
         },
         {
             "rel": "urn:org.restfulobjects:rels/domain-type",
-            "href": "http://localhost:8080/restful/domain-types/org.apache.isis.applib.annotations.SemanticsOf",
+            "href": "http://localhost:8080/restful/domain-types/org.apache.isis.applib.annotation.SemanticsOf",
             "method": "GET",
             "type": "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
         },
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt
index 237fe64..0bf1216 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/isis/client/kroviz/snapshots/simpleapp1_16_0/RESTFUL_DOMAIN_TYPES.kt
@@ -637,7 +637,7 @@ object RESTFUL_DOMAIN_TYPES : Response() {
     "type" : "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
   }, {
     "rel" : "urn:org.restfulobjects:rels/domain-type",
-    "href" : "http://localhost:8080/restful/domain-types/org.apache.isis.applib.annotations.Bulk.InteractionContext",
+    "href" : "http://localhost:8080/restful/domain-types/org.apache.isis.applib.annotation.Bulk.InteractionContext",
     "method" : "GET",
     "type" : "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
   }, {
@@ -1277,7 +1277,7 @@ object RESTFUL_DOMAIN_TYPES : Response() {
     "type" : "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
   }, {
     "rel" : "urn:org.restfulobjects:rels/domain-type",
-    "href" : "http://localhost:8080/restful/domain-types/org.apache.isis.applib.annotations.SemanticsOf",
+    "href" : "http://localhost:8080/restful/domain-types/org.apache.isis.applib.annotation.SemanticsOf",
     "method" : "GET",
     "type" : "application/json;profile=\"urn:org.restfulobjects:repr-types/domain-type\""
   }, {