You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/03/21 07:12:44 UTC

[causeway-site] branch asf-site updated: updates snapshot

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new 89a57a332 updates snapshot
89a57a332 is described below

commit 89a57a332e88b0f19d04164c08bbf187af730e5f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 21 07:10:04 2023 +0000

    updates snapshot
---
 content/refguide/2.0.0-SNAPSHOT/about.html         | 15 ++++------
 .../refguide/2.0.0-SNAPSHOT/applib-ant/Column.html | 15 ++++------
 .../refguide/2.0.0-SNAPSHOT/applib-ant/Digits.html | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/Discriminator.html   | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/NotPersistent.html   | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/Nullable.html        | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/Pattern.html         | 15 ++++------
 .../applib-ant/PersistenceCapable.html             | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/PrimaryKey.html      | 15 ++++------
 .../applib-ant/XmlJavaTypeAdapter.html             | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/XmlRootElement.html  | 15 ++++------
 .../refguide/2.0.0-SNAPSHOT/applib-ant/about.html  | 15 ++++------
 .../applib-ant/about/hooks/examples.html           | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/about/jdo.html       | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/about/jee.html       | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/about/jpa.html       | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/about/main.html      | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/about/other.html     | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-ant/about/partial.html   | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-classes/about.html       | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-classes/events.html      | 15 ++++------
 .../applib-classes/events/domainevent.html         | 15 ++++------
 .../applib-classes/events/lifecycleevent.html      | 15 ++++------
 .../applib-classes/events/uievent.html             | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-classes/layout.html      | 15 ++++------
 .../applib-classes/layout/column-order.html        | 15 ++++------
 .../applib-classes/layout/menubars.html            | 15 ++++------
 .../applib-classes/layout/object-layout.html       | 15 ++++------
 .../applib-classes/mixees-and-mixins.html          | 15 ++++------
 .../applib-classes/non-persisted-objects.html      | 15 ++++------
 .../roles-mixins-contributees/contributee.html     | 15 ++++------
 .../roles-mixins-contributees/mixins.html          | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-classes/spec.html        | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-classes/utility.html     | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-classes/value-types.html | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-methods/about.html       | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-methods/lifecycle.html   | 15 ++++------
 .../applib-methods/lifecycle/created.html          | 15 ++++------
 .../applib-methods/lifecycle/loaded.html           | 15 ++++------
 .../applib-methods/lifecycle/persisted.html        | 15 ++++------
 .../applib-methods/lifecycle/persisting.html       | 15 ++++------
 .../applib-methods/lifecycle/removing.html         | 15 ++++------
 .../applib-methods/lifecycle/updated.html          | 15 ++++------
 .../applib-methods/lifecycle/updating.html         | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-methods/prefixes.html    | 15 ++++------
 .../applib-methods/prefixes/autoComplete.html      | 15 ++++------
 .../applib-methods/prefixes/choices.html           | 15 ++++------
 .../applib-methods/prefixes/default.html           | 15 ++++------
 .../applib-methods/prefixes/disable.html           | 15 ++++------
 .../applib-methods/prefixes/get.html               | 15 ++++------
 .../applib-methods/prefixes/hide.html              | 15 ++++------
 .../applib-methods/prefixes/set.html               | 15 ++++------
 .../applib-methods/prefixes/validate.html          | 15 ++++------
 .../2.0.0-SNAPSHOT/applib-methods/ui-hints.html    | 15 ++++------
 .../applib-methods/ui-hints/cssClass.html          | 15 ++++------
 .../applib-methods/ui-hints/iconName.html          | 15 ++++------
 .../applib-methods/ui-hints/layout.html            | 15 ++++------
 .../applib-methods/ui-hints/title.html             | 15 ++++------
 .../refguide/2.0.0-SNAPSHOT/applib-svc/about.html  | 15 ++++------
 ...ag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg |  1 +
 .../applib/index/CausewayModuleApplib.html         | 15 ++++------
 ...sewayModuleApplibChangeAndExecutionLoggers.html | 15 ++++------
 .../applib/index/CausewayModuleApplibMixins.html   | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/Identifier.html    | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/ViewModel.html     | 15 ++++------
 .../applib/index/annotation/Action.html            | 15 ++++------
 .../applib/index/annotation/ActionLayout.html      | 15 ++++------
 .../applib/index/annotation/BookmarkPolicy.html    | 15 ++++------
 .../applib/index/annotation/Bounding.html          | 15 ++++------
 .../applib/index/annotation/Collection.html        | 15 ++++------
 .../applib/index/annotation/CollectionLayout.html  | 15 ++++------
 .../index/annotation/DependentDefaultsPolicy.html  | 15 ++++------
 .../applib/index/annotation/DomainObject.html      | 15 ++++------
 .../index/annotation/DomainObjectLayout.html       | 15 ++++------
 .../applib/index/annotation/DomainService.html     | 15 ++++------
 .../index/annotation/DomainServiceLayout.html      | 15 ++++------
 .../annotation/DomainServiceLayout_MenuBar.html    | 15 ++++------
 .../applib/index/annotation/Domain_Exclude.html    | 15 ++++------
 .../applib/index/annotation/Domain_Include.html    | 15 ++++------
 .../applib/index/annotation/Editing.html           | 15 ++++------
 .../applib/index/annotation/EntityChangeKind.html  | 15 ++++------
 .../applib/index/annotation/HomePage.html          | 15 ++++------
 .../applib/index/annotation/InteractionScope.html  | 15 ++++------
 .../applib/index/annotation/Introspection.html     | 15 ++++------
 .../applib/index/annotation/LabelPosition.html     | 15 ++++------
 .../applib/index/annotation/MemberSupport.html     | 15 ++++------
 .../applib/index/annotation/MinLength.html         | 15 ++++------
 .../applib/index/annotation/Module.html            | 15 ++++------
 .../applib/index/annotation/Nature.html            | 15 ++++------
 .../applib/index/annotation/NatureOfService.html   | 15 ++++------
 .../applib/index/annotation/Navigable.html         | 15 ++++------
 .../applib/index/annotation/ObjectLifecycle.html   | 15 ++++------
 .../applib/index/annotation/ObjectSupport.html     | 15 ++++------
 .../applib/index/annotation/Optionality.html       | 15 ++++------
 .../applib/index/annotation/Parameter.html         | 15 ++++------
 .../applib/index/annotation/ParameterLayout.html   | 15 ++++------
 .../applib/index/annotation/ParameterTuple.html    | 15 ++++------
 .../index/annotation/PriorityPrecedence.html       | 15 ++++------
 .../applib/index/annotation/Programmatic.html      | 15 ++++------
 .../applib/index/annotation/Projecting.html        | 15 ++++------
 .../applib/index/annotation/PromptStyle.html       | 15 ++++------
 .../applib/index/annotation/Property.html          | 15 ++++------
 .../applib/index/annotation/PropertyLayout.html    | 15 ++++------
 .../applib/index/annotation/Publishing.html        | 15 ++++------
 .../applib/index/annotation/Redirect.html          | 15 ++++------
 .../applib/index/annotation/Repainting.html        | 15 ++++------
 .../applib/index/annotation/RestrictTo.html        | 15 ++++------
 .../applib/index/annotation/SemanticsOf.html       | 15 ++++------
 .../applib/index/annotation/Snapshot.html          | 15 ++++------
 .../applib/index/annotation/TimePrecision.html     | 15 ++++------
 .../index/annotation/TimeZoneTranslation.html      | 15 ++++------
 .../applib/index/annotation/Title.html             | 15 ++++------
 .../applib/index/annotation/Value.html             | 15 ++++------
 .../applib/index/annotation/ValueSemantics.html    | 15 ++++------
 .../applib/index/annotation/Where.html             | 15 ++++------
 ...PropertyLayout-FieldSet-examples-and-usage.html | 15 ++++------
 .../hooks/ActionLayout_010-examples-and-usage.html | 15 ++++------
 .../hooks/ActionLayout_021-promptStyle.html        | 15 ++++------
 .../hooks/ActionLayout_022-position.html           | 15 ++++------
 .../hooks/ActionLayout_023-describedAs.html        | 15 ++++------
 .../hooks/ActionLayout_024-cssClass.html           | 15 ++++------
 .../hooks/ActionLayout_025-cssClassFa.html         | 15 ++++------
 .../hooks/ActionLayout_026-bookmarking.html        | 15 ++++------
 .../annotation/hooks/ActionLayout_027-hidden.html  | 15 ++++------
 .../annotation/hooks/ActionLayout_028-named.html   | 15 ++++------
 .../hooks/ActionLayout_029-redirect.html           | 15 ++++------
 .../hooks/Action_010-examples-and-usage.html       | 15 ++++------
 .../annotation/hooks/Action_021-associating.html   | 15 ++++------
 .../hooks/Action_022-action-semantics.html         | 15 ++++------
 .../hooks/Action_023-deployment-modes.html         | 15 ++++------
 .../annotation/hooks/Action_024-domain-events.html | 15 ++++------
 .../hooks/Action_025-execution-publishing.html     | 15 ++++------
 .../hooks/Action_026-command-processing.html       | 15 ++++------
 .../hooks/Action_027-collection-types.html         | 15 ++++------
 .../annotation/hooks/Action_030-see-also.html      | 15 ++++------
 .../CollectionLayout_010-examples-and-usage.html   | 15 ++++------
 .../hooks/CollectionLayout_021-defaultView.html    | 15 ++++------
 .../hooks/CollectionLayout_022-paged.html          | 15 ++++------
 .../hooks/CollectionLayout_023-describedAs.html    | 15 ++++------
 .../hooks/CollectionLayout_024-sortedBy.html       | 15 ++++------
 .../hooks/CollectionLayout_025-cssClass.html       | 15 ++++------
 .../hooks/CollectionLayout_026-named.html          | 15 ++++------
 .../hooks/CollectionLayout_027-hidden.html         | 15 ++++------
 .../hooks/Collection_010-examples-and-usage.html   | 15 ++++------
 .../hooks/Collection_021_domainEvent.html          | 15 ++++------
 .../annotation/hooks/Collection_022_hidden.html    | 15 ++++------
 .../annotation/hooks/Collection_023_typeOf.html    | 15 ++++------
 .../DomainObjectLayout_010-examples-and-usage.html | 15 ++++------
 .../hooks/DomainObjectLayout_021-describedAs.html  | 15 ++++------
 .../hooks/DomainObjectLayout_022-cssClass.html     | 15 ++++------
 .../hooks/DomainObjectLayout_023-cssClassFa.html   | 15 ++++------
 .../hooks/DomainObjectLayout_024-named.html        | 15 ++++------
 .../hooks/DomainObjectLayout_025-bookmarking.html  | 15 ++++------
 .../hooks/DomainObjectLayout_026-paged.html        | 15 ++++------
 .../hooks/DomainObjectLayout_027-ui-events.html    | 15 ++++------
 .../hooks/DomainObject_010-examples-and-usage.html | 15 ++++------
 .../hooks/DomainObject_021-logicalTypeName.html    | 15 ++++------
 .../annotation/hooks/DomainObject_022-nature.html  | 15 ++++------
 .../annotation/hooks/DomainObject_023-editing.html | 15 ++++------
 .../hooks/DomainObject_024-domain-events.html      | 15 ++++------
 .../hooks/DomainObject_025-lifecycle-events.html   | 15 ++++------
 .../DomainObject_026-entityChangePublishing.html   | 15 ++++------
 .../hooks/DomainObject_027-bounding.html           | 15 ++++------
 .../DomainObject_028-autoCompleteRepository.html   | 15 ++++------
 .../hooks/DomainObject_029-mixinMethod.html        | 15 ++++------
 .../hooks/DomainObject_040-see-also.html           | 15 ++++------
 ...DomainServiceLayout_010-examples-and-usage.html | 15 ++++------
 .../hooks/DomainServiceLayout_021-menuBar.html     | 15 ++++------
 .../hooks/DomainServiceLayout_022-named.html       | 15 ++++------
 .../DomainService_010-examples-and-usage.html      | 15 ++++------
 .../hooks/DomainService_021-objectType.html        | 15 ++++------
 .../annotation/hooks/DomainService_022-nature.html | 15 ++++------
 .../hooks/Facets_010-examples-and-usage.html       | 15 ++++------
 .../hooks/HomePage_010-examples-and-usage.html     | 15 ++++------
 .../InteractionScope_010-examples-and-usage.html   | 15 ++++------
 .../hooks/MinLength_010-examples-and-usage.html    | 15 ++++------
 .../ParameterLayout_010-examples-and-usage.html    | 15 ++++------
 .../hooks/ParameterLayout_021-labelPosition.html   | 15 ++++------
 .../hooks/ParameterLayout_022-multiLine.html       | 15 ++++------
 .../hooks/ParameterLayout_023-describedAs.html     | 15 ++++------
 .../hooks/ParameterLayout_024-cssClass.html        | 15 ++++------
 .../hooks/ParameterLayout_025-renderDay.html       | 15 ++++------
 .../hooks/ParameterLayout_026-named.html           | 15 ++++------
 .../hooks/ParameterLayout_027-typicalLength.html   | 15 ++++------
 .../hooks/Parameter_010-examples-and-usage.html    | 15 ++++------
 .../hooks/Parameter_021-optionality.html           | 15 ++++------
 .../annotation/hooks/Parameter_022-maxLength.html  | 15 ++++------
 .../hooks/Parameter_023-mustSatisfy.html           | 15 ++++------
 .../hooks/Parameter_024-regexPattern.html          | 15 ++++------
 .../annotation/hooks/Parameter_025-fileAccept.html | 15 ++++------
 .../hooks/Programmatic_010-examples-and-usage.html | 15 ++++------
 .../PropertyLayout_010-examples-and-usage.html     | 15 ++++------
 .../hooks/PropertyLayout_021_labelPosition.html    | 15 ++++------
 .../hooks/PropertyLayout_022_promptStyle.html      | 15 ++++------
 .../hooks/PropertyLayout_023_multiLine.html        | 15 ++++------
 .../hooks/PropertyLayout_024_navigable.html        | 15 ++++------
 .../hooks/PropertyLayout_025_describedAs.html      | 15 ++++------
 .../hooks/PropertyLayout_026_cssClass.html         | 15 ++++------
 .../hooks/PropertyLayout_027_renderDay.html        | 15 ++++------
 .../hooks/PropertyLayout_028_repainting.html       | 15 ++++------
 .../annotation/hooks/PropertyLayout_029_named.html | 15 ++++------
 .../hooks/PropertyLayout_030_hidden.html           | 15 ++++------
 .../hooks/PropertyLayout_31_typicalLength.html     | 15 ++++------
 .../hooks/Property_010-examples-and-usage.html     | 15 ++++------
 .../annotation/hooks/Property_021-optionality.html | 15 ++++------
 .../annotation/hooks/Property_022-editing.html     | 15 ++++------
 .../annotation/hooks/Property_023-maxLength.html   | 15 ++++------
 .../annotation/hooks/Property_024-mustSatisfy.html | 15 ++++------
 .../annotation/hooks/Property_025-projecting.html  | 15 ++++------
 .../hooks/Property_026-domain-events.html          | 15 ++++------
 .../hooks/Property_027-execution-publishing.html   | 15 ++++------
 .../hooks/Property_028-command-processing.html     | 15 ++++------
 .../hooks/Property_029-regexPattern.html           | 15 ++++------
 .../annotation/hooks/Property_030-snapshot.html    | 15 ++++------
 .../annotation/hooks/Property_031-fileAccept.html  | 15 ++++------
 .../annotation/hooks/Property_033-hidden.html      | 15 ++++------
 .../hooks/Title_010-examples-and-usage.html        | 15 ++++------
 .../client/RepresentationTypeSimplifiedV2.html     | 15 ++++------
 .../applib/index/client/SuppressionType.html       | 15 ++++------
 .../applib/index/clock/VirtualClock.html           | 15 ++++------
 .../applib/index/domain/DomainObjectList.html      | 15 ++++------
 .../applib/index/events/EventObjectBase.html       | 15 ++++------
 .../index/events/domain/AbstractDomainEvent.html   | 15 ++++------
 .../index/events/domain/ActionDomainEvent.html     | 15 ++++------
 .../index/events/domain/CollectionDomainEvent.html | 15 ++++------
 .../index/events/domain/PropertyDomainEvent.html   | 15 ++++------
 .../events/lifecycle/AbstractLifecycleEvent.html   | 15 ++++------
 .../index/events/lifecycle/ObjectCreatedEvent.html | 15 ++++------
 .../index/events/lifecycle/ObjectLoadedEvent.html  | 15 ++++------
 .../events/lifecycle/ObjectPersistedEvent.html     | 15 ++++------
 .../events/lifecycle/ObjectPersistingEvent.html    | 15 ++++------
 .../events/lifecycle/ObjectRemovingEvent.html      | 15 ++++------
 .../index/events/lifecycle/ObjectUpdatedEvent.html | 15 ++++------
 .../events/lifecycle/ObjectUpdatingEvent.html      | 15 ++++------
 .../applib/index/events/ui/AbstractUiEvent.html    | 15 ++++------
 .../applib/index/events/ui/CssClassUiEvent.html    | 15 ++++------
 .../applib/index/events/ui/IconUiEvent.html        | 15 ++++------
 .../applib/index/events/ui/LayoutUiEvent.html      | 15 ++++------
 .../applib/index/events/ui/TitleUiEvent.html       | 15 ++++------
 .../index/exceptions/RecoverableException.html     | 15 ++++------
 .../index/exceptions/TranslatableException.html    | 15 ++++------
 .../index/exceptions/UnrecoverableException.html   | 15 ++++------
 .../unrecoverable/DomainModelException.html        | 15 ++++------
 .../unrecoverable/MetaModelException.html          | 15 ++++------
 .../unrecoverable/NoAuthenticatorException.html    | 15 ++++------
 .../unrecoverable/ObjectNotFoundException.html     | 15 ++++------
 .../unrecoverable/ObjectPersistenceException.html  | 15 ++++------
 .../unrecoverable/PersistFailedException.html      | 15 ++++------
 .../unrecoverable/ReflectiveActionException.html   | 15 ++++------
 .../unrecoverable/RepositoryException.html         | 15 ++++------
 .../unrecoverable/UnexpectedCallException.html     | 15 ++++------
 .../unrecoverable/UnknownTypeException.html        | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/graph/Edge.html    | 15 ++++------
 .../applib/index/graph/SimpleEdge.html             | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/graph/Vertex.html  | 15 ++++------
 .../applib/index/graph/tree/TreeAdapter.html       | 15 ++++------
 .../applib/index/graph/tree/TreeNode.html          | 15 ++++------
 .../applib/index/graph/tree/TreePath.html          | 15 ++++------
 .../applib/index/graph/tree/TreeState.html         | 15 ++++------
 .../applib/index/id/HasLogicalType.html            | 15 ++++------
 .../applib/index/id/LogicalType.html               | 15 ++++------
 .../applib/index/jaxb/DataTypeFactory.html         | 15 ++++------
 .../applib/index/jaxb/JavaSqlJaxbAdapters.html     | 15 ++++------
 .../JavaSqlXMLGregorianCalendarMarshalling.html    | 15 ++++------
 .../applib/index/jaxb/JavaTimeJaxbAdapters.html    | 15 ++++------
 .../JavaTimeXMLGregorianCalendarMarshalling.html   | 15 ++++------
 .../applib/index/jaxb/JavaUtilJaxbAdapters.html    | 15 ++++------
 .../index/jaxb/PersistentEntitiesAdapter.html      | 15 ++++------
 .../applib/index/jaxb/PersistentEntityAdapter.html | 15 ++++------
 .../applib/index/jaxb/PrimitiveJaxbAdapters.html   | 15 ++++------
 .../applib/index/layout/LayoutConstants.html       | 15 ++++------
 .../index/layout/component/ActionLayoutData.html   | 15 ++++------
 .../layout/component/ActionLayoutDataOwner.html    | 15 ++++------
 .../layout/component/CollectionLayoutData.html     | 15 ++++------
 .../component/CollectionLayoutDataOwner.html       | 15 ++++------
 .../index/layout/component/CssClassFaPosition.html | 15 ++++------
 .../layout/component/DomainObjectLayoutData.html   | 15 ++++------
 .../component/DomainObjectLayoutDataOwner.html     | 15 ++++------
 .../applib/index/layout/component/FieldSet.html    | 15 ++++------
 .../index/layout/component/FieldSetOwner.html      | 15 ++++------
 .../index/layout/component/HasBookmarking.html     | 15 ++++------
 .../applib/index/layout/component/HasCssClass.html | 15 ++++------
 .../index/layout/component/HasCssClassFa.html      | 15 ++++------
 .../index/layout/component/HasDescribedAs.html     | 15 ++++------
 .../applib/index/layout/component/HasHidden.html   | 15 ++++------
 .../applib/index/layout/component/HasNamed.html    | 15 ++++------
 .../index/layout/component/MemberRegion.html       | 15 ++++------
 .../index/layout/component/MemberRegionOwner.html  | 15 ++++------
 .../applib/index/layout/component/Owned.html       | 15 ++++------
 .../applib/index/layout/component/Owner.html       | 15 ++++------
 .../index/layout/component/PropertyLayoutData.html | 15 ++++------
 .../layout/component/ServiceActionLayoutData.html  | 15 ++++------
 .../component/ServiceActionLayoutDataOwner.html    | 15 ++++------
 .../applib/index/layout/grid/Grid.html             | 15 ++++------
 .../applib/index/layout/grid/GridAbstract.html     | 15 ++++------
 .../index/layout/grid/bootstrap/BSClearFix.html    | 15 ++++------
 .../layout/grid/bootstrap/BSClearFixHidden.html    | 15 ++++------
 .../layout/grid/bootstrap/BSClearFixVisible.html   | 15 ++++------
 .../applib/index/layout/grid/bootstrap/BSCol.html  | 15 ++++------
 .../index/layout/grid/bootstrap/BSElement.html     | 15 ++++------
 .../layout/grid/bootstrap/BSElementAbstract.html   | 15 ++++------
 .../applib/index/layout/grid/bootstrap/BSGrid.html | 15 ++++------
 .../applib/index/layout/grid/bootstrap/BSRow.html  | 15 ++++------
 .../index/layout/grid/bootstrap/BSRowContent.html  | 15 ++++------
 .../layout/grid/bootstrap/BSRowContentOwner.html   | 15 ++++------
 .../index/layout/grid/bootstrap/BSRowOwner.html    | 15 ++++------
 .../applib/index/layout/grid/bootstrap/BSTab.html  | 15 ++++------
 .../index/layout/grid/bootstrap/BSTabGroup.html    | 15 ++++------
 .../layout/grid/bootstrap/BSTabGroupOwner.html     | 15 ++++------
 .../index/layout/grid/bootstrap/BSTabOwner.html    | 15 ++++------
 .../index/layout/grid/bootstrap/HasCssId.html      | 15 ++++------
 .../applib/index/layout/grid/bootstrap/Size.html   | 15 ++++------
 .../index/layout/grid/bootstrap/SizeSpan.html      | 15 ++++------
 .../index/layout/grid/bootstrap/WithinGrid.html    | 15 ++++------
 .../applib/index/layout/links/Link.html            | 15 ++++------
 .../applib/index/layout/menubars/HasNamed.html     | 15 ++++------
 .../applib/index/layout/menubars/Menu.html         | 15 ++++------
 .../applib/index/layout/menubars/MenuBar.html      | 15 ++++------
 .../applib/index/layout/menubars/MenuBars.html     | 15 ++++------
 .../index/layout/menubars/MenuBarsAbstract.html    | 15 ++++------
 .../applib/index/layout/menubars/MenuSection.html  | 15 ++++------
 .../index/layout/menubars/bootstrap/BSMenu.html    | 15 ++++------
 .../index/layout/menubars/bootstrap/BSMenuBar.html | 15 ++++------
 .../layout/menubars/bootstrap/BSMenuBars.html      | 15 ++++------
 .../layout/menubars/bootstrap/BSMenuSection.html   | 15 ++++------
 .../applib/index/locale/UserLocale.html            | 15 ++++------
 .../applib/index/mixins/dto/Dto.html               | 15 ++++------
 .../applib/index/mixins/dto/DtoMixinConstants.html | 15 ++++------
 .../applib/index/mixins/dto/Dto_downloadXml.html   | 15 ++++------
 .../applib/index/mixins/dto/Dto_downloadXsd.html   | 15 ++++------
 .../index/mixins/dto/hooks/Dto_see-also.html       | 15 ++++------
 .../index/mixins/layout/Object_downloadLayout.html | 15 ++++------
 .../hooks/Object_downloadLayout_see-also.html      | 15 ++++------
 .../metamodel/Object_downloadMetamodelXml.html     | 15 ++++------
 .../mixins/metamodel/Object_logicalTypeName.html   | 15 ++++------
 .../mixins/metamodel/Object_objectIdentifier.html  | 15 ++++------
 .../mixins/metamodel/Object_rebuildMetamodel.html  | 15 ++++------
 .../hooks/Object_rebuildMetamodel_see-also.html    | 15 ++++------
 .../index/mixins/rest/Object_openRestApi.html      | 15 ++++------
 .../rest/hooks/Object_openRestApi_see-also.html    | 15 ++++------
 .../applib/index/mixins/security/HasUsername.html  | 15 ++++------
 .../index/mixins/system/DomainChangeRecord.html    | 15 ++++------
 .../system/DomainChangeRecord_ChangeType.html      | 15 ++++------
 .../index/mixins/system/HasInteractionId.html      | 15 ++++------
 .../mixins/system/HasInteractionIdAndSequence.html | 15 ++++------
 .../mixins/system/HasTarget_openTargetObject.html  | 15 ++++------
 .../system/hooks/HasInteractionId_see-also.html    | 15 ++++------
 .../applib/index/mixins/updates/OnUpdatedAt.html   | 15 ++++------
 .../applib/index/mixins/updates/OnUpdatedBy.html   | 15 ++++------
 .../index/mixins/updates/OnUpdatedByAndAt.html     | 15 ++++------
 .../updates/hooks/WithUpdatedAt_usage-notes.html   | 15 ++++------
 .../hooks/WithUpdatedByAndAt_usage-notes.html      | 15 ++++------
 .../updates/hooks/WithUpdatedBy_usage-notes.html   | 15 ++++------
 .../applib/index/query/AllInstancesQuery.html      | 15 ++++------
 .../applib/index/query/NamedQuery.html             | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/query/Query.html   | 15 ++++------
 .../applib/index/query/QueryRange.html             | 15 ++++------
 .../services/acceptheader/AcceptHeaderService.html | 15 ++++------
 .../AcceptHeaderService_010-implementation.html    | 15 ++++------
 ...AcceptHeaderService_020-examples-and-usage.html | 15 ++++------
 .../index/services/appfeat/ApplicationFeature.html | 15 ++++------
 .../services/appfeat/ApplicationFeatureId.html     | 15 ++++------
 .../appfeat/ApplicationFeatureRepository.html      | 15 ++++------
 .../services/appfeat/ApplicationFeatureSort.html   | 15 ++++------
 .../services/appfeat/ApplicationMemberSort.html    | 15 ++++------
 ...cationFeatureRepository_010-implementation.html | 15 ++++------
 ...onFeatureRepository_020-examples-and-usage.html | 15 ++++------
 .../services/appfeatui/ApplicationFeatureMenu.html | 15 ++++------
 .../appfeatui/ApplicationFeatureViewModel.html     | 15 ++++------
 .../services/appfeatui/ApplicationNamespace.html   | 15 ++++------
 .../index/services/appfeatui/ApplicationType.html  | 15 ++++------
 .../services/appfeatui/ApplicationTypeAction.html  | 15 ++++------
 .../appfeatui/ApplicationTypeCollection.html       | 15 ++++------
 .../services/appfeatui/ApplicationTypeMember.html  | 15 ++++------
 .../appfeatui/ApplicationTypeProperty.html         | 15 ++++------
 .../applib/index/services/bookmark/Bookmark.html   | 15 ++++------
 .../index/services/bookmark/BookmarkHolder.html    | 15 ++++------
 .../services/bookmark/BookmarkHolder_lookup.html   | 15 ++++------
 .../services/bookmark/BookmarkHolder_object.html   | 15 ++++------
 .../index/services/bookmark/BookmarkService.html   | 15 ++++------
 .../applib/index/services/bookmark/HasTarget.html  | 15 ++++------
 .../index/services/bookmark/IdStringifier.html     | 15 ++++------
 .../applib/index/services/bookmark/Oid.html        | 15 ++++------
 .../hooks/BookmarkService_010-implementation.html  | 15 ++++------
 .../BookmarkService_020-examples-and-usage.html    | 15 ++++------
 .../services/bookmarkui/BookmarkUiService.html     | 15 ++++------
 .../BookmarkUiService_010-implementation.html      | 15 ++++------
 .../BookmarkUiService_020-examples-and-usage.html  | 15 ++++------
 .../applib/index/services/clock/ClockService.html  | 15 ++++------
 .../hooks/ClockService_010-implementation.html     | 15 ++++------
 .../hooks/ClockService_020-examples-and-usage.html | 15 ++++------
 .../applib/index/services/command/Command.html     | 15 ++++------
 .../services/command/CommandExecutorService.html   | 15 ++++------
 ...ndExecutorService_InteractionContextPolicy.html | 15 ++++------
 .../services/command/CommandOutcomeHandler.html    | 15 ++++------
 .../CommandExecutorService_010-implementation.html | 15 ++++------
 ...mandExecutorService_020-examples-and-usage.html | 15 ++++------
 .../index/services/commanddto/HasCommandDto.html   | 15 ++++------
 .../conmap/ContentMappingServiceForCommandDto.html | 15 ++++------
 .../ContentMappingServiceForCommandsDto.html       | 15 ++++------
 .../services/commanddto/conmap/UserDataKeys.html   | 15 ++++------
 .../commanddto/processor/CommandDtoProcessor.html  | 15 ++++------
 .../CommandDtoProcessorForActionAbstract.html      | 15 ++++------
 .../CommandDtoProcessorForPropertyAbstract.html    | 15 ++++------
 ...mandDtoProcessorService_010-implementation.html | 15 ++++------
 ...DtoProcessorService_020-examples-and-usage.html | 15 ++++------
 .../processor/spi/CommandDtoProcessorService.html  | 15 ++++------
 .../spi/CommandDtoProcessorServiceIdentity.html    | 15 ++++------
 .../index/services/confview/ConfigurationMenu.html | 15 ++++------
 .../services/confview/ConfigurationProperty.html   | 15 ++++------
 .../confview/ConfigurationViewService.html         | 15 ++++------
 .../services/confview/ConfigurationViewmodel.html  | 15 ++++------
 .../ConfigurationMenu_010-implementation.html      | 15 ++++------
 .../ConfigurationMenu_020-examples-and-usage.html  | 15 ++++------
 ...onfigurationViewService_010-implementation.html | 15 ++++------
 ...gurationViewService_020-examples-and-usage.html | 15 ++++------
 .../services/conmap/ContentMappingService.html     | 15 ++++------
 .../ContentMappingService_010-implementation.html  | 15 ++++------
 ...ntentMappingService_020-examples-and-usage.html | 15 ++++------
 .../applib/index/services/email/EmailService.html  | 15 ++++------
 .../hooks/EmailService_010-implementation.html     | 15 ++++------
 .../hooks/EmailService_020-examples-and-usage.html | 15 ++++------
 .../applib/index/services/error/ErrorDetails.html  | 15 ++++------
 .../services/error/ErrorReportingService.html      | 15 ++++------
 .../applib/index/services/error/SimpleTicket.html  | 15 ++++------
 .../applib/index/services/error/Ticket.html        | 15 ++++------
 .../ErrorReportingService_010-implementation.html  | 15 ++++------
 ...rorReportingService_020-examples-and-usage.html | 15 ++++------
 .../index/services/eventbus/EventBusService.html   | 15 ++++------
 .../hooks/EventBusService_010-implementation.html  | 15 ++++------
 .../EventBusService_020-examples-and-usage.html    | 15 ++++------
 .../applib/index/services/exceprecog/Category.html | 15 ++++------
 .../services/exceprecog/ExceptionRecognizer.html   | 15 ++++------
 .../exceprecog/ExceptionRecognizerAbstract.html    | 15 ++++------
 .../exceprecog/ExceptionRecognizerForType.html     | 15 ++++------
 .../exceprecog/ExceptionRecognizerService.html     | 15 ++++------
 .../index/services/exceprecog/Recognition.html     | 15 ++++------
 .../index/services/exceprecog/RootCauseFinder.html | 15 ++++------
 ...eptionRecognizerService_010-implementation.html | 15 ++++------
 ...onRecognizerService_020-examples-and-usage.html | 15 ++++------
 .../ExceptionRecognizer_010-implementation.html    | 15 ++++------
 ...ExceptionRecognizer_020-examples-and-usage.html | 15 ++++------
 .../index/services/factory/FactoryService.html     | 15 ++++------
 .../hooks/FactoryService_010-implementation.html   | 15 ++++------
 .../FactoryService_020-examples-and-usage.html     | 15 ++++------
 .../index/services/grid/GridLoaderService.html     | 15 ++++------
 .../index/services/grid/GridMarshallerService.html | 15 ++++------
 .../applib/index/services/grid/GridService.html    | 15 ++++------
 .../index/services/grid/GridSystemService.html     | 15 ++++------
 .../GridLoaderService_010-implementation.html      | 15 ++++------
 .../GridLoaderService_020-examples-and-usage.html  | 15 ++++------
 .../grid/hooks/GridService_010-implementation.html | 15 ++++------
 .../hooks/GridService_020-examples-and-usage.html  | 15 ++++------
 .../GridSystemService_010-implementation.html      | 15 ++++------
 .../GridSystemService_020-examples-and-usage.html  | 15 ++++------
 .../applib/index/services/health/Health.html       | 15 ++++------
 .../index/services/health/HealthCheckService.html  | 15 ++++------
 .../HealthCheckService_010-implementation.html     | 15 ++++------
 .../HealthCheckService_020-examples-and-usage.html | 15 ++++------
 .../applib/index/services/hint/HintIdProvider.html | 15 ++++------
 .../applib/index/services/hint/HintStore.html      | 15 ++++------
 .../hooks/HintIdProvider_010-implementation.html   | 15 ++++------
 .../HintIdProvider_020-examples-and-usage.html     | 15 ++++------
 .../hint/hooks/HintStore_010-implementation.html   | 15 ++++------
 .../hooks/HintStore_020-examples-and-usage.html    | 15 ++++------
 .../services/homepage/HomePageResolverService.html | 15 ++++------
 ...HomePageResolverService_010-implementation.html | 15 ++++------
 ...PageResolverService_020-examples-and-usage.html | 15 ++++------
 .../index/services/i18n/HasTranslationContext.html | 15 ++++------
 .../index/services/i18n/LanguageProvider.html      | 15 ++++------
 .../applib/index/services/i18n/Mode.html           | 15 ++++------
 .../index/services/i18n/TranslatableString.html    | 15 ++++------
 .../index/services/i18n/TranslationContext.html    | 15 ++++------
 .../index/services/i18n/TranslationService.html    | 15 ++++------
 .../index/services/i18n/TranslationsResolver.html  | 15 ++++------
 .../hooks/LocaleProvider_010-implementation.html   | 15 ++++------
 .../LocaleProvider_020-examples-and-usage.html     | 15 ++++------
 .../TranslationService_010-implementation.html     | 15 ++++------
 .../TranslationService_020-examples-and-usage.html | 15 ++++------
 .../TranslationsResolver_010-implementation.html   | 15 ++++------
 ...ranslationsResolver_020-examples-and-usage.html | 15 ++++------
 .../index/services/iactn/ActionInvocation.html     | 15 ++++------
 .../applib/index/services/iactn/Execution.html     | 15 ++++------
 .../applib/index/services/iactn/Interaction.html   | 15 ++++------
 .../index/services/iactn/InteractionProvider.html  | 15 ++++------
 .../applib/index/services/iactn/PropertyEdit.html  | 15 ++++------
 .../iactn/hooks/Execution_010-implementation.html  | 15 ++++------
 .../hooks/Execution_020-examples-and-usage.html    | 15 ++++------
 .../InteractionContext_010-implementation.html     | 15 ++++------
 .../InteractionContext_020-examples-and-usage.html | 15 ++++------
 .../hooks/Interaction_010-implementation.html      | 15 ++++------
 .../hooks/Interaction_020-examples-and-usage.html  | 15 ++++------
 .../services/iactnlayer/InteractionContext.html    | 15 ++++------
 .../services/iactnlayer/InteractionLayer.html      | 15 ++++------
 .../iactnlayer/InteractionLayerTracker.html        | 15 ++++------
 .../services/iactnlayer/InteractionService.html    | 15 ++++------
 .../index/services/inject/ServiceInjector.html     | 15 ++++------
 .../hooks/ServiceInjector_010-implementation.html  | 15 ++++------
 .../ServiceInjector_020-examples-and-usage.html    | 15 ++++------
 .../index/services/jaxb/CausewaySchemas.html       | 15 ++++------
 .../applib/index/services/jaxb/JaxbService.html    | 15 ++++------
 .../jaxb/hooks/JaxbService_010-implementation.html | 15 ++++------
 .../hooks/JaxbService_020-examples-and-usage.html  | 15 ++++------
 .../keyvaluestore/KeyValueSessionStore.html        | 15 ++++------
 .../index/services/layout/LayoutExportStyle.html   | 15 ++++------
 .../index/services/layout/LayoutService.html       | 15 ++++------
 .../index/services/layout/LayoutServiceMenu.html   | 15 ++++------
 .../LayoutServiceMenu_010-implementation.html      | 15 ++++------
 .../LayoutServiceMenu_020-examples-and-usage.html  | 15 ++++------
 .../hooks/LayoutService_010-implementation.html    | 15 ++++------
 .../LayoutService_020-examples-and-usage.html      | 15 ++++------
 .../index/services/linking/DeepLinkService.html    | 15 ++++------
 .../hooks/DeepLinkService_010-implementation.html  | 15 ++++------
 .../DeepLinkService_020-examples-and-usage.html    | 15 ++++------
 .../services/locale/LocaleChoiceProvider.html      | 15 ++++------
 .../index/services/marshal/MarshallerService.html  | 15 ++++------
 .../index/services/menu/MenuBarsLoaderService.html | 15 ++++------
 .../services/menu/MenuBarsMarshallerService.html   | 15 ++++------
 .../index/services/menu/MenuBarsService.html       | 15 ++++------
 .../MenuBarsLoaderService_010-implementation.html  | 15 ++++------
 ...nuBarsLoaderService_020-examples-and-usage.html | 15 ++++------
 .../hooks/MenuBarsService_010-implementation.html  | 15 ++++------
 .../MenuBarsService_020-examples-and-usage.html    | 15 ++++------
 .../index/services/message/MessageService.html     | 15 ++++------
 .../hooks/MessageService_010-implementation.html   | 15 ++++------
 .../MessageService_020-examples-and-usage.html     | 15 ++++------
 .../applib/index/services/metamodel/BeanSort.html  | 15 ++++------
 .../applib/index/services/metamodel/Config.html    | 15 ++++------
 .../index/services/metamodel/DomainMember.html     | 15 ++++------
 .../index/services/metamodel/DomainModel.html      | 15 ++++------
 .../index/services/metamodel/MetaModelService.html | 15 ++++------
 .../services/metamodel/MetaModelServiceMenu.html   | 15 ++++------
 .../MetaModelServiceMenu_010-implementation.html   | 15 ++++------
 ...etaModelServiceMenu_020-examples-and-usage.html | 15 ++++------
 .../hooks/MetaModelService_010-implementation.html | 15 ++++------
 .../MetaModelService_020-examples-and-usage.html   | 15 ++++------
 .../index/services/metrics/MetricsService.html     | 15 ++++------
 .../hooks/MetricsService_010-implementation.html   | 15 ++++------
 .../MetricsService_020-examples-and-usage.html     | 15 ++++------
 .../placeholder/PlaceholderRenderService.html      | 15 ++++------
 .../services/publishing/log/CommandLogger.html     | 15 ++++------
 .../publishing/log/EntityChangesLogger.html        | 15 ++++------
 .../publishing/log/EntityPropertyChangeLogger.html | 15 ++++------
 .../services/publishing/log/ExecutionLogger.html   | 15 ++++------
 .../services/publishing/log/PageRenderLogger.html  | 15 ++++------
 .../services/publishing/spi/CommandSubscriber.html | 15 ++++------
 .../services/publishing/spi/EntityChanges.html     | 15 ++++------
 .../publishing/spi/EntityChangesSubscriber.html    | 15 ++++------
 .../publishing/spi/EntityPropertyChange.html       | 15 ++++------
 .../spi/EntityPropertyChangeSubscriber.html        | 15 ++++------
 .../publishing/spi/ExecutionSubscriber.html        | 15 ++++------
 .../publishing/spi/PageRenderSubscriber.html       | 15 ++++------
 .../CommandSubscriber_010-implementation.html      | 15 ++++------
 .../CommandSubscriber_020-examples-and-usage.html  | 15 ++++------
 ...EntityChangesSubscriber_010-implementation.html | 15 ++++------
 ...tyChangesSubscriber_020-examples-and-usage.html | 15 ++++------
 ...ropertyChangeSubscriber_010-implementation.html | 15 ++++------
 ...rtyChangeSubscriber_020-examples-and-usage.html | 15 ++++------
 .../ExecutionSubscriber_010-implementation.html    | 15 ++++------
 ...ExecutionSubscriber_020-examples-and-usage.html | 15 ++++------
 .../queryresultscache/MethodReferences.html        | 15 ++++------
 .../queryresultscache/QueryResultsCache.html       | 15 ++++------
 .../QueryResultsCacheControl.html                  | 15 ++++------
 ...ueryResultsCacheControl_010-implementation.html | 15 ++++------
 ...ResultsCacheControl_020-examples-and-usage.html | 15 ++++------
 .../QueryResultsCache_010-implementation.html      | 15 ++++------
 .../QueryResultsCache_020-examples-and-usage.html  | 15 ++++------
 .../registry/InstanceByPriorityComparator.html     | 15 ++++------
 .../index/services/registry/ServiceRegistry.html   | 15 ++++------
 .../hooks/ServiceRegistry_010-implementation.html  | 15 ++++------
 .../ServiceRegistry_020-examples-and-usage.html    | 15 ++++------
 .../index/services/repository/EntityState.html     | 15 ++++------
 .../services/repository/RepositoryService.html     | 15 ++++------
 .../RepositoryService_010-implementation.html      | 15 ++++------
 .../RepositoryService_020-examples-and-usage.html  | 15 ++++------
 .../index/services/routing/RoutingService.html     | 15 ++++------
 .../hooks/RoutingService_010-implementation.html   | 15 ++++------
 .../RoutingService_020-examples-and-usage.html     | 15 ++++------
 .../index/services/scratchpad/Scratchpad.html      | 15 ++++------
 .../hooks/Scratchpad_010-implementation.html       | 15 ++++------
 .../hooks/Scratchpad_020-examples-and-usage.html   | 15 ++++------
 .../index/services/session/SessionLogger.html      | 15 ++++------
 .../index/services/session/SessionSubscriber.html  | 15 ++++------
 .../SessionLoggingService_010-implementation.html  | 15 ++++------
 ...ssionLoggingService_020-examples-and-usage.html | 15 ++++------
 .../index/services/sitemap/SitemapService.html     | 15 ++++------
 .../index/services/sitemap/SitemapServiceMenu.html | 15 ++++------
 .../applib/index/services/sudo/SudoService.html    | 15 ++++------
 .../SudoServiceListener_010-implementation.html    | 15 ++++------
 ...SudoServiceListener_020-examples-and-usage.html | 15 ++++------
 .../sudo/hooks/SudoService_010-implementation.html | 15 ++++------
 .../hooks/SudoService_020-examples-and-usage.html  | 15 ++++------
 .../applib/index/services/swagger/Format.html      | 15 ++++------
 .../index/services/swagger/SwaggerService.html     | 15 ++++------
 .../applib/index/services/swagger/Visibility.html  | 15 ++++------
 .../hooks/SwaggerService_010-implementation.html   | 15 ++++------
 .../SwaggerService_020-examples-and-usage.html     | 15 ++++------
 .../TableColumnOrderForCollectionTypeAbstract.html | 15 ++++------
 .../services/tablecol/TableColumnOrderService.html | 15 ++++------
 .../tablecol/TableColumnVisibilityService.html     | 15 ++++------
 ...TableColumnOrderService_010-implementation.html | 15 ++++------
 ...eColumnOrderService_020-examples-and-usage.html | 15 ++++------
 .../applib/index/services/title/TitleService.html  | 15 ++++------
 .../hooks/TitleService_010-implementation.html     | 15 ++++------
 .../hooks/TitleService_020-examples-and-usage.html | 15 ++++------
 .../services/urlencoding/UrlEncodingService.html   | 15 ++++------
 .../UrlEncodingService_010-implementation.html     | 15 ++++------
 .../UrlEncodingService_020-examples-and-usage.html | 15 ++++------
 .../index/services/user/ImpersonateMenu.html       | 15 ++++------
 .../services/user/ImpersonateMenuAdvisor.html      | 15 ++++------
 .../index/services/user/ImpersonateStopMenu.html   | 15 ++++------
 .../services/user/ImpersonatedUserHolder.html      | 15 ++++------
 .../applib/index/services/user/RoleMemento.html    | 15 ++++------
 .../user/UserCurrentSessionTimeZoneHolder.html     | 15 ++++------
 .../applib/index/services/user/UserMemento.html    | 15 ++++------
 .../applib/index/services/user/UserService.html    | 15 ++++------
 .../user/hooks/UserService_010-implementation.html | 15 ++++------
 .../hooks/UserService_020-examples-and-usage.html  | 15 ++++------
 .../services/userreg/EmailNotificationService.html | 15 ++++------
 .../applib/index/services/userreg/UserDetails.html | 15 ++++------
 .../services/userreg/UserRegistrationService.html  | 15 ++++------
 .../userreg/events/EmailEventAbstract.html         | 15 ++++------
 .../userreg/events/EmailRegistrationEvent.html     | 15 ++++------
 .../userreg/events/PasswordResetEvent.html         | 15 ++++------
 ...mailNotificationService_010-implementation.html | 15 ++++------
 ...NotificationService_020-examples-and-usage.html | 15 ++++------
 ...UserRegistrationService_010-implementation.html | 15 ++++------
 ...RegistrationService_020-examples-and-usage.html | 15 ++++------
 .../applib/index/services/userui/UserMenu.html     | 15 ++++------
 .../index/services/wrapper/DisabledException.html  | 15 ++++------
 .../index/services/wrapper/HiddenException.html    | 15 ++++------
 .../index/services/wrapper/InvalidException.html   | 15 ++++------
 .../index/services/wrapper/WrapperFactory.html     | 15 ++++------
 .../index/services/wrapper/WrappingObject.html     | 15 ++++------
 .../services/wrapper/callable/AsyncCallable.html   | 15 ++++------
 .../services/wrapper/control/AsyncControl.html     | 15 ++++------
 .../services/wrapper/control/ControlAbstract.html  | 15 ++++------
 .../services/wrapper/control/ExceptionHandler.html | 15 ++++------
 .../wrapper/control/ExceptionHandlerAbstract.html  | 15 ++++------
 .../services/wrapper/control/ExecutionMode.html    | 15 ++++------
 .../services/wrapper/control/SyncControl.html      | 15 ++++------
 .../index/services/wrapper/events/AccessEvent.html | 15 ++++------
 .../wrapper/events/ActionArgumentEvent.html        | 15 ++++------
 .../wrapper/events/ActionInvocationEvent.html      | 15 ++++------
 .../wrapper/events/ActionUsabilityEvent.html       | 15 ++++------
 .../wrapper/events/ActionVisibilityEvent.html      | 15 ++++------
 .../wrapper/events/CollectionAccessEvent.html      | 15 ++++------
 .../wrapper/events/CollectionMethodEvent.html      | 15 ++++------
 .../wrapper/events/CollectionUsabilityEvent.html   | 15 ++++------
 .../wrapper/events/CollectionVisibilityEvent.html  | 15 ++++------
 .../services/wrapper/events/InteractionEvent.html  | 15 ++++------
 .../services/wrapper/events/ObjectTitleEvent.html  | 15 ++++------
 .../wrapper/events/ObjectValidityEvent.html        | 15 ++++------
 .../wrapper/events/ObjectVisibilityEvent.html      | 15 ++++------
 .../services/wrapper/events/ParseValueEvent.html   | 15 ++++------
 .../wrapper/events/PropertyAccessEvent.html        | 15 ++++------
 .../wrapper/events/PropertyModifyEvent.html        | 15 ++++------
 .../wrapper/events/PropertyUsabilityEvent.html     | 15 ++++------
 .../wrapper/events/PropertyVisibilityEvent.html    | 15 ++++------
 .../wrapper/events/ProposedHolderEvent.html        | 15 ++++------
 .../services/wrapper/events/UsabilityEvent.html    | 15 ++++------
 .../services/wrapper/events/ValidityEvent.html     | 15 ++++------
 .../services/wrapper/events/VisibilityEvent.html   | 15 ++++------
 .../hooks/WrapperFactory_010-implementation.html   | 15 ++++------
 .../WrapperFactory_020-examples-and-usage.html     | 15 ++++------
 .../wrapper/listeners/InteractionAdapter.html      | 15 ++++------
 .../wrapper/listeners/InteractionListener.html     | 15 ++++------
 .../applib/index/services/xactn/TransactionId.html | 15 ++++------
 .../index/services/xactn/TransactionService.html   | 15 ++++------
 .../index/services/xactn/TransactionState.html     | 15 ++++------
 .../services/xactn/TransactionalProcessor.html     | 15 ++++------
 .../TransactionService_010-implementation.html     | 15 ++++------
 .../TransactionService_020-examples-and-usage.html | 15 ++++------
 .../TransactionalProcessor_010-implementation.html | 15 ++++------
 ...nsactionalProcessor_020-examples-and-usage.html | 15 ++++------
 .../applib/index/services/xml/XmlService.html      | 15 ++++------
 .../xml/hooks/XmlService_010-implementation.html   | 15 ++++------
 .../hooks/XmlService_020-examples-and-usage.html   | 15 ++++------
 .../services/xmlsnapshot/XmlSnapshotService.html   | 15 ++++------
 .../xmlsnapshot/XmlSnapshotService_Snapshot.html   | 15 ++++------
 .../XmlSnapshotService_Snapshot_Builder.html       | 15 ++++------
 .../XmlSnapshotService_010-implementation.html     | 15 ++++------
 .../XmlSnapshotService_020-examples-and-usage.html | 15 ++++------
 .../snapshot/SnapshottableWithInclusions.html      | 15 ++++------
 .../applib/index/spec/AbstractSpecification.html   | 15 ++++------
 .../applib/index/spec/AbstractSpecification2.html  | 15 ++++------
 .../applib/index/spec/Specification.html           | 15 ++++------
 .../applib/index/spec/Specification2.html          | 15 ++++------
 .../applib/index/spec/SpecificationAnd.html        | 15 ++++------
 .../applib/index/spec/SpecificationNot.html        | 15 ++++------
 .../applib/index/spec/SpecificationOr.html         | 15 ++++------
 .../applib/index/types/DescriptionType.html        | 15 ++++------
 .../applib/index/types/MemberIdentifierType.html   | 15 ++++------
 .../applib/index/types/TargetActionType.html       | 15 ++++------
 .../applib/index/types/TargetClassType.html        | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/util/Enums.html    | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/util/Equality.html | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/util/Hashing.html  | 15 ++++------
 .../applib/index/util/ObjectContracts.html         | 26 +++++------------
 .../applib/index/util/ReasonBuffer.html            | 15 ++++------
 .../applib/index/util/ReasonBuffer2.html           | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/util/Reasons.html  | 15 ++++------
 .../applib/index/util/TitleBuffer.html             | 15 ++++------
 .../applib/index/util/TitleBufferException.html    | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/util/ToString.html | 15 ++++------
 .../applib/index/util/hooks/Enums_examples.html    | 15 ++++------
 .../hooks/ObjectContracts_examples-and-usage.html  | 26 +++++------------
 .../applib/index/util/schema/ChangesDtoUtils.html  | 15 ++++------
 .../applib/index/util/schema/CommandDtoUtils.html  | 15 ++++------
 .../applib/index/util/schema/CommonDtoUtils.html   | 15 ++++------
 .../index/util/schema/InteractionDtoUtils.html     | 15 ++++------
 .../index/util/schema/InteractionsDtoUtils.html    | 15 ++++------
 .../index/util/schema/MemberExecutionDtoUtils.html | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/value/Blob.html    | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/value/Clob.html    | 15 ++++------
 .../applib/index/value/LocalResourcePath.html      | 15 ++++------
 .../2.0.0-SNAPSHOT/applib/index/value/Markup.html  | 15 ++++------
 .../applib/index/value/NamedWithMimeType.html      | 15 ++++------
 .../applib/index/value/OpenUrlStrategy.html        | 15 ++++------
 .../applib/index/value/Password.html               | 15 ++++------
 .../applib/index/value/hooks/Blob_usage-notes.html | 15 ++++------
 .../applib/index/value/hooks/Clob_usage-notes.html | 15 ++++------
 .../applib/index/value/semantics/Converter.html    | 15 ++++------
 .../index/value/semantics/DefaultsProvider.html    | 15 ++++------
 .../index/value/semantics/OrderRelation.html       | 15 ++++------
 .../applib/index/value/semantics/Parser.html       | 15 ++++------
 .../index/value/semantics/ParsingException.html    | 15 ++++------
 .../applib/index/value/semantics/Renderer.html     | 15 ++++------
 .../value/semantics/ValueSemanticsAbstract.html    | 15 ++++------
 .../value/semantics/ValueSemanticsProvider.html    | 15 ++++------
 .../value/semantics/ValueSemanticsResolver.html    | 15 ++++------
 .../commons/index/collections/Can.html             | 15 ++++------
 .../commons/index/collections/Cardinality.html     | 15 ++++------
 .../commons/index/functional/Either.html           | 15 ++++------
 .../commons/index/functional/Railway.html          | 15 ++++------
 .../commons/index/functional/ThrowingConsumer.html | 15 ++++------
 .../commons/index/functional/ThrowingRunnable.html | 15 ++++------
 .../commons/index/functional/ThrowingSupplier.html | 15 ++++------
 .../commons/index/functional/Try.html              | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/DataPeer.html  | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/DataSink.html  | 15 ++++------
 .../commons/index/io/DataSource.html               | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/FileUtils.html | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/HashUtils.html | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/JaxbUtils.html | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/JsonUtils.html | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/YamlUtils.html | 15 ++++------
 .../2.0.0-SNAPSHOT/commons/index/io/ZipUtils.html  | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/config/about.html  | 15 ++++------
 .../application-specific/application-css.html      | 15 ++++------
 .../config/section-hooks/Other~post.html           | 15 ++++------
 .../config/section-hooks/Other~pre.html            | 15 ++++------
 .../config/section-hooks/causeway.applib~post.html | 15 ++++------
 .../config/section-hooks/causeway.applib~pre.html  | 15 ++++------
 .../section-hooks/causeway.core.config~post.html   | 15 ++++------
 .../section-hooks/causeway.core.config~pre.html    | 15 ++++------
 ...causeway.core.meta-model.introspector~post.html | 15 ++++------
 .../causeway.core.meta-model.introspector~pre.html | 15 ++++------
 .../causeway.core.meta-model.validator~post.html   | 15 ++++------
 .../causeway.core.meta-model.validator~pre.html    | 15 ++++------
 .../causeway.core.meta-model~post.html             | 15 ++++------
 .../causeway.core.meta-model~pre.html              | 15 ++++------
 .../causeway.core.runtime-services~post.html       | 15 ++++------
 .../causeway.core.runtime-services~pre.html        | 15 ++++------
 .../section-hooks/causeway.core.runtime~post.html  | 15 ++++------
 .../section-hooks/causeway.core.runtime~pre.html   | 15 ++++------
 .../section-hooks/causeway.extensions~post.html    | 15 ++++------
 .../section-hooks/causeway.extensions~pre.html     | 15 ++++------
 .../section-hooks/causeway.incubator~post.html     | 15 ++++------
 .../section-hooks/causeway.incubator~pre.html      | 15 ++++------
 .../config/section-hooks/causeway.legacy~post.html | 15 ++++------
 .../config/section-hooks/causeway.legacy~pre.html  | 15 ++++------
 .../section-hooks/causeway.mappings~post.html      | 15 ++++------
 .../section-hooks/causeway.mappings~pre.html       | 15 ++++------
 .../causeway.persistence.schema~post.html          | 15 ++++------
 .../causeway.persistence.schema~pre.html           | 15 ++++------
 .../causeway.security.keycloak~post.html           | 15 ++++------
 .../causeway.security.keycloak~pre.html            | 15 ++++------
 .../causeway.security.shiro~post.html              | 15 ++++------
 .../section-hooks/causeway.security.shiro~pre.html | 15 ++++------
 .../causeway.security.spring~post.html             | 15 ++++------
 .../causeway.security.spring~pre.html              | 15 ++++------
 .../section-hooks/causeway.subdomains~post.html    | 15 ++++------
 .../section-hooks/causeway.subdomains~pre.html     | 15 ++++------
 .../section-hooks/causeway.testing~post.html       | 15 ++++------
 .../config/section-hooks/causeway.testing~pre.html | 15 ++++------
 .../section-hooks/causeway.value-types~post.html   | 15 ++++------
 .../section-hooks/causeway.value-types~pre.html    | 15 ++++------
 .../section-hooks/causeway.viewer.common~post.html | 15 ++++------
 .../section-hooks/causeway.viewer.common~pre.html  | 15 ++++------
 .../causeway.viewer.restfulobjects~post.html       | 15 ++++------
 .../causeway.viewer.restfulobjects~pre.html        | 15 ++++------
 .../section-hooks/causeway.viewer.wicket~post.html | 15 ++++------
 .../section-hooks/causeway.viewer.wicket~pre.html  | 15 ++++------
 .../config/section-hooks/datanucleus~post.html     | 15 ++++------
 .../config/section-hooks/datanucleus~pre.html      | 15 ++++------
 .../config/section-hooks/eclipselink~post.html     | 15 ++++------
 .../config/section-hooks/eclipselink~pre.html      | 15 ++++------
 .../config/section-hooks/resteasy~post.html        | 15 ++++------
 .../config/section-hooks/resteasy~pre.html         | 15 ++++------
 .../config/section-hooks/spring~post.html          | 15 ++++------
 .../config/section-hooks/spring~pre.html           | 15 ++++------
 .../2.0.0-SNAPSHOT/config/sections/Other.html      | 15 ++++------
 .../config/sections/causeway.applib.html           | 15 ++++------
 .../config/sections/causeway.core.config.html      | 15 ++++------
 .../config/sections/causeway.core.meta-model.html  | 15 ++++------
 .../causeway.core.meta-model.introspector.html     | 15 ++++------
 .../causeway.core.meta-model.validator.html        | 15 ++++------
 .../sections/causeway.core.runtime-services.html   | 15 ++++------
 .../config/sections/causeway.core.runtime.html     | 15 ++++------
 .../config/sections/causeway.extensions.html       | 15 ++++------
 .../config/sections/causeway.legacy.html           | 15 ++++------
 .../sections/causeway.persistence.schema.html      | 15 ++++------
 .../sections/causeway.security.keycloak.html       | 15 ++++------
 .../config/sections/causeway.security.shiro.html   | 15 ++++------
 .../config/sections/causeway.security.spring.html  | 15 ++++------
 .../config/sections/causeway.testing.html          | 15 ++++------
 .../config/sections/causeway.value-types.html      | 15 ++++------
 .../config/sections/causeway.viewer.common.html    | 15 ++++------
 .../sections/causeway.viewer.restfulobjects.html   | 15 ++++------
 .../config/sections/causeway.viewer.wicket.html    | 15 ++++------
 .../config/sections/datanucleus.html               | 15 ++++------
 .../config/sections/eclipselink.html               | 15 ++++------
 .../2.0.0-SNAPSHOT/config/sections/resteasy.html   | 15 ++++------
 .../DataSourceIntrospectionService.html            | 15 ++++------
 .../core/index/metamodel/object/ManagedObject.html | 15 ++++------
 .../services/command/CommandDtoFactory.html        | 15 ++++------
 .../services/ixn/InteractionDtoFactory.html        | 15 ++++------
 .../services/metamodel/MetaModelAnnotator.html     | 15 ++++------
 .../services/publishing/CommandPublisher.html      | 15 ++++------
 .../services/publishing/ExecutionPublisher.html    | 15 ++++------
 .../services/schema/SchemaValueMarshaller.html     | 15 ++++------
 .../tablecol/TableColumnOrderServiceDefault.html   | 15 ++++------
 .../TableColumnOrderServiceUsingTxtFile.html       | 15 ++++------
 .../publish/LifecycleCallbackNotifier.html         | 15 ++++------
 .../publish/ObjectLifecyclePublisherDefault.html   | 15 ++++------
 .../runtimeservices/spring/BeanDescriptor.html     | 15 ++++------
 .../index/runtimeservices/spring/ContextBeans.html | 15 ++++------
 .../runtimeservices/spring/SpringBeansService.html | 15 ++++------
 .../transaction/TransactionServiceSpring.html      | 15 ++++------
 .../UrlEncodingServiceWithCompression.html         | 15 ++++------
 .../runtimeservices/xml/XmlServiceDefault.html     | 15 ++++------
 .../authentication/AuthenticationRequest.html      | 15 ++++------
 .../security/authentication/Authenticator.html     | 15 ++++------
 .../index/security/authorization/Authorizor.html   | 15 ++++------
 .../manager/AuthorizationManager.html              | 15 ++++------
 .../authorization/manager/AuthorizorChooser.html   | 15 ++++------
 .../changetracking/EntityChangeTracker.html        | 15 ++++------
 .../changetracking/EntityChangesPublisher.html     | 15 ++++------
 .../EntityPropertyChangePublisher.html             | 15 ++++------
 .../events/TransactionAfterCompletionEvent.html    | 15 ++++------
 .../KeyValueStoreUsingHttpSession.html             | 15 ++++------
 .../audittrail/applib/app/AuditTrailMenu.html      | 15 ++++------
 .../HasInteractionId_auditTrailEntries.html        | 15 ++++------
 .../Object_recentAuditTrailEntries.html            | 15 ++++------
 .../audittrail/applib/dom/AuditTrailEntry.html     | 15 ++++------
 .../applib/dom/AuditTrailEntryRepository.html      | 15 ++++------
 ...ntityPropertyChangeSubscriberForAuditTrail.html | 15 ++++------
 .../commandlog/applib/app/CommandLogMenu.html      | 15 ++++------
 .../HasInteractionId_commandLogEntry.html          | 15 ++++------
 .../HasUsername_recentCommandsByUser.html          | 15 ++++------
 .../contributions/Object_recentCommands.html       | 15 ++++------
 .../contributions/T_recentBackgroundCommands.html  | 15 ++++------
 .../commandlog/applib/dom/BackgroundService.html   | 15 ++++------
 ...roundService_PersistCommandExecutorService.html | 15 ++++------
 .../commandlog/applib/dom/CommandLogEntry.html     | 15 ++++------
 .../applib/dom/CommandLogEntryRepository.html      | 15 ++++------
 .../index/commandlog/applib/dom/ExecuteIn.html     | 15 ++++------
 .../index/commandlog/applib/dom/ReplayState.html   | 15 ++++------
 .../dom/mixins/CommandLogEntry_childCommands.html  | 15 ++++------
 .../mixins/CommandLogEntry_openResultObject.html   | 15 ++++------
 .../mixins/CommandLogEntry_siblingCommands.html    | 15 ++++------
 .../applib/job/RunBackgroundCommandsJob.html       | 15 ++++------
 .../subscriber/CommandSubscriberForCommandLog.html | 15 ++++------
 .../CausewayModuleExtCommandLogPersistenceJdo.html | 15 ++++------
 .../CausewayModuleExtCommandLogPersistenceJpa.html | 15 ++++------
 .../CausewayModuleExtCommandReplayPrimary.html     | 15 ++++------
 .../primary/config/PrimaryConfig.html              | 15 ++++------
 .../primary/mixins/Object_openOnSecondary.html     | 15 ++++------
 .../restapi/CommandRetrievalOnPrimaryService.html  | 15 ++++------
 .../primary/ui/CommandReplayOnPrimaryService.html  | 15 ++++------
 .../CausewayModuleExtCommandReplaySecondary.html   | 15 ++++------
 .../secondary/analyser/CommandReplayAnalyser.html  | 15 ++++------
 .../analyser/CommandReplayAnalyserException.html   | 15 ++++------
 .../analyser/CommandReplayAnalyserResult.html      | 15 ++++------
 .../analysis/CommandReplayAnalysisService.html     | 15 ++++------
 .../secondary/config/SecondaryConfig.html          | 15 ++++------
 .../secondary/fetch/CommandFetcher.html            | 15 ++++------
 .../secondary/job/JobExecutionData.html            | 15 ++++------
 .../secondary/job/ReplicateAndReplayJob.html       | 15 ++++------
 .../secondary/job/SecondaryStatusData.html         | 15 ++++------
 .../jobcallables/ReplicateAndRunCommands.html      | 15 ++++------
 .../secondary/mixins/CommandLogEntry_exclude.html  | 15 ++++------
 .../mixins/CommandLogEntry_replayQueue.html        | 15 ++++------
 .../secondary/mixins/Object_openOnPrimary.html     | 15 ++++------
 .../spi/ReplayCommandExecutionController.html      | 15 ++++------
 .../secondary/status/SecondaryStatus.html          | 15 ++++------
 .../ui/CommandReplayOnSecondaryService.html        | 15 ++++------
 .../index/cors/impl/CausewayModuleExtCors.html     | 15 ++++------
 .../index/docgen/CausewayModuleExtDocgen.html      | 15 ++++------
 .../extensions/index/docgen/applib/HelpNode.html   | 15 ++++------
 .../index/docgen/menu/DocumentationMenu.html       | 15 ++++------
 .../index/excel/applib/AggregationType.html        | 15 ++++------
 .../excel/applib/CausewayModuleExtExcelApplib.html | 15 ++++------
 .../index/excel/applib/ExcelMetaDataEnabled.html   | 15 ++++------
 .../index/excel/applib/ExcelService.html           | 15 ++++------
 .../extensions/index/excel/applib/Mode.html        | 15 ++++------
 .../extensions/index/excel/applib/RowHandler.html  | 15 ++++------
 .../index/excel/applib/WorksheetContent.html       | 15 ++++------
 .../index/excel/applib/WorksheetSpec.html          | 15 ++++------
 .../index/excel/applib/annotation/HyperLink.html   | 15 ++++------
 .../index/excel/applib/annotation/PivotColumn.html | 15 ++++------
 .../excel/applib/annotation/PivotDecoration.html   | 15 ++++------
 .../index/excel/applib/annotation/PivotRow.html    | 15 ++++------
 .../index/excel/applib/annotation/PivotValue.html  | 15 ++++------
 .../excel/applib/service/ExcelServiceDefault.html  | 15 ++++------
 .../index/excel/applib/util/AnnotationList.html    | 15 ++++------
 .../index/excel/applib/util/AnnotationTriplet.html | 15 ++++------
 .../excel/applib/util/ExcelFileBlobConverter.html  | 15 ++++------
 .../index/excel/applib/util/PivotUtils.html        | 15 ++++------
 .../index/excel/applib/util/SheetPivoter.html      | 15 ++++------
 .../testing/CausewayModuleExtExcelTesting.html     | 15 ++++------
 .../index/excel/testing/ExcelFixture.html          | 15 ++++------
 .../index/excel/testing/ExcelFixture2.html         | 15 ++++------
 .../excel/testing/ExcelFixtureRowHandler.html      | 15 ++++------
 .../excel/testing/ExcelFixtureWorkbookHandler.html | 15 ++++------
 .../excel/testing/FixtureAwareRowHandler.html      | 15 ++++------
 .../CausewayModuleExtExecutionLogApplib.html       | 15 ++++------
 .../executionlog/applib/app/ExecutionLogMenu.html  | 15 ++++------
 .../HasInteractionId_executionLogEntries.html      | 15 ++++------
 .../HasUsername_recentExecutionsByUser.html        | 15 ++++------
 .../contributions/Object_recentExecutions.html     | 15 ++++------
 .../executionlog/applib/dom/ExecutionLogEntry.html | 15 ++++------
 .../applib/dom/ExecutionLogEntryRepository.html    | 15 ++++------
 .../applib/dom/ExecutionLogEntryType.html          | 15 ++++------
 .../ExecutionLogEntry_siblingExecutions.html       | 15 ++++------
 .../ExecutionSubscriberForExecutionLog.html        | 15 ++++------
 ...ausewayModuleExtExecutionLogPersistenceJdo.html | 15 ++++------
 ...ausewayModuleExtExecutionLogPersistenceJpa.html | 15 ++++------
 .../CausewayModuleExtExecutionOutboxApplib.html    | 15 ++++------
 .../applib/app/ExecutionOutboxMenu.html            | 15 ++++------
 .../applib/dom/ExecutionOutboxEntry.html           | 15 ++++------
 .../applib/dom/ExecutionOutboxEntryRepository.html | 15 ++++------
 .../applib/dom/ExecutionOutboxEntryType.html       | 15 ++++------
 .../applib/restapi/OutboxEvents.html               | 15 ++++------
 .../applib/restapi/OutboxRestApi.html              | 15 ++++------
 .../ContentMappingServiceForOutboxEvents.html      | 15 ++++------
 ...ewayModuleExtExecutionOutboxPersistenceJdo.html | 15 ++++------
 ...ewayModuleExtExecutionOutboxPersistenceJpa.html | 15 ++++------
 .../CausewayModuleExtExecutionRestClient.html      | 15 ++++------
 .../restclient/api/OutboxClient.html               | 15 ++++------
 .../ExecutionLogEntry_copyToOutbox.html            | 15 ++++------
 .../fullcalendar/applib/CalendarEventable.html     | 15 ++++------
 .../index/fullcalendar/applib/Calendarable.html    | 15 ++++------
 .../CausewayModuleExtFullCalendarApplib.html       | 15 ++++------
 .../spi/CalendarableDereferencingService.html      | 15 ++++------
 .../fullcalendar/applib/value/CalendarEvent.html   | 16 ++++-------
 ...wayModuleExtFullcalendarWicketIntegration.html} | 28 ++++++++----------
 .../ui/CausewayModuleExtFullcalendarWicketUi.html} | 27 ++++++++----------
 .../CausewayModuleExtFullCalendarWicketUi.html}    | 29 ++++++++-----------
 .../hsqldbmgr/dom/CausewayModuleExtHsqldbMgr.html  | 15 ++++------
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.html  | 15 ++++------
 .../pdfjs/applib/annotations/PdfJsViewer.html      | 15 ++++------
 .../index/pdfjs/applib/config/PdfJsConfig.html     | 15 ++++------
 .../index/pdfjs/applib/config/Scale.html           | 15 ++++------
 .../index/pdfjs/applib/spi/PdfJsViewerAdvisor.html | 15 ++++------
 .../CausewayModuleExtPdfjsWicketIntegration.html   | 15 ++++------
 .../wkt/ui/CausewayModuleExtPdfjsWicketUi.html     | 15 ++++------
 .../applib/CausewayModuleExtSecmanApplib.html      | 15 ++++------
 .../feature/api/ApplicationFeatureChoices.html     | 15 ++++------
 .../ApplicationFeatureViewModel_permissions.html   | 15 ++++------
 .../app/ApplicationOrphanedPermissionManager.html  | 15 ++++------
 ...OrphanedPermissionManager_relocateSelected.html | 15 ++++------
 .../permission/dom/ApplicationPermission.html      | 15 ++++------
 .../permission/dom/ApplicationPermissionMode.html  | 15 ++++------
 .../dom/ApplicationPermissionRepository.html       | 15 ++++------
 .../ApplicationPermissionRepositoryAbstract.html   | 15 ++++------
 .../permission/dom/ApplicationPermissionRule.html  | 15 ++++------
 .../permission/dom/ApplicationPermissionValue.html | 15 ++++------
 .../dom/ApplicationPermissionValueSet.html         | 15 ++++------
 .../dom/mixins/ApplicationPermission_allow.html    | 15 ++++------
 .../dom/mixins/ApplicationPermission_changing.html | 15 ++++------
 .../dom/mixins/ApplicationPermission_delete.html   | 15 ++++------
 .../dom/mixins/ApplicationPermission_feature.html  | 15 ++++------
 .../mixins/ApplicationPermission_updateRole.html   | 15 ++++------
 .../dom/mixins/ApplicationPermission_veto.html     | 15 ++++------
 .../dom/mixins/ApplicationPermission_viewing.html  | 15 ++++------
 .../permission/menu/ApplicationPermissionMenu.html | 15 ++++------
 .../spi/PermissionsEvaluationService.html          | 15 ++++------
 .../secman/applib/role/dom/ApplicationRole.html    | 15 ++++------
 .../applib/role/dom/ApplicationRoleRepository.html | 15 ++++------
 .../dom/ApplicationRoleRepositoryAbstract.html     | 15 ++++------
 .../dom/mixins/ApplicationRole_addPermission.html  | 15 ++++------
 .../role/dom/mixins/ApplicationRole_addUser.html   | 15 ++++------
 .../role/dom/mixins/ApplicationRole_delete.html    | 15 ++++------
 .../mixins/ApplicationRole_removePermissions.html  | 15 ++++------
 .../dom/mixins/ApplicationRole_removeUsers.html    | 15 ++++------
 .../mixins/ApplicationRole_updateDescription.html  | 15 ++++------
 .../dom/mixins/ApplicationRole_updateName.html     | 15 ++++------
 .../AbstractRoleAndPermissionsFixtureScript.html   | 15 ++++------
 .../applib/role/man/ApplicationRoleManager.html    | 15 ++++------
 .../mixins/ApplicationRoleManager_allRoles.html    | 15 ++++------
 .../ApplicationRoleManager_exportAsYaml.html       | 15 ++++------
 .../man/mixins/ApplicationRoleManager_newRole.html | 15 ++++------
 .../applib/role/menu/ApplicationRoleMenu.html      | 15 ++++------
 .../seed/CausewayAppFeatureRoleAndPermissions.html | 15 ++++------
 .../CausewayConfigurationRoleAndPermissions.html   | 15 ++++------
 .../CausewayExtAuditTrailRoleAndPermissions.html   | 15 ++++------
 .../CausewayExtCommandLogRoleAndPermissions.html   | 15 ++++------
 .../CausewayExtExecutionLogRoleAndPermissions.html | 15 ++++------
 ...usewayExtExecutionOutboxRoleAndPermissions.html | 15 ++++------
 .../CausewayExtH2ConsoleRoleAndPermissions.html    | 15 ++++------
 .../CausewayExtSecmanAdminRoleAndPermissions.html  | 15 ++++------
 ...ewayExtSecmanRegularUserRoleAndPermissions.html | 15 ++++------
 .../CausewayExtSessionLogRoleAndPermissions.html   | 15 ++++------
 ...yPersistenceJdoMetaModelRoleAndPermissions.html | 15 ++++------
 .../CausewaySudoImpersonateRoleAndPermissions.html | 15 ++++------
 ...werRestfulObjectsSwaggerRoleAndPermissions.html | 15 ++++------
 .../applib/seed/SeedSecurityModuleService.html     | 15 ++++------
 .../scripts/SeedUsersAndRolesFixtureScript.html    | 15 ++++------
 .../applib/tenancy/dom/ApplicationTenancy.html     | 15 ++++------
 .../tenancy/dom/ApplicationTenancyRepository.html  | 15 ++++------
 .../dom/ApplicationTenancyRepositoryAbstract.html  | 15 ++++------
 .../index/secman/applib/tenancy/dom/HasAtPath.html | 15 ++++------
 .../dom/mixins/ApplicationTenancy_addChild.html    | 15 ++++------
 .../dom/mixins/ApplicationTenancy_addUser.html     | 15 ++++------
 .../dom/mixins/ApplicationTenancy_delete.html      | 15 ++++------
 .../dom/mixins/ApplicationTenancy_removeChild.html | 15 ++++------
 .../dom/mixins/ApplicationTenancy_removeUser.html  | 15 ++++------
 .../dom/mixins/ApplicationTenancy_updateName.html  | 15 ++++------
 .../dom/mixins/ApplicationTenancy_users.html       | 15 ++++------
 .../fixtures/AbstractTenancyFixtureScript.html     | 15 ++++------
 .../tenancy/man/ApplicationTenancyManager.html     | 15 ++++------
 .../ApplicationTenancyManager_allTenancies.html    | 15 ++++------
 .../ApplicationTenancyManager_newTenancy.html      | 15 ++++------
 .../tenancy/menu/ApplicationTenancyMenu.html       | 15 ++++------
 .../secman/applib/tenancy/seed/GlobalTenancy.html  | 15 ++++------
 .../tenancy/spi/ApplicationTenancyEvaluator.html   | 15 ++++------
 .../contributions/HasUsername_associatedUser.html  | 15 ++++------
 .../index/secman/applib/user/dom/AccountType.html  | 15 ++++------
 .../secman/applib/user/dom/ApplicationUser.html    | 15 ++++------
 .../applib/user/dom/ApplicationUserRepository.html | 15 ++++------
 .../dom/ApplicationUserRepositoryAbstract.html     | 15 ++++------
 .../applib/user/dom/ApplicationUserStatus.html     | 15 ++++------
 .../user/dom/mixins/ApplicationUser_addRole.html   | 15 ++++------
 .../user/dom/mixins/ApplicationUser_delete.html    | 15 ++++------
 .../user/dom/mixins/ApplicationUser_duplicate.html | 15 ++++------
 .../user/dom/mixins/ApplicationUser_lock.html      | 15 ++++------
 .../dom/mixins/ApplicationUser_removeRoles.html    | 15 ++++------
 .../dom/mixins/ApplicationUser_resetPassword.html  | 15 ++++------
 .../user/dom/mixins/ApplicationUser_timeZone.html  | 15 ++++------
 .../user/dom/mixins/ApplicationUser_unlock.html    | 15 ++++------
 .../mixins/ApplicationUser_updateAccountType.html  | 15 ++++------
 .../dom/mixins/ApplicationUser_updateAtPath.html   | 15 ++++------
 .../mixins/ApplicationUser_updateEmailAddress.html | 15 ++++------
 .../mixins/ApplicationUser_updateFaxNumber.html    | 15 ++++------
 .../dom/mixins/ApplicationUser_updateLocale.html   | 15 ++++------
 .../dom/mixins/ApplicationUser_updateName.html     | 15 ++++------
 .../dom/mixins/ApplicationUser_updatePassword.html | 15 ++++------
 .../mixins/ApplicationUser_updatePhoneNumber.html  | 15 ++++------
 .../dom/mixins/ApplicationUser_updateUsername.html | 15 ++++------
 ...ApplicationUser_effectiveMemberPermissions.html | 15 ++++------
 ...ationUser_filterEffectiveMemberPermissions.html | 15 ++++------
 .../dom/mixins/perms/UserPermissionViewModel.html  | 15 ++++------
 .../applib/user/events/UserCreatedEvent.html       | 15 ++++------
 .../AbstractUserAndRolesFixtureScript.html         | 15 ++++------
 .../applib/user/man/ApplicationUserManager.html    | 15 ++++------
 .../mixins/ApplicationUserManager_allUsers.html    | 15 ++++------
 .../ApplicationUserManager_newDelegateUser.html    | 15 ++++------
 .../ApplicationUserManager_newLocalUser.html       | 15 ++++------
 .../applib/user/menu/ApplicationUserMenu.html      | 15 ++++------
 .../index/secman/applib/user/menu/MeService.html   | 15 ++++------
 .../user/seed/CausewayExtSecmanAdminUser.html      | 15 ++++------
 .../index/secman/applib/util/RegexReplacer.html    | 15 ++++------
 .../CausewayModuleExtSecmanDelegatedShiro.html     | 15 ++++------
 .../realm/CausewayModuleExtSecmanShiroRealm.html   | 15 ++++------
 .../secman/delegated/shiro/util/ShiroUtils.html    | 15 ++++------
 ...usewayModuleExtSecmanDelegatedSpringOauth2.html | 15 ++++------
 .../CausewayModuleExtSecmanEncryptionJbcrypt.html  | 15 ++++------
 .../services/PasswordEncoderUsingJBcrypt.html      | 15 ++++------
 .../CausewayModuleExtSecmanEncryptionSpring.html   | 15 ++++------
 .../CausewayModuleExtSecmanIntegration.html        | 15 ++++------
 .../authenticator/AuthenticatorSecman.html         | 15 ++++------
 .../AuthenticatorSecmanAutoConfiguration.html      | 15 ++++------
 .../integration/authorizor/AuthorizorSecman.html   | 15 ++++------
 .../PermissionsEvaluationServiceForSecman.html     | 15 ++++------
 .../userreg/UserRegistrationServiceForSecman.html  | 15 ++++------
 .../jdo/CausewayModuleExtSecmanPersistenceJdo.html | 15 ++++------
 .../jpa/CausewayModuleExtSecmanPersistenceJpa.html | 15 ++++------
 .../sessionlog/applib/app/SessionLogMenu.html      | 15 ++++------
 .../HasUsername_recentSessionsForUser.html         | 15 ++++------
 .../sessionlog/applib/dom/SessionLogEntry.html     | 15 ++++------
 .../applib/dom/SessionLogEntryRepository.html      | 15 ++++------
 .../spiimpl/SessionLogServiceInitializer.html      | 15 ++++------
 .../spiimpl/SessionSubscriberForSessionLog.html    | 15 ++++------
 .../realm/impl/CausewayLdapContextFactory.html     | 15 ++++------
 .../realm/impl/CausewayLdapRealm.html              | 15 ++++------
 .../impl/CausewayModuleExtShiroRealmLdapImpl.html  | 15 ++++------
 .../CausewayModuleExtSpringSecurityOAuth2.html     | 15 ++++------
 .../sse/applib/CausewayModuleExtSseApplib.html     | 15 ++++------
 .../sse/applib/annotations/ServerSentEvents.html   | 15 ++++------
 .../index/sse/applib/annotations/SseSource.html    | 15 ++++------
 .../index/sse/applib/service/SseChannel.html       | 15 ++++------
 .../index/sse/applib/service/SseService.html       | 15 ++++------
 .../sse/wicket/CausewayModuleExtSseWicket.html     | 15 ++++------
 .../sse/wicket/services/SseServiceDefault.html     | 15 ++++------
 .../webmodule/WebModuleServerSentEvents.html       | 15 ++++------
 .../ui/CausewayModuleExtExcelDownloadWicketUi.html | 15 ++++------
 .../CollectionContentsAsExcelFactory.html          | 15 ++++------
 .../applib/CausewayModulePersistenceJdoApplib.html | 15 ++++------
 .../jdo/applib/services/JdoSupportService.html     | 15 ++++------
 .../JdoSupportService_010-examples-and-usage.html  | 15 ++++------
 .../index/jdo/applib/types/AddressLine.html        | 15 ++++------
 .../index/jdo/applib/types/Description.html        | 15 ++++------
 .../persistence/index/jdo/applib/types/Email.html  | 15 ++++------
 .../persistence/index/jdo/applib/types/Fqcn.html   | 15 ++++------
 .../index/jdo/applib/types/LogicalTypeName.html    | 15 ++++------
 .../persistence/index/jdo/applib/types/Money.html  | 15 ++++------
 .../persistence/index/jdo/applib/types/Name.html   | 15 ++++------
 .../persistence/index/jdo/applib/types/Notes.html  | 15 ++++------
 .../index/jdo/applib/types/ObjectIdentifier.html   | 15 ++++------
 .../index/jdo/applib/types/Percentage.html         | 15 ++++------
 .../index/jdo/applib/types/PhoneNumber.html        | 15 ++++------
 .../index/jdo/applib/types/PostalCode.html         | 15 ++++------
 .../index/jdo/applib/types/ProperName.html         | 15 ++++------
 .../index/jdo/applib/types/Reference.html          | 15 ++++------
 .../persistence/index/jdo/applib/types/Title.html  | 15 ++++------
 .../index/jdo/applib/types/UrlTemplate.html        | 15 ++++------
 .../index/jdo/applib/types/Username.html           | 15 ++++------
 .../CausewayModulePersistenceJdoDatanucleus.html   | 15 ++++------
 ...sewayModulePersistenceJdoDatanucleusMixins.html | 15 ++++------
 .../changetracking/JdoLifecycleListener.html       | 15 ++++------
 .../jdo/datanucleus/dialect/DnJdoDialect.html      | 15 ++++------
 .../mixins/Persistable_datanucleusVersionLong.html | 15 ++++------
 .../Persistable_datanucleusVersionTimestamp.html   | 15 ++++------
 .../mixins/Persistable_downloadJdoMetadata.html    | 15 ++++------
 .../applib/CausewayBookmarkConverter.html          | 15 ++++------
 .../applib/CausewayLocalResourcePathConverter.html | 15 ++++------
 .../applib/CausewayMarkupConverter.html            | 15 ++++------
 .../applib/CausewayPasswordConverter.html          | 15 ++++------
 .../JavaAwtBufferedImageByteArrayConverter.html    | 15 ++++------
 .../schema/v2/CausewayChangesDtoConverter.html     | 15 ++++------
 .../schema/v2/CausewayCommandDtoConverter.html     | 15 ++++------
 .../schema/v2/CausewayInteractionDtoConverter.html | 15 ++++------
 .../schema/v2/CausewayOidDtoConverter.html         | 15 ++++------
 .../time/OffsetDateTimeConverterForJdo.html        | 15 ++++------
 .../time/OffsetTimeConverterForJdo.html            | 15 ++++------
 .../time/ZonedDateTimeConverterForJdo.html         | 15 ++++------
 .../valuemappings/ByteArrayBlobRdbmsMapping.html   | 15 ++++------
 .../valuemappings/CausewayBlobMapping.html         | 15 ++++------
 .../valuemappings/CausewayClobMapping.html         | 15 ++++------
 .../applib/integration/CausewayEntityListener.html | 15 ++++------
 .../jpa/applib/services/JpaSupportService.html     | 15 ++++------
 .../index/jpa/applib/types/BlobJpaEmbeddable.html  | 15 ++++------
 .../index/jpa/applib/types/ClobJpaEmbeddable.html  | 15 ++++------
 .../CausewayModulePersistenceJpaEclipselink.html   | 15 ++++------
 .../changetracking/EntityChangeTrackerDefault.html | 15 ++++------
 .../applib/CausewayBookmarkConverter.html          | 15 ++++------
 .../applib/CausewayLocalResourcePathConverter.html | 15 ++++------
 .../applib/CausewayMarkupConverter.html            | 15 ++++------
 .../applib/CausewayPasswordConverter.html          | 15 ++++------
 .../JavaAwtBufferedImageByteArrayConverter.html    | 15 ++++------
 .../java/time/OffsetDateTimeConverterForJpa.html   | 15 ++++------
 .../java/time/OffsetTimeConverterForJpa.html       | 15 ++++------
 .../java/time/ZonedDateTimeConverterForJpa.html    | 15 ++++------
 .../java/util/JavaUtilUuidConverter.html           | 15 ++++------
 .../schema/v2/CausewayChangesDtoConverter.html     | 15 ++++------
 .../schema/v2/CausewayCommandDtoConverter.html     | 15 ++++------
 .../schema/v2/CausewayInteractionDtoConverter.html | 15 ++++------
 .../schema/v2/CausewayOidDtoConverter.html         | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/schema/about.html  | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/schema/aim.html    | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/schema/chg.html    | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/schema/cmd.html    | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/schema/common.html | 15 ++++------
 .../schema/index/CausewayModuleSchema.html         | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/schema/ixn.html    | 15 ++++------
 content/refguide/2.0.0-SNAPSHOT/schema/mml.html    | 15 ++++------
 .../index/bypass/CausewayModuleSecurityBypass.html | 15 ++++------
 .../bypass/authentication/AuthenticatorBypass.html | 15 ++++------
 .../bypass/authorization/AuthorizorBypass.html     | 15 ++++------
 .../keycloak/CausewayModuleSecurityKeycloak.html   | 15 ++++------
 .../index/shiro/CausewayModuleSecurityShiro.html   | 15 ++++------
 .../shiro/authentication/AuthenticatorShiro.html   | 15 ++++------
 .../index/shiro/authorization/AuthorizorShiro.html | 15 ++++------
 .../shiro/authorization/CausewayPermission.html    | 15 ++++------
 .../authorization/CausewayPermissionResolver.html  | 15 ++++------
 .../index/shiro/webmodule/WebModuleShiro.html      | 15 ++++------
 .../index/spring/CausewayModuleSecuritySpring.html | 15 ++++------
 .../authconverters/AuthenticationConverter.html    | 15 ++++------
 .../spring/authentication/AuthenticatorSpring.html | 15 ++++------
 .../spring/webmodule/SpringSecurityFilter.html     | 15 ++++------
 .../spring/webmodule/WebModuleSpringSecurity.html  | 15 ++++------
 ...CausewayModuleTestingArchTestSupportApplib.html | 15 ++++------
 .../applib/classrules/ArchitectureDomainRules.html | 15 ++++------
 .../applib/classrules/ArchitectureJdoRules.html    | 15 ++++------
 .../applib/classrules/ArchitectureJpaRules.html    | 15 ++++------
 .../modulerules/ArchitectureModuleRules.html       | 15 ++++------
 .../applib/modulerules/Subpackage.html             | 15 ++++------
 .../applib/modulerules/SubpackageEnum.html         | 15 ++++------
 .../CausewayModuleTestingFakeDataApplib.html       | 15 ++++------
 .../services/AbstractRandomValueGenerator.html     | 15 ++++------
 .../index/fakedata/applib/services/Addresses.html  | 15 ++++------
 .../fakedata/applib/services/BigDecimals.html      | 15 ++++------
 .../fakedata/applib/services/BigIntegers.html      | 15 ++++------
 .../index/fakedata/applib/services/Books.html      | 15 ++++------
 .../index/fakedata/applib/services/Booleans.html   | 15 ++++------
 .../index/fakedata/applib/services/Bytes.html      | 15 ++++------
 .../fakedata/applib/services/CausewayBlobs.html    | 15 ++++------
 .../fakedata/applib/services/CausewayClobs.html    | 15 ++++------
 .../applib/services/CausewayPasswords.html         | 15 ++++------
 .../index/fakedata/applib/services/Chars.html      | 15 ++++------
 .../fakedata/applib/services/Collections.html      | 15 ++++------
 .../index/fakedata/applib/services/Comms.html      | 15 ++++------
 .../fakedata/applib/services/CreditCards.html      | 15 ++++------
 .../index/fakedata/applib/services/Doubles.html    | 15 ++++------
 .../index/fakedata/applib/services/Enums.html      | 15 ++++------
 .../fakedata/applib/services/FakeDataService.html  | 15 ++++------
 .../index/fakedata/applib/services/Floats.html     | 15 ++++------
 .../index/fakedata/applib/services/Integers.html   | 15 ++++------
 .../fakedata/applib/services/JavaSqlDates.html     | 15 ++++------
 .../applib/services/JavaSqlTimestamps.html         | 15 ++++------
 .../applib/services/JavaTimeDateTimes.html         | 15 ++++------
 .../applib/services/JavaTimeLocalDates.html        | 15 ++++------
 .../fakedata/applib/services/JavaTimePeriods.html  | 15 ++++------
 .../fakedata/applib/services/JavaUtilDates.html    | 15 ++++------
 .../fakedata/applib/services/JodaDateTimes.html    | 15 ++++------
 .../fakedata/applib/services/JodaLocalDates.html   | 15 ++++------
 .../fakedata/applib/services/JodaPeriods.html      | 15 ++++------
 .../index/fakedata/applib/services/Longs.html      | 15 ++++------
 .../index/fakedata/applib/services/Lorem.html      | 15 ++++------
 .../index/fakedata/applib/services/Names.html      | 15 ++++------
 .../index/fakedata/applib/services/Shorts.html     | 15 ++++------
 .../index/fakedata/applib/services/Strings.html    | 15 ++++------
 .../index/fakedata/applib/services/Urls.html       | 15 ++++------
 .../index/fakedata/applib/services/Uuids.html      | 15 ++++------
 ...ausewayIntegrationGwtAbstractWithFixtures.html} | 28 ++++++++----------
 ...ausewayIntegrationTestAbstractWithFixtures.html | 15 ++++------
 .../CausewayModuleTestingFixturesApplib.html       | 15 ++++------
 .../applib/events/FixturesInstalledEvent.html      | 15 ++++------
 .../applib/events/FixturesInstallingEvent.html     | 15 ++++------
 .../applib/fixturescripts/ExecutionParameters.html | 15 ++++------
 .../fixturescripts/ExecutionParametersDefault.html | 15 ++++------
 .../fixturescripts/ExecutionParametersService.html | 15 ++++------
 .../applib/fixturescripts/FixtureResult.html       | 15 ++++------
 .../applib/fixturescripts/FixtureResultList.html   | 15 ++++------
 .../applib/fixturescripts/FixtureScript.html       | 15 ++++------
 .../FixtureScriptWithExecutionStrategy.html        | 15 ++++------
 .../FixtureScript_ExecutionContext.html            | 15 ++++------
 .../applib/fixturescripts/FixtureScripts.html      | 15 ++++------
 .../FixtureScriptsSpecification.html               | 15 ++++------
 ...iptsSpecificationProviderAutoConfiguration.html | 15 ++++------
 .../FixtureScripts_MultipleExecutionStrategy.html  | 15 ++++------
 ...FixtureScripts_NonPersistedObjectsStrategy.html | 15 ++++------
 ...ixtureScripts_020-configuration-properties.html | 15 ++++------
 .../applib/modules/ModuleWithFixtures.html         | 15 ++++------
 .../applib/modules/ModuleWithFixturesService.html  | 15 ++++------
 .../applib/personas/BuilderScriptAbstract.html     | 15 ++++------
 .../applib/personas/BuilderScriptWithResult.html   | 15 ++++------
 .../personas/BuilderScriptWithoutResult.html       | 15 ++++------
 .../index/fixtures/applib/personas/Persona.html    | 15 ++++------
 .../applib/personas/PersonaWithBuilderScript.html  | 15 ++++------
 .../applib/personas/PersonaWithFinder.html         | 15 ++++------
 .../services/InitialFixtureScriptsInstaller.html   | 15 ++++------
 .../applib/setup/PersonaEnumPersistAll.html        | 15 ++++------
 .../teardown/jdo/TeardownFixtureJdoAbstract.html   | 15 ++++------
 .../teardown/jpa/TeardownFixtureJpaAbstract.html   | 15 ++++------
 .../ui/CausewayModuleTestingH2ConsoleUi.html       | 15 ++++------
 .../index/h2console/ui/services/H2ManagerMenu.html | 15 ++++------
 .../h2console/ui/webmodule/WebModuleH2Console.html | 15 ++++------
 ...ct.html => CausewayIntegrationGwtAbstract.html} | 33 +++++++++++-----------
 .../applib/CausewayIntegrationTestAbstract.html    | 15 ++++------
 .../applib/CausewayInteractionHandler.html         | 15 ++++------
 ...ausewayModuleTestingIntegTestSupportApplib.html | 15 ++++------
 .../applib/ExceptionRecognizerTranslate.html       | 15 ++++------
 .../applib/annotation/InteractAs.html              | 15 ++++------
 .../applib/swagger/SwaggerExporter.html            | 15 ++++------
 .../applib/validate/DomainModelValidator.html      | 15 ++++------
 .../CausewayModuleTestingSpecSupportApplib.html    | 15 ++++------
 .../integration/ObjectFactoryForIntegration.html   | 15 ++++------
 ...CausewayModuleTestingUnitTestSupportApplib.html | 15 ++++------
 .../applib/assertions/Asserting.html               | 15 ++++------
 .../applib/dom/AbstractApplyToAllContractTest.html | 15 ++++------
 .../ComparableContractTest_compareTo.html          | 15 ++++------
 .../dom/comparable/ComparableContractTester.html   | 15 ++++------
 .../applib/dom/pojo/PojoTester.html                | 15 ++++------
 .../sortedsets/SortedSetsContractTestAbstract.html | 15 ++++------
 .../dom/value/ValueTypeContractTestAbstract.html   | 15 ++++------
 .../unittestsupport/applib/io/IndentPrinter.html   | 15 ++++------
 .../unittestsupport/applib/io/NullPrintStream.html | 15 ++++------
 .../applib/jmocking/CausewayActions.html           | 15 ++++------
 .../applib/jmocking/Imposterisers.html             | 15 ++++------
 .../applib/jmocking/InjectIntoJMockAction.html     | 15 ++++------
 .../applib/jmocking/JMockActions.html              | 15 ++++------
 .../applib/jmocking/JUnitRuleMockery2.html         | 15 ++++------
 .../applib/jmocking/PostponedAction.html           | 15 ++++------
 .../applib/matchers/ClassMatchers.html             | 15 ++++------
 .../applib/matchers/ComparableMatchers.html        | 15 ++++------
 .../applib/matchers/FileMatchers.html              | 15 ++++------
 .../applib/matchers/JaxbMatchers.html              | 15 ++++------
 .../applib/matchers/ListMatchers.html              | 15 ++++------
 .../applib/matchers/StringMatchers.html            | 15 ++++------
 .../applib/matchers/ThrowableMatchers.html         | 15 ++++------
 .../unittestsupport/applib/util/CollectUtils.html  | 15 ++++------
 .../unittestsupport/applib/util/FileUtils.html     | 15 ++++------
 .../unittestsupport/applib/util/InjectUtils.html   | 15 ++++------
 .../unittestsupport/applib/util/ReflectUtils.html  | 15 ++++------
 .../unittestsupport/applib/util/StringUtils.html   | 15 ++++------
 .../applib/CausewayModuleValAsciidocApplib.html    | 15 ++++------
 .../asciidoc/applib/jaxb/AsciiDocJaxbAdapter.html  | 15 ++++------
 .../index/asciidoc/applib/value/AsciiDoc.html      | 15 ++++------
 .../CausewayModuleValAsciidocMetaModel.html        | 15 ++++------
 .../CausewayModuleValAsciidocPersistenceJdoDn.html | 15 ++++------
 .../dn/converters/CausewayAsciiDocConverter.html   | 15 ++++------
 .../CausewayModuleValAsciidocPersistenceJpa.html   | 15 ++++------
 .../jpa/converters/CausewayAsciiDocConverter.html  | 15 ++++------
 .../ui/wkt/CausewayModuleValAsciidocUiWkt.html     | 15 ++++------
 .../applib/CausewayModuleValJodatimeApplib.html    | 15 ++++------
 .../jodatime/applib/jaxb/JodaTimeJaxbAdapters.html | 15 ++++------
 .../JodaTimeXMLGregorianCalendarMarshalling.html   | 15 ++++------
 .../jodatime/applib/value/JodaTimeConverters.html  | 15 ++++------
 .../CausewayModuleValJodatimeIntegration.html      | 15 ++++------
 .../applib/CausewayModuleValMarkdownApplib.html    | 15 ++++------
 .../markdown/applib/jaxb/MarkdownJaxbAdapter.html  | 15 ++++------
 .../index/markdown/applib/value/Converter.html     | 15 ++++------
 .../index/markdown/applib/value/Markdown.html      | 15 ++++------
 .../CausewayModuleValMarkdownMetaModel.html        | 15 ++++------
 .../CausewayModuleValMarkdownPersistenceJdoDn.html | 15 ++++------
 .../dn/converters/CausewayMarkdownConverter.html   | 15 ++++------
 .../CausewayModuleValMarkdownPersistenceJpa.html   | 15 ++++------
 .../jpa/converters/CausewayMarkdownConverter.html  | 15 ++++------
 .../ui/wkt/CausewayModuleValMarkdownUiWkt.html     | 15 ++++------
 .../vega/applib/CausewayModuleValVegaApplib.html   | 15 ++++------
 .../index/vega/applib/jaxb/VegaJaxbAdapter.html    | 15 ++++------
 .../valuetypes/index/vega/applib/value/Vega.html   | 15 ++++------
 .../metamodel/CausewayModuleValVegaMetaModel.html  | 15 ++++------
 .../dn/CausewayModuleValVegaPersistenceJdoDn.html  | 15 ++++------
 .../jdo/dn/converters/CausewayVegaConverter.html   | 15 ++++------
 .../jpa/CausewayModuleValVegaPersistenceJpa.html   | 15 ++++------
 .../jpa/converters/CausewayVegaConverter.html      | 15 ++++------
 .../vega/ui/wkt/CausewayModuleValVegaUiWkt.html    | 15 ++++------
 .../UserProfileUiService_010-implementation.html   | 15 ++++------
 ...serProfileUiService_020-examples-and-usage.html | 15 ++++------
 .../commons/applib/mixins/Object_impersonate.html  | 15 ++++------
 .../applib/mixins/Object_impersonateWithRoles.html | 15 ++++------
 .../services/branding/BrandingUiService.html       | 15 ++++------
 .../applib/services/header/HeaderUiService.html    | 15 ++++------
 .../applib/services/menu/MenuUiService.html        | 15 ++++------
 .../services/userprof/UserProfileUiModel.html      | 15 ++++------
 .../services/userprof/UserProfileUiService.html    | 15 ++++------
 .../CausewayModuleViewerRestfulObjectsApplib.html  | 15 ++++------
 .../restfulobjects/applib/JsonRepresentation.html  | 15 ++++------
 .../restfulobjects/applib/LinkRepresentation.html  | 15 ++++------
 .../viewer/index/restfulobjects/applib/Rel.html    | 15 ++++------
 .../index/restfulobjects/applib/RelDefinition.html | 15 ++++------
 .../restfulobjects/applib/RepresentationType.html  | 15 ++++------
 .../restfulobjects/applib/RestfulHttpMethod.html   | 15 ++++------
 .../restfulobjects/applib/RestfulMediaType.html    | 15 ++++------
 .../restfulobjects/applib/RestfulRequest.html      | 15 ++++------
 .../restfulobjects/applib/RestfulResponse.html     | 15 ++++------
 .../applib/boot/BootstrapResource.html             | 15 ++++------
 .../AbstractObjectMemberRepresentation.html        | 15 ++++------
 .../domainobjects/ActionResultRepresentation.html  | 15 ++++------
 .../DomainObjectMemberRepresentation.html          | 15 ++++------
 .../domainobjects/DomainObjectRepresentation.html  | 15 ++++------
 .../applib/domainobjects/DomainObjectResource.html | 15 ++++------
 .../applib/domainobjects/DomainRepresentation.html | 15 ++++------
 .../domainobjects/DomainServiceResource.html       | 15 ++++------
 .../applib/domainobjects/ListRepresentation.html   | 15 ++++------
 .../domainobjects/ObjectActionRepresentation.html  | 15 ++++------
 .../ObjectCollectionRepresentation.html            | 15 ++++------
 .../ObjectPropertyRepresentation.html              | 15 ++++------
 .../domainobjects/ScalarValueRepresentation.html   | 15 ++++------
 .../AbstractTypeMemberRepresentation.html          | 15 ++++------
 .../ActionDescriptionRepresentation.html           | 15 ++++------
 .../ActionParameterDescriptionRepresentation.html  | 15 ++++------
 .../CollectionDescriptionRepresentation.html       | 15 ++++------
 .../domaintypes/DomainTypeRepresentation.html      | 15 ++++------
 .../applib/domaintypes/DomainTypeResource.html     | 15 ++++------
 .../PropertyDescriptionRepresentation.html         | 15 ++++------
 .../TypeActionResultRepresentation.html            | 15 ++++------
 .../applib/domaintypes/TypeListRepresentation.html | 15 ++++------
 .../applib/dtos/ScalarValueDtoV2.html              | 15 ++++------
 .../applib/errors/ErrorRepresentation.html         | 15 ++++------
 .../applib/health/HealthRepresentation.html        | 15 ++++------
 .../applib/health/HealthResource.html              | 15 ++++------
 .../applib/homepage/HomePageRepresentation.html    | 15 ++++------
 .../applib/homepage/HomePageResource.html          | 15 ++++------
 .../applib/menubars/MenuBarsResource.html          | 15 ++++------
 .../applib/user/UserRepresentation.html            | 15 ++++------
 .../restfulobjects/applib/user/UserResource.html   | 15 ++++------
 .../restfulobjects/applib/util/JsonMapper.html     | 15 ++++------
 .../restfulobjects/applib/util/JsonNodeUtils.html  | 15 ++++------
 .../restfulobjects/applib/util/MediaTypes.html     | 15 ++++------
 .../index/restfulobjects/applib/util/Parser.html   | 15 ++++------
 .../index/restfulobjects/applib/util/PathNode.html | 15 ++++------
 .../applib/util/UrlEncodingUtils.html              | 15 ++++------
 .../applib/version/VersionRepresentation.html      | 15 ++++------
 .../applib/version/VersionResource.html            | 15 ++++------
 .../client/ActionParameterListBuilder.html         | 15 ++++------
 .../index/restfulobjects/client/RestfulClient.html | 15 ++++------
 .../restfulobjects/client/RestfulClientConfig.html | 15 ++++------
 .../client/auth/BasicAuthFilter.html               | 15 ++++------
 .../client/log/ClientConversationFilter.html       | 15 ++++------
 .../client/log/ClientConversationLogger.html       | 15 ++++------
 ...wayModuleViewerRestfulObjectsJaxrsResteasy.html | 15 ++++------
 .../conneg/RestfulObjectsJaxbWriterForXml.html     | 15 ++++------
 .../webmodule/WebModuleJaxrsResteasy.html          | 15 ++++------
 .../CausewayModuleRestfulObjectsRendering.html     | 15 ++++------
 .../restfulobjects/rendering/IResourceContext.html | 15 ++++------
 .../rendering/service/RepresentationService.html   | 15 ++++------
 .../acceptheader/AcceptHeaderServiceForRest.html   | 15 ++++------
 .../service/conneg/ContentNegotiationService.html  | 15 ++++------
 .../conneg/ContentNegotiationServiceAbstract.html  | 15 ++++------
 ...entNegotiationServiceForRestfulObjectsV1_0.html | 15 ++++------
 ...ntentNegotiationServiceOrgApacheCausewayV2.html | 15 ++++------
 .../ContentNegotiationServiceOrgApacheIsisV1.html  | 15 ++++------
 .../ContentNegotiationServiceXRoDomainType.html    | 15 ++++------
 ...onServiceForRestfulObjectsV1_0_usage-notes.html | 15 ++++------
 ...tionServiceOrgApacheCausewayV2_usage-notes.html | 15 ++++------
 ...otiationServiceOrgApacheIsisV1_usage-notes.html | 15 ++++------
 ...egotiationServiceXRoDomainType_usage-notes.html | 15 ++++------
 .../service/swagger/SwaggerServiceMenu.html        | 15 ++++------
 .../valuerender/JsonValueEncoderService.html       | 15 ++++------
 .../CausewayModuleViewerRestfulObjectsViewer.html  | 15 ++++------
 .../webmodule/auth/AuthenticationStrategy.html     | 15 ++++------
 .../auth/AuthenticationStrategyAbstract.html       | 15 ++++------
 .../auth/AuthenticationStrategyBasicAuth.html      | 15 ++++------
 .../auth/AuthenticationStrategyDefault.html        | 15 ++++------
 .../CausewayModuleViewerWicketApplibMixins.html    | 15 ++++------
 .../wicket/applib/mixins/Object_clearHints.html    | 15 ++++------
 .../model/CausewayModuleViewerWicketModel.html     | 15 ++++------
 .../wicket/ui/CausewayModuleViewerWicketUi.html    | 15 ++++------
 .../viewer/CausewayModuleViewerWicketViewer.html   | 15 ++++------
 1434 files changed, 7207 insertions(+), 14382 deletions(-)

diff --git a/content/refguide/2.0.0-SNAPSHOT/about.html b/content/refguide/2.0.0-SNAPSHOT/about.html
index 2b4841253..683317ed1 100644
--- a/content/refguide/2.0.0-SNAPSHOT/about.html
+++ b/content/refguide/2.0.0-SNAPSHOT/about.html
@@ -70,21 +70,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1036,7 +1031,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Column.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Column.html
index 4b8d2c4f7..906ed7c41 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Column.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Column.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1212,7 +1207,7 @@ public void setDoc(final Clob doc) { /* ... */ }</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Digits.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Digits.html
index c23a55b2c..5f29571f2 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Digits.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Digits.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1055,7 +1050,7 @@ public void setCost(final BigDecimal cost) {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Discriminator.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Discriminator.html
index 82bb9333f..d9be139d9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Discriminator.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Discriminator.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1148,7 +1143,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/NotPersistent.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/NotPersistent.html
index 5bfab8583..7c40cd2cc 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/NotPersistent.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/NotPersistent.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1039,7 +1034,7 @@ Therefore ensure that the annotation is placed there.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Nullable.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Nullable.html
index db75e14d1..1ae60f141 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Nullable.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Nullable.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1068,7 +1063,7 @@ For properties, the optionality can also be inferred from the <a href="Column.ht
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Pattern.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Pattern.html
index 78181fa43..71a3193c9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/Pattern.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/Pattern.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1066,7 +1061,7 @@ private String name;</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/PersistenceCapable.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/PersistenceCapable.html
index b2e7109f8..181a11e36 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/PersistenceCapable.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/PersistenceCapable.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1176,7 +1171,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/PrimaryKey.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/PrimaryKey.html
index 0fedf6cce..89b4a694a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/PrimaryKey.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/PrimaryKey.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1039,7 +1034,7 @@ Therefore ensure that the annotation is placed there.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlJavaTypeAdapter.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlJavaTypeAdapter.html
index a3acee96e..dd2c71999 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlJavaTypeAdapter.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlJavaTypeAdapter.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1039,7 +1034,7 @@ in the user guide.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlRootElement.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlRootElement.html
index b2e0e12fa..405f206f5 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlRootElement.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/XmlRootElement.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1118,7 +1113,7 @@ public class ToDoItemDto implements Dto {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about.html
index 69ca1316a..ad12d3600 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1487,7 +1482,7 @@ Version</p></td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/hooks/examples.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/hooks/examples.html
index 425c3f783..6115aecc2 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/hooks/examples.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/hooks/examples.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1006,7 +1001,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jdo.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jdo.html
index 36026766b..b8d1b899c 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jdo.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jdo.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1141,7 +1136,7 @@ Version</p></td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jee.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jee.html
index a97329095..bac1fabdd 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jee.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jee.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1084,7 +1079,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jpa.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jpa.html
index 6ea72b8fd..4b8e70920 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jpa.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/jpa.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1014,7 +1009,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/main.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/main.html
index 905036fc7..788160a3d 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/main.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/main.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1148,7 +1143,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/other.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/other.html
index ae56e9354..3fd488bed 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/other.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/other.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1058,7 +1053,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/partial.html b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/partial.html
index 756b87021..4625223a6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/partial.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-ant/about/partial.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1100,7 +1095,7 @@ public class ComplexNumber {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/about.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/about.html
index 2c4816560..6ed118269 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/about.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/about.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1015,7 +1010,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events.html
index 6adaec802..071cd2e1c 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1247,7 +1242,7 @@ One use case is to maintain an alternate data store.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/domainevent.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/domainevent.html
index 0ba6cefdb..c21fec312 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/domainevent.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/domainevent.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1061,7 +1056,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/lifecycleevent.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/lifecycleevent.html
index ab59d36a6..cd31ca019 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/lifecycleevent.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/lifecycleevent.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1109,7 +1104,7 @@ One use case is to maintain an alternate data store.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/uievent.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/uievent.html
index eb88cb0be..f5c8b8091 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/uievent.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/events/uievent.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1079,7 +1074,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout.html
index cf3a7e6d9..256c32d41 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1314,7 +1309,7 @@ The <a href="../../../vw/latest/about.html" class="xref page">Web UI (Wicket vie
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/column-order.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/column-order.html
index 3b8c3986e..5c83f4ba9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/column-order.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/column-order.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1011,7 +1006,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/menubars.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/menubars.html
index d67475e69..7ef6a43ec 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/menubars.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/menubars.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1107,7 +1102,7 @@ The <a href="../../../../vw/latest/about.html" class="xref page">Web UI (Wicket
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/object-layout.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/object-layout.html
index abe8efe80..d207979e7 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/object-layout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/layout/object-layout.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1224,7 +1219,7 @@ This is always "GET".</td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/mixees-and-mixins.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/mixees-and-mixins.html
index cdd828727..479f2399e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/mixees-and-mixins.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/mixees-and-mixins.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1268,7 +1263,7 @@ Rather, these expose callback such that the framework can populate them at the a
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/non-persisted-objects.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/non-persisted-objects.html
index f1d1ad22d..e936408e4 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/non-persisted-objects.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/non-persisted-objects.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1028,7 +1023,7 @@ There is a more in-depth discussion on view models in the <a href="../../../user
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/contributee.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/contributee.html
index d446d67c3..74baaa293 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/contributee.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/contributee.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1072,7 +1067,7 @@ Other services and modules can then contribute actions/collections to render suc
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/mixins.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/mixins.html
index 474dc68fe..fca27f142 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/mixins.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/roles-mixins-contributees/mixins.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1118,7 +1113,7 @@ Two mixins contribute to this interface:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/spec.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/spec.html
index e8d10fd59..d7f091fa4 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/spec.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/spec.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1160,7 +1155,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/utility.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/utility.html
index 55ee9b959..c92ec948f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/utility.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/utility.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1041,7 +1036,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-classes/value-types.html b/content/refguide/2.0.0-SNAPSHOT/applib-classes/value-types.html
index bd60b8d77..de4014121 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-classes/value-types.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-classes/value-types.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1128,7 +1123,7 @@ These can be found in the <a href="../../../valuetypes/latest/about.html" class=
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/about.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/about.html
index 7396758fc..e2aae236f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/about.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/about.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1019,7 +1014,7 @@ It also documents the reserved methods that act as callback hooks into the persi
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle.html
index 8a200200b..790874624 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1214,7 +1209,7 @@ That&#8217;s because its not valid to interact with a persistent domain object o
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/created.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/created.html
index 238a6f268..33498c165 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/created.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/created.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1033,7 +1028,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/loaded.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/loaded.html
index 81da3bae3..1d9f2eef9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/loaded.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/loaded.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1016,7 +1011,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisted.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisted.html
index 089510ebd..df6e89f8a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisted.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisted.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1019,7 +1014,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisting.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisting.html
index e2145a717..3a4cc8715 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisting.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/persisting.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1019,7 +1014,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/removing.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/removing.html
index fd26b5569..388c26b93 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/removing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/removing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1030,7 +1025,7 @@ That&#8217;s because its not valid to interact with a persistent domain object o
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updated.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updated.html
index ecfca8f1c..f3cf53c2a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updated.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updated.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1019,7 +1014,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updating.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updating.html
index dcc51146a..baeb5173f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updating.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/lifecycle/updating.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1019,7 +1014,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes.html
index e9784a232..800fa56cc 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -2055,7 +2050,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/autoComplete.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/autoComplete.html
index 230b73271..930d25bb9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/autoComplete.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/autoComplete.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1141,7 +1136,7 @@ public class ShoppingCartItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/choices.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/choices.html
index 766d251f9..bdde8c006 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/choices.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/choices.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1187,7 +1182,7 @@ public class ShoppingCartItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/default.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/default.html
index 890430442..02dbd4cd0 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/default.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/default.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1223,7 +1218,7 @@ However, this cannot use any injected services as they will not have been initia
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/disable.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/disable.html
index 6f2c2f414..cf3cf1fb2 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/disable.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/disable.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1132,7 +1127,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/get.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/get.html
index c78461aad..5edd4f49b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/get.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/get.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1025,7 +1020,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/hide.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/hide.html
index 2a2c790f9..77bf91909 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/hide.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/hide.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1120,7 +1115,7 @@ However, if they check the first boolean parameter (ie, to ship the <code>Order<
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/set.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/set.html
index 33261ac4f..d7a3a663a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/set.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/set.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1016,7 +1011,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/validate.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/validate.html
index df04a0d8e..54854dc16 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/validate.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/prefixes/validate.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1102,7 +1097,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints.html
index faece0c2d..d5e766b38 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1278,7 +1273,7 @@ The signature of this method is usually:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/cssClass.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/cssClass.html
index abfec5f1f..bcf81ba5b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/cssClass.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/cssClass.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1055,7 +1050,7 @@ tr.done {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/iconName.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/iconName.html
index 71b350d7f..e07e7f038 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/iconName.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/iconName.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1050,7 +1045,7 @@ The value returned by the <code>iconName()</code> method is added as a suffix to
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/layout.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/layout.html
index a4fbf92e0..24d49e52a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/layout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/layout.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1061,7 +1056,7 @@ This may be specified using annotations such as
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/title.html b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/title.html
index 34b7eec6c..0cbbf5a06 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/title.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-methods/ui-hints/title.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1070,7 +1065,7 @@ The signature of this method is usually:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib-svc/about.html b/content/refguide/2.0.0-SNAPSHOT/applib-svc/about.html
index 46e69d989..8e23ba374 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib-svc/about.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib-svc/about.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -2109,7 +2104,7 @@ The framework provides a default <code>PublisherServiceLogging</code> implementa
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/_images/diag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg b/content/refguide/2.0.0-SNAPSHOT/applib/_images/diag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg
new file mode 100644
index 000000000..4a8bf9dc7
--- /dev/null
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/_images/diag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="46px" preserveAspectRatio="none" style="width:399px;height:46px;background:#FFFFFF;" version="1.1" viewBox="0 0 399 46" width="399px" zoomAndPan="magnify"><defs/><g><!--class Party--><g id="elem_Party"><rect codeLine="3" fill="#F1F1F1" height="32" id="Party" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" w [...]
\ No newline at end of file
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplib.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplib.html
index 6d7238255..1c738b4dc 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplib.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplib.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1030,7 +1025,7 @@ public static final String NAMESPACE_FEAT;
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibChangeAndExecutionLoggers.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibChangeAndExecutionLoggers.html
index 93ef74140..668bc2455 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibChangeAndExecutionLoggers.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibChangeAndExecutionLoggers.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1029,7 +1024,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibMixins.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibMixins.html
index 3cbaba99b..ebc8c807e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibMixins.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/CausewayModuleApplibMixins.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1029,7 +1024,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/Identifier.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/Identifier.html
index da5534356..6107c06c3 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/Identifier.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/Identifier.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1074,7 +1069,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/ViewModel.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/ViewModel.html
index 14dbc1cf7..f92d13c89 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/ViewModel.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/ViewModel.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1091,7 +1086,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Action.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Action.html
index a5b4872dc..3ef9f58c6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Action.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Action.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -2096,7 +2091,7 @@ The effect is to ignore it for replay purposes:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ActionLayout.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ActionLayout.html
index b158e7a4f..a9e7a2af6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ActionLayout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ActionLayout.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1956,7 +1951,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/BookmarkPolicy.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/BookmarkPolicy.html
index 70262e8d6..2c9887000 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/BookmarkPolicy.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/BookmarkPolicy.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1105,7 +1100,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Bounding.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Bounding.html
index 1c6ae9f5d..d0d07435a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Bounding.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Bounding.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1032,7 +1027,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Collection.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Collection.html
index ed8e4e7fc..23dad4890 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Collection.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Collection.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1508,7 +1503,7 @@ public void Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/CollectionLayout.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/CollectionLayout.html
index 1818da806..a687f0190 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/CollectionLayout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/CollectionLayout.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1590,7 +1585,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DependentDefaultsPolicy.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DependentDefaultsPolicy.html
index 2f5e8f42f..978dc6677 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DependentDefaultsPolicy.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DependentDefaultsPolicy.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1113,7 +1108,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObject.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObject.html
index b8eba7b92..c9f75957a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObject.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObject.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -2893,7 +2888,7 @@ Alternatively, when using <a href="Action.html" class="xref page">@Action</a> th
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html
index 1b17d4c93..516719321 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1871,7 +1866,7 @@ public class SomeSubscriber {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainService.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainService.html
index 2db844b9a..d303936b6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainService.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainService.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1258,7 +1253,7 @@ public class LoanRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout.html
index d6412bcd9..4345ea823 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1163,7 +1158,7 @@ public class CustomerRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout_MenuBar.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout_MenuBar.html
index 08297d0e5..84d43a7c4 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout_MenuBar.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainServiceLayout_MenuBar.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1033,7 +1028,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Exclude.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Exclude.html
index 53e87cce5..1de7466c1 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Exclude.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Exclude.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1032,7 +1027,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Include.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Include.html
index af0b5ca4b..bee7c7d33 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Include.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Domain_Include.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Editing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Editing.html
index 0595e0ad8..9d9aa152c 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Editing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Editing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1113,7 +1108,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/EntityChangeKind.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/EntityChangeKind.html
index d34a6e40b..bc3deaf5d 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/EntityChangeKind.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/EntityChangeKind.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1025,7 +1020,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/HomePage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/HomePage.html
index 8b239e669..582dd0c9e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/HomePage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/HomePage.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1079,7 +1074,7 @@ public class TodoAppDashboard {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/InteractionScope.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/InteractionScope.html
index bafdda49b..28583ad7e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/InteractionScope.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/InteractionScope.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Introspection.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Introspection.html
index 96d377628..ac933f7f5 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Introspection.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Introspection.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1157,7 +1152,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/LabelPosition.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/LabelPosition.html
index b9422eef6..d407f069a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/LabelPosition.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/LabelPosition.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1078,7 +1073,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MemberSupport.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MemberSupport.html
index b5ba30cd1..802026618 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MemberSupport.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MemberSupport.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1041,7 +1036,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MinLength.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MinLength.html
index 8270bfd47..971f1c830 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MinLength.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/MinLength.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1033,7 +1028,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Module.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Module.html
index 1b5cb1b8d..bb56e9966 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Module.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Module.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Nature.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Nature.html
index 22dccccc4..1c78fca8b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Nature.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Nature.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1177,7 +1172,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/NatureOfService.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/NatureOfService.html
index 22a50d328..e1afab36c 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/NatureOfService.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/NatureOfService.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1110,7 +1105,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Navigable.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Navigable.html
index f8eeacacd..3b11eeca5 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Navigable.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Navigable.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1033,7 +1028,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectLifecycle.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectLifecycle.html
index 1dd608274..fd9dfa2d6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectLifecycle.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectLifecycle.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectSupport.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectSupport.html
index 73104534d..c9cf2b0ee 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectSupport.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ObjectSupport.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Optionality.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Optionality.html
index eff0fb4fb..1f4d2ddde 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Optionality.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Optionality.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1120,7 +1115,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Parameter.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Parameter.html
index 9401772a9..c1ff92350 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Parameter.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Parameter.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1503,7 +1498,7 @@ or <a href="../value/Clob.html" class="xref page">Clob</a> parameters, indicatin
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterLayout.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterLayout.html
index 27be423e2..ce53f0f1a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterLayout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterLayout.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1495,7 +1490,7 @@ All that said, the <a href="../../../../../vw/latest/about.html" class="xref pag
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterTuple.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterTuple.html
index ab5a2996d..5a186fa76 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterTuple.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ParameterTuple.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1041,7 +1036,7 @@ record Params(@Parameter String key, @Parameter String name) {}
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PriorityPrecedence.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PriorityPrecedence.html
index 29e74ea5d..762380854 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PriorityPrecedence.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PriorityPrecedence.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1134,7 +1129,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Programmatic.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Programmatic.html
index e279a7d86..4eac36837 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Programmatic.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Programmatic.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1062,7 +1057,7 @@ For example:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Projecting.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Projecting.html
index 9ea181dc0..7c874ffe2 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Projecting.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Projecting.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1067,7 +1062,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PromptStyle.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PromptStyle.html
index c29b2e4a9..b9967641b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PromptStyle.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PromptStyle.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1190,7 +1185,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Property.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Property.html
index 21b5e8af1..3f3c834d6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Property.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Property.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -2585,7 +2580,7 @@ Annotating with <code>@Property(where=Where.NOWHERE)</code> overrides this.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PropertyLayout.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PropertyLayout.html
index 65a4614d1..4ba62b1e1 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PropertyLayout.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/PropertyLayout.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1898,7 +1893,7 @@ All that said, the <a href="../../../../../vw/latest/about.html" class="xref pag
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Publishing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Publishing.html
index 1069c3e8a..e37cdcb66 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Publishing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Publishing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1145,7 +1140,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Redirect.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Redirect.html
index c48d966e5..84c6e3c80 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Redirect.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Redirect.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1095,7 +1090,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Repainting.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Repainting.html
index 33f9f3cbc..4f1a222c1 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Repainting.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Repainting.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1075,7 +1070,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/RestrictTo.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/RestrictTo.html
index 347f422a2..73d27ff0d 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/RestrictTo.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/RestrictTo.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1032,7 +1027,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/SemanticsOf.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/SemanticsOf.html
index d59b961b7..d37777950 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/SemanticsOf.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/SemanticsOf.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1288,7 +1283,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Snapshot.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Snapshot.html
index 80cefdd01..299e5ba1a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Snapshot.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Snapshot.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1095,7 +1090,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimePrecision.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimePrecision.html
index 679fbbefe..ba59a1622 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimePrecision.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimePrecision.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1159,7 +1154,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimeZoneTranslation.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimeZoneTranslation.html
index 1a68b1222..c088f8cc9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimeZoneTranslation.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/TimeZoneTranslation.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1075,7 +1070,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Title.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Title.html
index 799e01251..50f98084d 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Title.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Title.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1186,7 +1181,7 @@ This convention can be overridden using <code>@Property(where=Where.NOWHERE)</co
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Value.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Value.html
index 8ff020265..48bc0f6e8 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Value.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Value.html
@@ -71,21 +71,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1032,7 +1027,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ValueSemantics.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ValueSemantics.html
index bc1db6a45..ec395e59b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ValueSemantics.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/ValueSemantics.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1253,7 +1248,7 @@ public LocalDate getEndDate() { ... }</pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Where.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Where.html
index dbcc05162..06c686417 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Where.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/Where.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1276,7 +1271,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action-Collection-PropertyLayout-FieldSet-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action-Collection-PropertyLayout-FieldSet-examples-and-usage.html
index ebceb1147..acf6912e8 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action-Collection-PropertyLayout-FieldSet-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action-Collection-PropertyLayout-FieldSet-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1138,7 +1133,7 @@ For actions associated with properties, the <a href="../ActionLayout.html#positi
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html
index 8055e25c3..43bae240c 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1065,7 +1060,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html
index 98c787471..2ea469219 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_021-promptStyle.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1093,7 +1088,7 @@ The net effect is that a property conceptually consisting of different parts (eg
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_022-position.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_022-position.html
index e4e97cdcc..9f53c3631 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_022-position.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_022-position.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1085,7 +1080,7 @@ If the <code>PANEL</code> or <code>PANEL_DROPDOWN</code> are used, then (as the
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_023-describedAs.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_023-describedAs.html
index 3756cbe80..ddd485871 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_023-describedAs.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_023-describedAs.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1024,7 +1019,7 @@ In the <a href="../../../../../../vw/latest/about.html" class="xref page">Web UI
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_024-cssClass.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_024-cssClass.html
index fd3387462..414612247 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_024-cssClass.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_024-cssClass.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html
index 4ced41858..325499bfc 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_025-cssClassFa.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1044,7 +1039,7 @@ The <code>fa-</code> prefix can also be omitted from the class names; it will be
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html
index baf58f0c8..5f3c40f1a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_026-bookmarking.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1061,7 +1056,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_027-hidden.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_027-hidden.html
index e2f283f2d..579d94938 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_027-hidden.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_027-hidden.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1062,7 +1057,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_028-named.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_028-named.html
index f38284e3f..9c89e9666 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_028-named.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_028-named.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1053,7 +1048,7 @@ Examples of that include a name that would be a reserved Java keyword (eg "packa
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_029-redirect.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_029-redirect.html
index ac18b783d..949b72edd 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_029-redirect.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ActionLayout_029-redirect.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1091,7 +1086,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_010-examples-and-usage.html
index e67cdd95f..905caa155 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1052,7 +1047,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_021-associating.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_021-associating.html
index 78efd9fb9..9ee601376 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_021-associating.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_021-associating.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1079,7 +1074,7 @@ The optional <code>sequence</code> element specifies the order of the action in
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_022-action-semantics.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_022-action-semantics.html
index 186b0442f..7481ab9e2 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_022-action-semantics.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_022-action-semantics.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1098,7 +1093,7 @@ Note though that the results of this caching will only be apparent if the action
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_023-deployment-modes.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_023-deployment-modes.html
index 871ca07e1..f5555e3fe 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_023-deployment-modes.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_023-deployment-modes.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1048,7 +1043,7 @@ However, it would be useful to disaply how for a test or demo system where there
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_024-domain-events.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_024-domain-events.html
index 413b7322f..2146b0cda 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_024-domain-events.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_024-domain-events.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1246,7 +1241,7 @@ However, events can be raised programmatically either by calling the <a href="..
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_025-execution-publishing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_025-execution-publishing.html
index 1adf77eb9..e55895d68 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_025-execution-publishing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_025-execution-publishing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1066,7 +1061,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_026-command-processing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_026-command-processing.html
index d544f3084..c55792e1f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_026-command-processing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_026-command-processing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1195,7 +1190,7 @@ The effect is to ignore it for replay purposes:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_027-collection-types.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_027-collection-types.html
index 1fb49c649..23843cc49 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_027-collection-types.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_027-collection-types.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1031,7 +1026,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_030-see-also.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_030-see-also.html
index ffa91e431..7695af5e0 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_030-see-also.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Action_030-see-also.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1055,7 +1050,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html
index 9c3c3d2e1..4ad95545f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1065,7 +1060,7 @@ This is specifically so that boilerplate-busting tools such as <a href="https://
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html
index 128dd3065..6c6a933bb 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_021-defaultView.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1042,7 +1037,7 @@ This attribute can be used to select any of these alternative views instead.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_022-paged.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_022-paged.html
index 9be943694..00fee66e8 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_022-paged.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_022-paged.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1048,7 +1043,7 @@ public class Order {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html
index 080d69c11..71dff8068 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_023-describedAs.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1031,7 +1026,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html
index 9a227dea0..4cc01c42f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_024-sortedBy.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1056,7 +1051,7 @@ public class ToDoItem implements Comparable&lt;ToDoItem&gt; {         <i class="
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html
index 98f474b8e..2049f8510 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_025-cssClass.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1031,7 +1026,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_026-named.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_026-named.html
index 45345a9ff..c64081e26 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_026-named.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_026-named.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1054,7 +1049,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_027-hidden.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_027-hidden.html
index 18c34aa6f..7e60e2b9e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_027-hidden.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/CollectionLayout_027-hidden.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1069,7 +1064,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_010-examples-and-usage.html
index 6a86afd0f..3fe151a43 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1071,7 +1066,7 @@ This is so that boilerplate-busting tools such as <a href="https://projectlombok
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_021_domainEvent.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_021_domainEvent.html
index 604b11e5f..80a0dfc0e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_021_domainEvent.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_021_domainEvent.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1228,7 +1223,7 @@ However, events can be raised programmatically either by calling the <a href="..
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_022_hidden.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_022_hidden.html
index 1e1690cac..d8639a35f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_022_hidden.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_022_hidden.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1069,7 +1064,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_023_typeOf.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_023_typeOf.html
index 753306934..25d788fb0 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_023_typeOf.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Collection_023_typeOf.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1043,7 +1038,7 @@ public void Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html
index d76630404..0cc82f914 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1048,7 +1043,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html
index ea51d812c..a994bd348 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_021-describedAs.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1027,7 +1022,7 @@ public class ProspectiveSale {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html
index ef73c7d7e..59bd8fa28 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_022-cssClass.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ public class ToDoItem { /* ... */ }</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html
index a71e9d509..584a9f2b7 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_023-cssClassFa.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1049,7 +1044,7 @@ The <code>fa-</code> prefix can also be omitted from the class names; it will be
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_024-named.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_024-named.html
index ea0a5bc48..e56897be3 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_024-named.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_024-named.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1066,7 +1061,7 @@ public class Child {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html
index 3ca5a85f4..3514713a0 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_025-bookmarking.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1065,7 +1060,7 @@ public abstract class Unit {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html
index e2a30b750..15b4ec683 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_026-paged.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1043,7 +1038,7 @@ public class Order {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html
index 4a94492e7..61d447041 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObjectLayout_027-ui-events.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1242,7 +1237,7 @@ public class SomeSubscriber {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html
index 2ce33884c..f281297ab 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1114,7 +1109,7 @@ If you are using view models heavily, you may wish to restrict yourself to just
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_021-logicalTypeName.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_021-logicalTypeName.html
index 76263f827..a1d05e300 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_021-logicalTypeName.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_021-logicalTypeName.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1110,7 +1105,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_022-nature.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_022-nature.html
index d3d9e6560..73b606251 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_022-nature.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_022-nature.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1123,7 +1118,7 @@ If you are using view models heavily, you may wish to restrict yourself to just
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_023-editing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_023-editing.html
index 3cdb63f9c..eaff48556 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_023-editing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_023-editing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1073,7 +1068,7 @@ public class Country {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_024-domain-events.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_024-domain-events.html
index 7795a1488..b058e5b84 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_024-domain-events.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_024-domain-events.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1267,7 +1262,7 @@ Even easier, <code>event#getSubject()</code> will always return the domain objec
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html
index 0288e2db1..954d163b1 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_025-lifecycle-events.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1414,7 +1409,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html
index f62e4211b..85b939a43 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_026-entityChangePublishing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1057,7 +1052,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_027-bounding.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_027-bounding.html
index 0eb35d5ef..b300ba3ba 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_027-bounding.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_027-bounding.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1054,7 +1049,7 @@ However, if there is no realistic upper bound to the number of instances of an e
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html
index d14325001..a81a03f1a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_028-autoCompleteRepository.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1133,7 +1128,7 @@ public class Customers {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html
index bc11faddd..be1a5e028 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_029-mixinMethod.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1071,7 +1066,7 @@ Alternatively, when using <a href="../Action.html" class="xref page">@Action</a>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_040-see-also.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_040-see-also.html
index 463184e92..22bb9e686 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_040-see-also.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainObject_040-see-also.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1026,7 +1021,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html
index e2fc1e9bb..8e3d729ca 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1011,7 +1006,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html
index 99723516b..c91f45059 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_021-menuBar.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1060,7 +1055,7 @@ The <a href="../../../../../../vro/latest/about.html" class="xref page">RestfulO
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_022-named.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_022-named.html
index d6a684582..a70624a8a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_022-named.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainServiceLayout_022-named.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1025,7 +1020,7 @@ public class CustomerRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html
index 68f9c2ee1..1b8500bf4 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1011,7 +1006,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_021-objectType.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_021-objectType.html
index bb0586d20..cae3b2664 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_021-objectType.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_021-objectType.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1107,7 +1102,7 @@ An error message will be printed in the log to help you determine which classes
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_022-nature.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_022-nature.html
index 7eae66582..f93fb6647 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_022-nature.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/DomainService_022-nature.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1076,7 +1071,7 @@ public class LoanRepository {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Facets_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Facets_010-examples-and-usage.html
index d2e8341fb..4b39492e4 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Facets_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Facets_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1006,7 +1001,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html
index 486de2095..68ddd1a23 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/HomePage_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1046,7 +1041,7 @@ public class TodoAppDashboard {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html
index 0702af253..4664f410b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/InteractionScope_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1006,7 +1001,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html
index 22a1bcaec..5b4aa280b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/MinLength_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1006,7 +1001,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html
index a4f0748cb..657158305 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1052,7 +1047,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html
index 86319f707..a51e61439 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_021-labelPosition.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1070,7 +1065,7 @@ At the time of writing, this means labels are to the left for all datatypes exce
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html
index f29e33312..baf9aeac9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_022-multiLine.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1034,7 +1029,7 @@ It is ignored for other parameter types.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html
index 8fc72990d..b3c94b245 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_023-describedAs.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1034,7 +1029,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html
index 57499ea41..5a742bc66 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_024-cssClass.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1031,7 +1026,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html
index 8edc241e1..66fec4f92 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_025-renderDay.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1042,7 +1037,7 @@ In such cases there would typically be <code>startDate</code> and <code>endDate<
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_026-named.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_026-named.html
index 93a80ce04..e2989ed18 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_026-named.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_026-named.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1057,7 +1052,7 @@ Examples of that include a name that would be a reserved Java keyword (eg "packa
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html
index d87f16ed0..15499d0c7 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/ParameterLayout_027-typicalLength.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1052,7 +1047,7 @@ All that said, the <a href="../../../../../../vw/latest/about.html" class="xref
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html
index fc0e6ca72..d49f1dcbd 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1051,7 +1046,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_021-optionality.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_021-optionality.html
index a58756412..143fb1321 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_021-optionality.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_021-optionality.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1053,7 +1048,7 @@ If optionality is required, then use the corresponding wrapper class (e.g. <code
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_022-maxLength.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_022-maxLength.html
index 07dd3c697..2bf7d461d 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_022-maxLength.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_022-maxLength.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1028,7 +1023,7 @@ It is ignored if applied to parameters of any other type.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html
index 4eeb510e3..c88fbf2f6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_023-mustSatisfy.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1106,7 +1101,7 @@ This defines the API:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_024-regexPattern.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_024-regexPattern.html
index 3aeabb306..27f1cfd12 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_024-regexPattern.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_024-regexPattern.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1056,7 +1051,7 @@ The values are those that would normally be passed to <code>java.util.regex.Patt
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_025-fileAccept.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_025-fileAccept.html
index 1850a0d0b..a7712f119 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_025-fileAccept.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Parameter_025-fileAccept.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1037,7 +1032,7 @@ or <a href="../../value/Clob.html" class="xref page">Clob</a> parameters, indica
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html
index e6922282f..dd3995cc1 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Programmatic_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1029,7 +1024,7 @@ For example:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html
index 6dcac784d..9afbd38c0 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1066,7 +1061,7 @@ so that boilerplate-busting tools such as <a href="https://projectlombok.org/">P
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html
index 65a56f99c..21c7a1a3a 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_021_labelPosition.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1069,7 +1064,7 @@ At the time of writing, this means labels are to the left for all datatypes exce
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html
index 1e3b82949..1988f0f90 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_022_promptStyle.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1044,7 +1039,7 @@ Note that the value <code>INLINE_AS_IF_EDIT</code> does not make sense for prope
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html
index 556c0d248..cd460ffd2 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_023_multiLine.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1038,7 +1033,7 @@ public class BugReport {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_024_navigable.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_024_navigable.html
index e3590540d..d6f8f3d31 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_024_navigable.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_024_navigable.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1047,7 +1042,7 @@ public class Employee {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html
index d469ef0fc..0a13dc40b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_025_describedAs.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1031,7 +1026,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html
index b2ad020c2..3130e51bc 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_026_cssClass.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1030,7 +1025,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html
index 9947a6a11..7a7b177fc 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_027_renderDay.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1045,7 +1040,7 @@ public class Tenancy {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_028_repainting.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_028_repainting.html
index 5f2202dc3..722e1b62e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_028_repainting.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_028_repainting.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1053,7 +1048,7 @@ public class Document {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_029_named.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_029_named.html
index e2745342b..698319add 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_029_named.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_029_named.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1055,7 +1050,7 @@ public class ToDoItem {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_030_hidden.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_030_hidden.html
index 7fb0ee26a..52e0c723e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_030_hidden.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_030_hidden.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1108,7 +1103,7 @@ Annotating with <code>@Property(where=Where.NOWHERE)</code> overrides this.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html
index 53cb7b972..e45a99149 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/PropertyLayout_31_typicalLength.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1046,7 +1041,7 @@ All that said, the <a href="../../../../../../vw/latest/about.html" class="xref
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_010-examples-and-usage.html
index 24f6a54eb..6922d8e87 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1068,7 +1063,7 @@ so that boilerplate-busting tools such as <a href="https://projectlombok.org/">P
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_021-optionality.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_021-optionality.html
index f711eb1f8..0c338d122 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_021-optionality.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_021-optionality.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1186,7 +1181,7 @@ If optionality is required, then use the corresponding wrapper class (e.g. <code
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_022-editing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_022-editing.html
index a9a32524f..195297e6e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_022-editing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_022-editing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1055,7 +1050,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_023-maxLength.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_023-maxLength.html
index e39becbf5..c1171fc2b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_023-maxLength.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_023-maxLength.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1085,7 +1080,7 @@ For these non persistable properties the <code>maxLength</code> attribute is sti
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_024-mustSatisfy.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_024-mustSatisfy.html
index 8cdb7e3be..9518aa438 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_024-mustSatisfy.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_024-mustSatisfy.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1095,7 +1090,7 @@ Rather than implement <code>Specification</code>, instead implement <code>Specif
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_025-projecting.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_025-projecting.html
index 88e8c0410..8494042a9 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_025-projecting.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_025-projecting.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1057,7 +1052,7 @@ public InvoiceSummary {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_026-domain-events.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_026-domain-events.html
index 1a10b828a..d165d082f 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_026-domain-events.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_026-domain-events.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1241,7 +1236,7 @@ However, events can be raised programmatically either by calling the <a href="..
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_027-execution-publishing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_027-execution-publishing.html
index 34c7812b4..3e32acc0e 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_027-execution-publishing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_027-execution-publishing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1065,7 +1060,7 @@ public class Order {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_028-command-processing.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_028-command-processing.html
index 5ab64997e..cbc0a94fd 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_028-command-processing.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_028-command-processing.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1127,7 +1122,7 @@ The <code>CommandDtoProcessor.Null</code> class provides a convenience implement
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_029-regexPattern.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_029-regexPattern.html
index 709fc8df5..26bffd180 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_029-regexPattern.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_029-regexPattern.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1063,7 +1058,7 @@ public class Customer {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_030-snapshot.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_030-snapshot.html
index 51b9e0cd1..71479069d 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_030-snapshot.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_030-snapshot.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1040,7 +1035,7 @@ public class Order {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_031-fileAccept.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_031-fileAccept.html
index 0eaf3bb01..f4b82b656 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_031-fileAccept.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_031-fileAccept.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1037,7 +1032,7 @@ public class ScannedDocument {
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_033-hidden.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_033-hidden.html
index 68e416389..2f4cbe5b6 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_033-hidden.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Property_033-hidden.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1111,7 +1106,7 @@ Annotating with <code>@Property(where=Where.NOWHERE)</code> overrides this.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Title_010-examples-and-usage.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Title_010-examples-and-usage.html
index 2018dd0ac..5db80dd95 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Title_010-examples-and-usage.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/annotation/hooks/Title_010-examples-and-usage.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1075,7 +1070,7 @@ This convention can be overridden using <code>@Property(where=Where.NOWHERE)</co
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/client/RepresentationTypeSimplifiedV2.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/client/RepresentationTypeSimplifiedV2.html
index 3f4febca6..c2ffb8c3b 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/client/RepresentationTypeSimplifiedV2.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/client/RepresentationTypeSimplifiedV2.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1169,7 +1164,7 @@ final String typeLiteral;
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/client/SuppressionType.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/client/SuppressionType.html
index ec91e6c2b..16ca51ab0 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/client/SuppressionType.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/client/SuppressionType.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1141,7 +1136,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/clock/VirtualClock.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/clock/VirtualClock.html
index 84c65da2a..52a63b125 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/clock/VirtualClock.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/clock/VirtualClock.html
@@ -69,21 +69,16 @@
             <span class="navbar-item navbar-heading">Persistence</span>
             <a class="navbar-item" href="../../../../../pjpa/2.0.0-RC1/about.html">JPA (EclipseLink)</a>
             <a class="navbar-item" href="../../../../../pjdo/2.0.0-RC1/about.html">JDO (DataNucleus)</a>
+            <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/bypass/about.html">Bypass (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/shiro/about.html">Shiro (Authenticator & Authorizor)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/spring/about.html">Spring (Authenticator only)</a>
             <a class="navbar-item" href="../../../../../security/2.0.0-RC1/keycloak/about.html">Keycloak (Authenticator only)</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Catalogs</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types</a>
             <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions</a>
+            <span class="navbar-item navbar-heading">Catalogues</span>
+            <a class="navbar-item" href="../../../../../valuetypes/2.0.0-RC1/about.html">Value Types (for use in apps)</a>
+            <a class="navbar-item" href="../../../../../extensions/2.0.0-RC1/about.html">Extensions (extending the framework itself)</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -1938,7 +1933,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: 2.0.0-M9.20230318-0234-d7dedb1b</p>
+            <p>Revision: 2.0.0-M9.20230321-0227-3354cbb5</p>
         </div>
     </div>
 </footer>
diff --git a/content/refguide/2.0.0-SNAPSHOT/applib/index/domain/DomainObjectList.html b/content/refguide/2.0.0-SNAPSHOT/applib/index/domain/DomainObjectList.html
index a68412ad1..d58d8e294 100644
--- a/content/refguide/2.0.0-SNAPSHOT/applib/index/domain/DomainObjectList.html
+++ b/content/refguide/2.0.0-SNAPSHOT/applib/index/domain/DomainObjectList.html
@@ -69,21 +69,16 @@
... 47599 lines suppressed ...