You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/04/01 11:54:29 UTC

[isis-site] 02/03: ISIS-2484: updates to website

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/isis-site.git

commit ddb4777209fdfc6061a726205d970bf40878c459
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 1 12:33:57 2021 +0100

    ISIS-2484: updates to website
---
 content/404.html                                   |    5 +-
 content/comguide/2.0.0-M5/about.html               |   57 +-
 content/comguide/2.0.0-M5/algolia-search.html      |   64 +-
 .../2.0.0-M5/antora-publish-procedure.html         |   57 +-
 content/comguide/2.0.0-M5/applying-patches.html    |   62 +-
 content/comguide/2.0.0-M5/cutting-a-release.html   |   66 +-
 content/comguide/2.0.0-M5/key-generation.html      |   70 +-
 .../comguide/2.0.0-M5/merging-a-pull-request.html  |   60 +-
 content/comguide/2.0.0-M5/pmc-notes.html           |   66 +-
 content/comguide/2.0.0-M5/policies.html            |   70 +-
 content/comguide/2.0.0-M5/policies/git-policy.html |   57 +-
 .../2.0.0-M5/policies/versioning-policy.html       |   57 +-
 .../comguide/2.0.0-M5/post-release-successful.html |  162 +-
 .../2.0.0-M5/post-release-unsuccessful.html        |   63 +-
 .../comguide/2.0.0-M5/release-process-prereqs.html |   70 +-
 ...ying-patches.html => updating-the-website.html} |  239 +-
 content/comguide/2.0.0-M5/verifying-releases.html  |   58 +-
 content/conguide/2.0.0-M5/about.html               |    5 +-
 content/conguide/2.0.0-M5/agilej/about.html        |    5 +-
 .../conguide/2.0.0-M5/building-apache-isis.html    |    5 +-
 content/conguide/2.0.0-M5/contributing.html        |    5 +-
 content/conguide/2.0.0-M5/documentation/about.html |    5 +-
 .../2.0.0-M5/documentation/asciidoc-syntax.html    |    5 +-
 .../documentation/building-docs-and-website.html   |   35 +-
 .../conguide/2.0.0-M5/documentation/tooling.html   |    5 +-
 .../Apache-Isis-code-style-cleanup.xml             |  146 +-
 .../_attachments/Apache-code-style-formatting.xml  |  592 ++---
 .../_attachments/Apache-code-style-template.xml    |   96 +-
 content/conguide/2.0.0-M5/eclipse/about.html       |    5 +-
 content/conguide/2.0.0-M5/git/about.html           |    5 +-
 .../_attachments/Apache-Isis-importorder.xml       |  120 +-
 content/conguide/2.0.0-M5/intellij/about.html      |    5 +-
 ...ag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg |    0
 ...ag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg |    0
 ...ag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg |    0
 ...ag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg |    0
 ...ag-14772700eda20fa11b253c46866367e33f4a263b.svg |    0
 ...ag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg |    0
 ...ag-412761b61755a662695ad967fe8bff44034633b1.svg |    0
 ...ag-415bb880da3d6291f07b2309b72c30d23e203862.svg |    0
 ...ag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg |    0
 ...ag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg |    0
 ...ag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg |    0
 ...ag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg |    0
 ...ag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg |    0
 ...ag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg |    0
 ...ag-8414526961173c7544fb1cd428be58cb7d649d23.svg |    0
 ...ag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg |    0
 ...ag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg |    0
 ...ag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg |    0
 ...ag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg |    0
 ...ag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg |    0
 ...ag-9a41e0a9cd62ff42635c6def5baef38282722299.svg |    0
 ...ag-a02d72d118f555411ac927d71e37d031eee3f467.svg |    0
 ...ag-a1eef212f9499278372b4df33828b0639e41657b.svg |    0
 ...ag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg |    0
 ...ag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg |    0
 ...ag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg |    0
 ...ag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg |    0
 ...ag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg |    0
 ...ag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg |    0
 ...ag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg |    0
 ...ag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg |    0
 ...ag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg |    0
 ...ag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg |    0
 ...g-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg} |   14 +-
 ...ag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg |    0
 ...ag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg |    0
 ...ag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg |    0
 ...ag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg |    0
 ...ag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg |    0
 .../2.0.0-M5/_overview/about.html                  |  647 +----
 content/core/2.0.0-M5/about.html                   |    7 +-
 content/core/2.0.0-M5/archdesign/about.html        |    5 +-
 content/core/2.0.0-M5/codegen-bytebuddy/about.html |    5 +-
 content/core/2.0.0-M5/commons/about.html           |    5 +-
 .../commons/concurrent-task-list-UNUSED.html       |    5 +-
 content/core/2.0.0-M5/interaction/about.html       |    5 +-
 .../core/2.0.0-M5/internaltestsupport/about.html   |    5 +-
 content/core/2.0.0-M5/metamodel/about.html         |    5 +-
 content/core/2.0.0-M5/metamodel/class-diagram.html |    5 +-
 content/core/2.0.0-M5/regressiontests/about.html   |    5 +-
 content/core/2.0.0-M5/runtime/about.html           |    5 +-
 content/core/2.0.0-M5/runtimeservices/about.html   |    5 +-
 content/core/2.0.0-M5/transaction/about.html       |    5 +-
 content/core/2.0.0-M5/webapp/about.html            |    5 +-
 content/core/2.0.0-M5/webapp/webmodules.html       |    5 +-
 .../_attachments}/Pawson-Naked-Objects-thesis.pdf  |  Bin
 content/docs/2.0.0-M5/about.html                   |   23 +-
 content/docs/2.0.0-M5/archive/1-x.html             |    9 +-
 content/docs/2.0.0-M5/demo/about.html              |    9 +-
 content/docs/2.0.0-M5/downloads/how-to.html        |    9 +-
 .../going-deeper/articles-and-presentations.html   |    9 +-
 content/docs/2.0.0-M5/going-deeper/books.html      |    9 +-
 content/docs/2.0.0-M5/landing-page/components.html |   19 +-
 content/docs/2.0.0-M5/landing-page/guides.html     |    9 +-
 content/docs/2.0.0-M5/landing-page/internal.html   |    9 +-
 content/docs/2.0.0-M5/landing-page/libraries.html  |    9 +-
 content/docs/2.0.0-M5/landing-page/releases.html   |    9 +-
 content/docs/2.0.0-M5/mavendeps/about.html         |   13 +-
 content/docs/2.0.0-M5/more-thanks/more-thanks.html |    9 +-
 content/docs/2.0.0-M5/parent-pom/about.html        |    9 +-
 content/docs/2.0.0-M5/resources/about.html         |    9 +-
 content/docs/2.0.0-M5/resources/cheatsheet.html    |    9 +-
 content/docs/2.0.0-M5/resources/icons.html         |    9 +-
 content/docs/2.0.0-M5/starters/about.html          |    9 +-
 .../2.0.0-M5/starters/helloworld-script-jdo.html   |    9 +-
 .../2.0.0-M5/starters/helloworld-script-jpa.html   |    9 +-
 content/docs/2.0.0-M5/starters/helloworld.html     |   13 +-
 .../2.0.0-M5/starters/simpleapp-script-jdo.html    |    9 +-
 .../2.0.0-M5/starters/simpleapp-script-jpa.html    |    9 +-
 content/docs/2.0.0-M5/starters/simpleapp.html      |   13 +-
 content/docs/2.0.0-M5/support/about.html           |    9 +-
 content/docs/2.0.0-M5/support/mailing-list.html    |    9 +-
 content/docs/2.0.0-M5/support/slack-channel.html   |    9 +-
 .../what-is-apache-isis/common-use-cases.html      |    9 +-
 .../what-is-apache-isis/isis-in-pictures.html      |   19 +-
 .../2.0.0-M5/what-is-apache-isis/powered-by.html   |    9 +-
 .../what-is-apache-isis/powered-by/commapp.html    |    9 +-
 .../what-is-apache-isis/powered-by/contactapp.html |    9 +-
 .../what-is-apache-isis/powered-by/cqnz.html       |    9 +-
 .../what-is-apache-isis/powered-by/estatio.html    |    9 +-
 .../powered-by/gesconsultor-grc.html               |    9 +-
 .../powered-by/transport-planner.html              |    9 +-
 .../what-is-apache-isis/screencasts-older.html     |    9 +-
 .../2.0.0-M5/what-is-apache-isis/screencasts.html  |    9 +-
 .../what-is-apache-isis/screencasts/playlists.html |    9 +-
 content/extensions/2.0.0-M5/about.html             |   72 +-
 content/extensions/2.0.0-M5/command-log/about.html |   73 +-
 .../extensions/2.0.0-M5/command-replay/about.html  |   67 +-
 .../2.0.0-M5/model-annotation/about.html           |   73 +-
 content/incubator/2.0.0-M5/about.html              |    5 +-
 .../2.0.0-M5/kroviz/DevelopmentGuide.html          |    5 +-
 content/incubator/2.0.0-M5/kroviz/UsersGuide.html  |    5 +-
 .../2.0.0-M5/kroviz/_images/Extinction_Symbol.svg  |   78 +-
 .../2.0.0-M5/kroviz/_images/kroviz-logo.svg        |  112 +-
 content/incubator/2.0.0-M5/kroviz/about.html       |    5 +-
 content/incubator/2.0.0-M5/kroviz/credits.html     |    5 +-
 .../incubator/2.0.0-M5/kroviz/regression-test.html |    5 +-
 content/incubator/2.0.0-M5/microprofile/about.html |    5 +-
 content/incubator/2.0.0-M5/vaadin/about.html       |    5 +-
 content/index.html                                 |   22 +-
 content/legacy/2.0.0-M5/about.html                 |    5 +-
 content/legacy/2.0.0-M5/applib/about.html          |    5 +-
 content/legacy/2.0.0-M5/commons/about.html         |    5 +-
 content/legacy/2.0.0-M5/metamodel/about.html       |    5 +-
 content/legacy/2.0.0-M5/restclient/about.html      |    5 +-
 content/legacy/2.0.0-M5/runtime/about.html         |    5 +-
 content/legacy/2.0.0-M5/servletapi/about.html      |    5 +-
 content/mappings/2.0.0-M5/about.html               |    5 +-
 content/mappings/2.0.0-M5/jaxrsclient/about.html   |    5 +-
 content/mappings/2.0.0-M5/minio/about.html         |    5 +-
 .../mappings/2.0.0-M5/outbox-publisher/about.html  |    5 +-
 content/mappings/2.0.0-M5/restclient/about.html    |    5 +-
 content/mappings/2.0.0-M5/slack/about.html         |    5 +-
 content/pjdo/2.0.0-M5/about.html                   |   54 +-
 content/pjdo/2.0.0-M5/configuring/bulk-load.html   |  497 ----
 .../disabling-persistence-by-reachability.html     |   46 +-
 .../pjdo/2.0.0-M5/configuring/persistence-xml.html |  488 ----
 content/pjdo/2.0.0-M5/configuring/properties.html  |  459 ----
 .../configuring/using-jndi-data-source.html        |  551 -----
 content/pjdo/2.0.0-M5/db-schemas.html              |  136 +-
 ...{configuring.html => dependency-injection.html} |   70 +-
 content/pjdo/2.0.0-M5/hints-and-tips.html          |   58 +-
 .../hints-and-tips/diagnosing-n-plus-1.html        |   33 +-
 content/pjdo/2.0.0-M5/hints-and-tips/java8.html    |   33 +-
 .../hints-and-tips/jdoql-and-timestamps.html       |   33 +-
 .../hints-and-tips/overriding-jdo-annotations.html |   35 +-
 .../subtype-entity-not-fully-populated.html        |   33 +-
 .../typesafe-queries-and-fetchgroups.html          |   33 +-
 content/pjdo/2.0.0-M5/jdo-mappings.html            |  977 --------
 .../{configuring.html => mapping-guide.html}       |   96 +-
 .../mandatory-properties-in-subtypes.html          |   48 +-
 .../mapping-to-a-view.html                         |   48 +-
 .../one-to-m-bidirectional-relationships.html      |   48 +-
 content/pjdo/2.0.0-M5/services/IsisJdoSupport.html |  747 ------
 .../2.0.0-M5/setup-and-configuration.html}         |  517 ++--
 content/pjpa/2.0.0-M5/about.html                   |   43 +-
 content/{pjdo => pjpa}/2.0.0-M5/db-schemas.html    |  147 +-
 .../{about.html => dependency-injection.html}      |   66 +-
 .../2.0.0-M5/{about.html => domain-services.html}  |   65 +-
 .../2.0.0-M5/{about.html => mapping-guide.html}    |   77 +-
 .../2.0.0-M5/setup-and-configuration.html}         |  237 +-
 content/refguide/2.0.0-M5/about.html               |   11 +-
 content/refguide/2.0.0-M5/applib-ant/Column.html   |    5 +-
 content/refguide/2.0.0-M5/applib-ant/Digits.html   |    5 +-
 .../2.0.0-M5/applib-ant/Discriminator.html         |    5 +-
 .../2.0.0-M5/applib-ant/NotPersistent.html         |    5 +-
 content/refguide/2.0.0-M5/applib-ant/Nullable.html |    5 +-
 content/refguide/2.0.0-M5/applib-ant/Pattern.html  |    5 +-
 .../2.0.0-M5/applib-ant/PersistenceCapable.html    |    5 +-
 .../refguide/2.0.0-M5/applib-ant/PrimaryKey.html   |    5 +-
 .../2.0.0-M5/applib-ant/XmlJavaTypeAdapter.html    |    5 +-
 .../2.0.0-M5/applib-ant/XmlRootElement.html        |    5 +-
 content/refguide/2.0.0-M5/applib-ant/about.html    |    5 +-
 .../2.0.0-M5/applib-ant/about/hooks/examples.html  |    5 +-
 .../refguide/2.0.0-M5/applib-ant/about/jdo.html    |    5 +-
 .../refguide/2.0.0-M5/applib-ant/about/jee.html    |    5 +-
 .../refguide/2.0.0-M5/applib-ant/about/jpa.html    |    5 +-
 .../refguide/2.0.0-M5/applib-ant/about/main.html   |    5 +-
 .../refguide/2.0.0-M5/applib-ant/about/other.html  |    5 +-
 .../2.0.0-M5/applib-ant/about/partial.html         |    5 +-
 .../refguide/2.0.0-M5/applib-classes/about.html    |    5 +-
 .../refguide/2.0.0-M5/applib-classes/events.html   |    5 +-
 .../applib-classes/events/domainevent.html         |    5 +-
 .../applib-classes/events/lifecycleevent.html      |    5 +-
 .../2.0.0-M5/applib-classes/events/uievent.html    |    5 +-
 .../refguide/2.0.0-M5/applib-classes/layout.html   |    5 +-
 .../2.0.0-M5/applib-classes/layout/menubars.html   |    5 +-
 .../applib-classes/layout/object-layout.html       |    5 +-
 .../2.0.0-M5/applib-classes/mixees-and-mixins.html |    7 +-
 .../applib-classes/non-persisted-objects.html      |    5 +-
 .../roles-mixins-contributees/contributee.html     |   11 +-
 .../roles-mixins-contributees/mixins.html          |    5 +-
 content/refguide/2.0.0-M5/applib-classes/spec.html |    5 +-
 .../refguide/2.0.0-M5/applib-classes/utility.html  |    5 +-
 .../2.0.0-M5/applib-classes/value-types.html       |    5 +-
 .../refguide/2.0.0-M5/applib-methods/about.html    |    5 +-
 .../2.0.0-M5/applib-methods/lifecycle.html         |    5 +-
 .../2.0.0-M5/applib-methods/lifecycle/created.html |    5 +-
 .../2.0.0-M5/applib-methods/lifecycle/loaded.html  |    5 +-
 .../applib-methods/lifecycle/persisted.html        |    5 +-
 .../applib-methods/lifecycle/persisting.html       |    5 +-
 .../applib-methods/lifecycle/removing.html         |    5 +-
 .../2.0.0-M5/applib-methods/lifecycle/updated.html |    5 +-
 .../applib-methods/lifecycle/updating.html         |    5 +-
 .../refguide/2.0.0-M5/applib-methods/prefixes.html |    5 +-
 .../applib-methods/prefixes/autoComplete.html      |    5 +-
 .../2.0.0-M5/applib-methods/prefixes/choices.html  |    5 +-
 .../2.0.0-M5/applib-methods/prefixes/default.html  |    5 +-
 .../2.0.0-M5/applib-methods/prefixes/disable.html  |    5 +-
 .../2.0.0-M5/applib-methods/prefixes/get.html      |    5 +-
 .../2.0.0-M5/applib-methods/prefixes/hide.html     |    5 +-
 .../2.0.0-M5/applib-methods/prefixes/set.html      |    5 +-
 .../2.0.0-M5/applib-methods/prefixes/validate.html |    5 +-
 .../refguide/2.0.0-M5/applib-methods/ui-hints.html |    5 +-
 .../2.0.0-M5/applib-methods/ui-hints/cssClass.html |    5 +-
 .../2.0.0-M5/applib-methods/ui-hints/iconName.html |    5 +-
 .../2.0.0-M5/applib-methods/ui-hints/layout.html   |    5 +-
 .../2.0.0-M5/applib-methods/ui-hints/title.html    |    5 +-
 content/refguide/2.0.0-M5/applib-svc/about.html    |    9 +-
 .../2.0.0-M5/applib/index/AbstractViewModel.html   |    5 +-
 .../refguide/2.0.0-M5/applib/index/Identifier.html |    5 +-
 .../2.0.0-M5/applib/index/IsisModuleApplib.html    |    5 +-
 .../applib/index/RecreatableDomainObject.html      |    5 +-
 .../refguide/2.0.0-M5/applib/index/ViewModel.html  |    5 +-
 .../adapters/AbstractValueSemanticsProvider.html   |    5 +-
 .../applib/index/adapters/DefaultsProvider.html    |    5 +-
 .../applib/index/adapters/EncoderDecoder.html      |    5 +-
 .../applib/index/adapters/EncodingException.html   |    5 +-
 .../2.0.0-M5/applib/index/adapters/Parser.html     |    5 +-
 .../applib/index/adapters/ParsingException.html    |    5 +-
 .../index/adapters/ValueSemanticsProvider.html     |    5 +-
 .../2.0.0-M5/applib/index/annotation/Action.html   |    5 +-
 .../applib/index/annotation/ActionLayout.html      |    5 +-
 .../applib/index/annotation/BookmarkPolicy.html    |    5 +-
 .../2.0.0-M5/applib/index/annotation/Bounding.html |    5 +-
 .../applib/index/annotation/Collection.html        |    5 +-
 .../applib/index/annotation/CollectionLayout.html  |    5 +-
 .../applib/index/annotation/Defaulted.html         |    5 +-
 .../applib/index/annotation/DomainObject.html      |    5 +-
 .../index/annotation/DomainObjectLayout.html       |    5 +-
 .../applib/index/annotation/DomainService.html     |    5 +-
 .../index/annotation/DomainServiceLayout.html      |    5 +-
 .../annotation/DomainServiceLayout~MenuBar.html    |    5 +-
 .../2.0.0-M5/applib/index/annotation/Editing.html  |    5 +-
 .../applib/index/annotation/EntityChangeKind.html  |    5 +-
 .../applib/index/annotation/EqualByContent.html    |    5 +-
 .../2.0.0-M5/applib/index/annotation/Facets.html   |    5 +-
 .../2.0.0-M5/applib/index/annotation/HomePage.html |    5 +-
 .../applib/index/annotation/InteractionScope.html  |    5 +-
 .../applib/index/annotation/LabelPosition.html     |    5 +-
 .../applib/index/annotation/MemberOrder.html       |    5 +-
 .../applib/index/annotation/MinLength.html         |    5 +-
 .../2.0.0-M5/applib/index/annotation/Module.html   |    5 +-
 .../2.0.0-M5/applib/index/annotation/Nature.html   |    5 +-
 .../applib/index/annotation/NatureOfService.html   |    5 +-
 .../applib/index/annotation/Navigable.html         |    5 +-
 .../applib/index/annotation/Optionality.html       |    5 +-
 .../applib/index/annotation/OrderPrecedence.html   |    5 +-
 .../applib/index/annotation/Parameter.html         |    5 +-
 .../applib/index/annotation/ParameterLayout.html   |    5 +-
 .../applib/index/annotation/Programmatic.html      |    5 +-
 .../applib/index/annotation/Projecting.html        |    5 +-
 .../applib/index/annotation/PromptStyle.html       |    5 +-
 .../2.0.0-M5/applib/index/annotation/Property.html |    5 +-
 .../applib/index/annotation/PropertyLayout.html    |    5 +-
 .../applib/index/annotation/Publishing.html        |    5 +-
 .../2.0.0-M5/applib/index/annotation/Redirect.html |    5 +-
 .../applib/index/annotation/RenderDay.html         |    5 +-
 .../applib/index/annotation/Repainting.html        |    5 +-
 .../applib/index/annotation/RestrictTo.html        |    5 +-
 .../applib/index/annotation/SemanticsOf.html       |    5 +-
 .../2.0.0-M5/applib/index/annotation/Snapshot.html |    5 +-
 .../2.0.0-M5/applib/index/annotation/Title.html    |    5 +-
 .../2.0.0-M5/applib/index/annotation/Value.html    |    5 +-
 .../2.0.0-M5/applib/index/annotation/Where.html    |    5 +-
 .../hooks/ActionLayout_010-examples-and-usage.html |    5 +-
 .../hooks/ActionLayout_021-promptStyle.html        |    5 +-
 .../hooks/ActionLayout_022-position.html           |    5 +-
 .../hooks/ActionLayout_023-describedAs.html        |    5 +-
 .../hooks/ActionLayout_024-cssClass.html           |    5 +-
 .../hooks/ActionLayout_025-cssClassFa.html         |    5 +-
 .../hooks/ActionLayout_026-bookmarking.html        |    5 +-
 .../annotation/hooks/ActionLayout_027-hidden.html  |    5 +-
 .../annotation/hooks/ActionLayout_028-named.html   |    5 +-
 .../hooks/ActionLayout_029-redirect.html           |    5 +-
 .../hooks/Action_010-examples-and-usage.html       |    5 +-
 .../annotation/hooks/Action_021-associating.html   |    5 +-
 .../hooks/Action_022-action-semantics.html         |    5 +-
 .../hooks/Action_023-deployment-modes.html         |    5 +-
 .../annotation/hooks/Action_024-domain-events.html |    5 +-
 .../hooks/Action_025-execution-publishing.html     |    5 +-
 .../hooks/Action_026-command-processing.html       |    5 +-
 .../hooks/Action_027-collection-types.html         |    5 +-
 .../annotation/hooks/Action_030-see-also.html      |    5 +-
 .../CollectionLayout_010-examples-and-usage.html   |    5 +-
 .../hooks/CollectionLayout_021-defaultView.html    |    5 +-
 .../hooks/CollectionLayout_022-paged.html          |    5 +-
 .../hooks/CollectionLayout_023-describedAs.html    |    5 +-
 .../hooks/CollectionLayout_024-sortedBy.html       |    5 +-
 .../hooks/CollectionLayout_025-cssClass.html       |    5 +-
 .../hooks/CollectionLayout_026-named.html          |    5 +-
 .../hooks/CollectionLayout_027-hidden.html         |    5 +-
 .../hooks/Collection_010-examples-and-usage.html   |    5 +-
 .../hooks/Collection_021_domainEvent.html          |    5 +-
 .../annotation/hooks/Collection_022_hidden.html    |    5 +-
 .../annotation/hooks/Collection_023_typeOf.html    |    5 +-
 .../DomainObjectLayout_010-examples-and-usage.html |    5 +-
 .../hooks/DomainObjectLayout_021-describedAs.html  |    5 +-
 .../hooks/DomainObjectLayout_022-cssClass.html     |    5 +-
 .../hooks/DomainObjectLayout_023-cssClassFa.html   |    5 +-
 .../hooks/DomainObjectLayout_024-named.html        |    5 +-
 .../hooks/DomainObjectLayout_025-bookmarking.html  |    5 +-
 .../hooks/DomainObjectLayout_026-paged.html        |    5 +-
 .../hooks/DomainObjectLayout_027-ui-events.html    |    5 +-
 .../hooks/DomainObject_010-examples-and-usage.html |    5 +-
 .../hooks/DomainObject_021-objectType.html         |    5 +-
 .../annotation/hooks/DomainObject_022-nature.html  |    5 +-
 .../annotation/hooks/DomainObject_023-editing.html |    5 +-
 .../hooks/DomainObject_024-domain-events.html      |    5 +-
 .../hooks/DomainObject_025-lifecycle-events.html   |    5 +-
 .../DomainObject_026-entityChangePublishing.html   |    5 +-
 .../hooks/DomainObject_027-bounding.html           |    5 +-
 .../DomainObject_028-autoCompleteRepository.html   |    5 +-
 .../hooks/DomainObject_029-mixinMethod.html        |    5 +-
 .../hooks/DomainObject_040-see-also.html           |    5 +-
 ...DomainServiceLayout_010-examples-and-usage.html |    5 +-
 .../hooks/DomainServiceLayout_021-menuBar.html     |    5 +-
 .../hooks/DomainServiceLayout_022-named.html       |    5 +-
 .../DomainService_010-examples-and-usage.html      |    5 +-
 .../hooks/DomainService_021-objectType.html        |    5 +-
 .../annotation/hooks/DomainService_022-nature.html |    5 +-
 .../hooks/Facets_010-examples-and-usage.html       |    5 +-
 .../hooks/HomePage_010-examples-and-usage.html     |    5 +-
 .../InteractionScope_010-examples-and-usage.html   |    5 +-
 .../hooks/MemberOrder_010-examples-and-usage.html  |    5 +-
 .../hooks/MinLength_010-examples-and-usage.html    |    5 +-
 .../ParameterLayout_010-examples-and-usage.html    |    5 +-
 .../hooks/ParameterLayout_021-labelPosition.html   |    5 +-
 .../hooks/ParameterLayout_022-multiLine.html       |    5 +-
 .../hooks/ParameterLayout_023-describedAs.html     |    5 +-
 .../hooks/ParameterLayout_024-cssClass.html        |    5 +-
 .../hooks/ParameterLayout_025-renderDay.html       |    5 +-
 .../hooks/ParameterLayout_026-named.html           |    5 +-
 .../hooks/ParameterLayout_027-typicalLength.html   |    5 +-
 .../hooks/Parameter_010-examples-and-usage.html    |    5 +-
 .../hooks/Parameter_021-optionality.html           |    5 +-
 .../annotation/hooks/Parameter_022-maxLength.html  |    5 +-
 .../hooks/Parameter_023-mustSatisfy.html           |    5 +-
 .../hooks/Parameter_024-regexPattern.html          |    5 +-
 .../annotation/hooks/Parameter_025-fileAccept.html |    5 +-
 .../hooks/Programmatic_010-examples-and-usage.html |    5 +-
 .../PropertyLayout_010-examples-and-usage.html     |    5 +-
 .../hooks/PropertyLayout_021_labelPosition.html    |    5 +-
 .../hooks/PropertyLayout_022_promptStyle.html      |    5 +-
 .../hooks/PropertyLayout_023_multiLine.html        |    5 +-
 .../hooks/PropertyLayout_024_navigable.html        |    5 +-
 .../hooks/PropertyLayout_025_describedAs.html      |    5 +-
 .../hooks/PropertyLayout_026_cssClass.html         |    5 +-
 .../hooks/PropertyLayout_027_renderDay.html        |    5 +-
 .../hooks/PropertyLayout_028_repainting.html       |    5 +-
 .../annotation/hooks/PropertyLayout_029_named.html |    5 +-
 .../hooks/PropertyLayout_030_hidden.html           |    5 +-
 .../hooks/PropertyLayout_31_typicalLength.html     |    5 +-
 .../hooks/Property_010-examples-and-usage.html     |    5 +-
 .../annotation/hooks/Property_021-optionality.html |    5 +-
 .../annotation/hooks/Property_022-editing.html     |    5 +-
 .../annotation/hooks/Property_023-maxLength.html   |    5 +-
 .../annotation/hooks/Property_024-mustSatisfy.html |    5 +-
 .../annotation/hooks/Property_025-projecting.html  |    5 +-
 .../hooks/Property_026-domain-events.html          |    5 +-
 .../hooks/Property_027-execution-publishing.html   |    5 +-
 .../hooks/Property_028-command-processing.html     |    5 +-
 .../hooks/Property_029-regexPattern.html           |    5 +-
 .../annotation/hooks/Property_030-snapshot.html    |    5 +-
 .../annotation/hooks/Property_031-fileAccept.html  |    5 +-
 .../annotation/hooks/Property_033-hidden.html      |    5 +-
 .../hooks/Title_010-examples-and-usage.html        |    5 +-
 .../client/RepresentationTypeSimplifiedV2.html     |    5 +-
 .../applib/index/client/SuppressionType.html       |    5 +-
 .../2.0.0-M5/applib/index/clock/VirtualClock.html  |    5 +-
 .../applib/index/domain/DomainObjectList.html      |    5 +-
 .../applib/index/events/EventObjectBase.html       |    5 +-
 .../index/events/domain/AbstractDomainEvent.html   |    5 +-
 .../index/events/domain/ActionDomainEvent.html     |    5 +-
 .../index/events/domain/CollectionDomainEvent.html |    5 +-
 .../index/events/domain/PropertyDomainEvent.html   |    5 +-
 .../events/lifecycle/AbstractLifecycleEvent.html   |    5 +-
 .../index/events/lifecycle/ObjectCreatedEvent.html |    5 +-
 .../index/events/lifecycle/ObjectLoadedEvent.html  |    5 +-
 .../events/lifecycle/ObjectPersistedEvent.html     |    5 +-
 .../events/lifecycle/ObjectPersistingEvent.html    |    5 +-
 .../events/lifecycle/ObjectRemovingEvent.html      |    5 +-
 .../index/events/lifecycle/ObjectUpdatedEvent.html |    5 +-
 .../events/lifecycle/ObjectUpdatingEvent.html      |    5 +-
 .../applib/index/events/ui/AbstractUiEvent.html    |    5 +-
 .../applib/index/events/ui/CssClassUiEvent.html    |    5 +-
 .../applib/index/events/ui/IconUiEvent.html        |    5 +-
 .../applib/index/events/ui/LayoutUiEvent.html      |    5 +-
 .../applib/index/events/ui/TitleUiEvent.html       |    5 +-
 .../index/exceptions/RecoverableException.html     |    5 +-
 .../index/exceptions/TranslatableException.html    |    5 +-
 .../index/exceptions/UnrecoverableException.html   |    5 +-
 .../unrecoverable/DomainModelException.html        |    5 +-
 .../unrecoverable/MetaModelException.html          |    5 +-
 .../unrecoverable/NoAuthenticatorException.html    |    5 +-
 .../unrecoverable/ObjectNotFoundException.html     |    5 +-
 .../unrecoverable/ObjectPersistenceException.html  |    5 +-
 .../unrecoverable/PersistFailedException.html      |    5 +-
 .../unrecoverable/ReflectiveActionException.html   |    5 +-
 .../unrecoverable/RepositoryException.html         |    5 +-
 .../unrecoverable/UnexpectedCallException.html     |    5 +-
 .../unrecoverable/UnknownTypeException.html        |    5 +-
 .../refguide/2.0.0-M5/applib/index/graph/Edge.html |    5 +-
 .../2.0.0-M5/applib/index/graph/SimpleEdge.html    |    5 +-
 .../2.0.0-M5/applib/index/graph/Vertex.html        |    5 +-
 .../applib/index/graph/tree/LazyTreeNode.html      |    5 +-
 .../applib/index/graph/tree/TreeAdapter.html       |    5 +-
 .../2.0.0-M5/applib/index/graph/tree/TreeNode.html |    5 +-
 .../2.0.0-M5/applib/index/graph/tree/TreePath.html |    5 +-
 .../applib/index/graph/tree/TreeState.html         |    5 +-
 .../2.0.0-M5/applib/index/id/HasLogicalType.html   |    5 +-
 .../2.0.0-M5/applib/index/id/LogicalType.html      |    5 +-
 .../2.0.0-M5/applib/index/id/TypeIdentifier.html   | 1047 ---------
 .../applib/index/jaxb/DataTypeFactory.html         |    5 +-
 .../applib/index/jaxb/JavaSqlJaxbAdapters.html     |    5 +-
 .../JavaSqlXMLGregorianCalendarMarshalling.html    |    5 +-
 .../applib/index/jaxb/JavaTimeJaxbAdapters.html    |    5 +-
 .../JavaTimeXMLGregorianCalendarMarshalling.html   |    5 +-
 .../applib/index/jaxb/JavaUtilJaxbAdapters.html    |    5 +-
 .../applib/index/jaxb/JodaTimeJaxbAdapters.html    |    5 +-
 .../JodaTimeXMLGregorianCalendarMarshalling.html   |    5 +-
 .../index/jaxb/PersistentEntitiesAdapter.html      |    5 +-
 .../applib/index/jaxb/PersistentEntityAdapter.html |    5 +-
 .../applib/index/jaxb/PrimitiveJaxbAdapters.html   |    5 +-
 .../index/layout/component/ActionLayoutData.html   |    5 +-
 .../layout/component/ActionLayoutDataOwner.html    |    5 +-
 .../layout/component/CollectionLayoutData.html     |    5 +-
 .../component/CollectionLayoutDataOwner.html       |    5 +-
 .../index/layout/component/CssClassFaPosition.html |    5 +-
 .../layout/component/DomainObjectLayoutData.html   |    5 +-
 .../component/DomainObjectLayoutDataOwner.html     |    5 +-
 .../applib/index/layout/component/FieldSet.html    |    5 +-
 .../index/layout/component/FieldSetOwner.html      |    5 +-
 .../index/layout/component/HasBookmarking.html     |    5 +-
 .../applib/index/layout/component/HasCssClass.html |    5 +-
 .../index/layout/component/HasCssClassFa.html      |    5 +-
 .../index/layout/component/HasDescribedAs.html     |    5 +-
 .../applib/index/layout/component/HasHidden.html   |    5 +-
 .../applib/index/layout/component/HasNamed.html    |    5 +-
 .../index/layout/component/MemberRegion.html       |    5 +-
 .../index/layout/component/MemberRegionOwner.html  |    5 +-
 .../applib/index/layout/component/Owned.html       |    5 +-
 .../applib/index/layout/component/Owner.html       |    5 +-
 .../index/layout/component/PropertyLayoutData.html |    5 +-
 .../layout/component/ServiceActionLayoutData.html  |    5 +-
 .../component/ServiceActionLayoutDataOwner.html    |    5 +-
 .../2.0.0-M5/applib/index/layout/grid/Grid.html    |    5 +-
 .../applib/index/layout/grid/GridAbstract.html     |    5 +-
 .../index/layout/grid/bootstrap3/BS3ClearFix.html  |    5 +-
 .../layout/grid/bootstrap3/BS3ClearFixHidden.html  |    5 +-
 .../layout/grid/bootstrap3/BS3ClearFixVisible.html |    5 +-
 .../index/layout/grid/bootstrap3/BS3Col.html       |    5 +-
 .../index/layout/grid/bootstrap3/BS3Element.html   |    5 +-
 .../layout/grid/bootstrap3/BS3ElementAbstract.html |    5 +-
 .../index/layout/grid/bootstrap3/BS3Grid.html      |    5 +-
 .../index/layout/grid/bootstrap3/BS3Row.html       |    5 +-
 .../layout/grid/bootstrap3/BS3RowContent.html      |    5 +-
 .../layout/grid/bootstrap3/BS3RowContentOwner.html |    5 +-
 .../index/layout/grid/bootstrap3/BS3RowOwner.html  |    5 +-
 .../index/layout/grid/bootstrap3/BS3Tab.html       |    5 +-
 .../index/layout/grid/bootstrap3/BS3TabGroup.html  |    5 +-
 .../layout/grid/bootstrap3/BS3TabGroupOwner.html   |    5 +-
 .../index/layout/grid/bootstrap3/BS3TabOwner.html  |    5 +-
 .../index/layout/grid/bootstrap3/HasCssId.html     |    5 +-
 .../applib/index/layout/grid/bootstrap3/Size.html  |    5 +-
 .../index/layout/grid/bootstrap3/SizeSpan.html     |    5 +-
 .../index/layout/grid/bootstrap3/WithinGrid.html   |    5 +-
 .../2.0.0-M5/applib/index/layout/links/Link.html   |    5 +-
 .../applib/index/layout/menubars/HasNamed.html     |    5 +-
 .../applib/index/layout/menubars/Menu.html         |    5 +-
 .../applib/index/layout/menubars/MenuBar.html      |    5 +-
 .../applib/index/layout/menubars/MenuBars.html     |    5 +-
 .../index/layout/menubars/MenuBarsAbstract.html    |    5 +-
 .../applib/index/layout/menubars/MenuSection.html  |    5 +-
 .../index/layout/menubars/bootstrap3/BS3Menu.html  |    5 +-
 .../layout/menubars/bootstrap3/BS3MenuBar.html     |    5 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.html    |    5 +-
 .../layout/menubars/bootstrap3/BS3MenuSection.html |    5 +-
 .../2.0.0-M5/applib/index/mixins/dto/Dto.html      |    5 +-
 .../applib/index/mixins/dto/DtoMixinConstants.html |    5 +-
 .../applib/index/mixins/dto/Dto_downloadXml.html   |    5 +-
 .../applib/index/mixins/dto/Dto_downloadXsd.html   |    5 +-
 .../index/mixins/dto/hooks/Dto_see-also.html       |    5 +-
 .../index/mixins/layout/LayoutMixinConstants.html  |    5 +-
 .../mixins/layout/Object_downloadLayoutXml.html    |    5 +-
 .../hooks/Object_downloadLayoutXml_see-also.html   |    5 +-
 .../metamodel/Object_downloadMetamodelXml.html     |    5 +-
 .../mixins/metamodel/Object_objectIdentifier.html  |    5 +-
 .../index/mixins/metamodel/Object_objectType.html  |    5 +-
 .../mixins/metamodel/Object_rebuildMetamodel.html  |    5 +-
 .../hooks/Object_rebuildMetamodel_see-also.html    |    5 +-
 .../index/mixins/rest/Object_openRestApi.html      |    5 +-
 .../rest/hooks/Object_openRestApi_see-also.html    |    5 +-
 .../applib/index/mixins/security/HasUsername.html  |    5 +-
 .../index/mixins/system/DomainChangeRecord.html    |    5 +-
 .../DomainChangeRecord_openTargetObject.html       |    5 +-
 .../system/DomainChangeRecord~ChangeType.html      |    5 +-
 .../index/mixins/system/HasInteractionId.html      |    7 +-
 .../index/mixins/system/HasTransactionId.html      |    5 +-
 .../system/hooks/HasInteractionId_see-also.html    |    7 +-
 .../applib/index/mixins/updates/OnUpdatedAt.html   |    5 +-
 .../applib/index/mixins/updates/OnUpdatedBy.html   |    5 +-
 .../index/mixins/updates/OnUpdatedByAndAt.html     |    5 +-
 .../updates/hooks/WithUpdatedAt_usage-notes.html   |    5 +-
 .../hooks/WithUpdatedByAndAt_usage-notes.html      |    5 +-
 .../updates/hooks/WithUpdatedBy_usage-notes.html   |    5 +-
 .../adapters/AbstractValueSemanticsProvider.html   |  934 --------
 .../pages/index/adapters/DefaultsProvider.html     |  974 --------
 .../pages/index/adapters/EncoderDecoder.html       |  998 --------
 .../pages/index/adapters/EncodingException.html    |  938 --------
 .../applib/index/query/AllInstancesQuery.html      |    5 +-
 .../2.0.0-M5/applib/index/query/NamedQuery.html    |    5 +-
 .../2.0.0-M5/applib/index/query/Query.html         |    5 +-
 .../2.0.0-M5/applib/index/query/QueryRange.html    |    5 +-
 .../services/acceptheader/AcceptHeaderService.html |    5 +-
 .../AcceptHeaderService_010-implementation.html    |    5 +-
 ...AcceptHeaderService_020-examples-and-usage.html |    5 +-
 .../index/services/appfeat/ApplicationFeature.html |    5 +-
 .../services/appfeat/ApplicationFeatureId.html     |    5 +-
 .../appfeat/ApplicationFeatureRepository.html      |    5 +-
 .../services/appfeat/ApplicationFeatureSort.html   |    5 +-
 .../services/appfeat/ApplicationMemberSort.html    |    5 +-
 .../services/appfeat/ApplicationMemberType.html    |  940 --------
 ...cationFeatureRepository_010-implementation.html |    5 +-
 ...onFeatureRepository_020-examples-and-usage.html |    5 +-
 .../applib/index/services/bookmark/Bookmark.html   |    5 +-
 .../index/services/bookmark/BookmarkHolder.html    |    5 +-
 .../services/bookmark/BookmarkHolder_lookup.html   |    5 +-
 .../services/bookmark/BookmarkHolder_object.html   |    5 +-
 .../index/services/bookmark/BookmarkService.html   |    5 +-
 .../hooks/BookmarkService_010-implementation.html  |    5 +-
 .../BookmarkService_020-examples-and-usage.html    |    5 +-
 .../services/bookmarkui/BookmarkUiService.html     |    5 +-
 .../BookmarkUiService_010-implementation.html      |    5 +-
 .../BookmarkUiService_020-examples-and-usage.html  |    5 +-
 .../applib/index/services/clock/ClockService.html  |    5 +-
 .../hooks/ClockService_010-implementation.html     |    5 +-
 .../hooks/ClockService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/command/Command.html     |    5 +-
 .../services/command/CommandExecutorService.html   |    5 +-
 .../services/command/CommandOutcomeHandler.html    |    5 +-
 .../CommandExecutorService_010-implementation.html |    5 +-
 ...mandExecutorService_020-examples-and-usage.html |    5 +-
 .../index/services/commanddto/HasCommandDto.html   |    5 +-
 .../conmap/ContentMappingServiceForCommandDto.html |    5 +-
 .../ContentMappingServiceForCommandsDto.html       |    5 +-
 .../services/commanddto/conmap/UserDataKeys.html   |    5 +-
 .../commanddto/processor/CommandDtoProcessor.html  |    5 +-
 .../CommandDtoProcessorForActionAbstract.html      |    5 +-
 .../CommandDtoProcessorForPropertyAbstract.html    |    5 +-
 ...mandDtoProcessorService_010-implementation.html |    5 +-
 ...DtoProcessorService_020-examples-and-usage.html |    5 +-
 .../processor/spi/CommandDtoProcessorService.html  |    5 +-
 .../spi/CommandDtoProcessorServiceIdentity.html    |    5 +-
 .../index/services/confview/ConfigurationMenu.html |    5 +-
 .../services/confview/ConfigurationProperty.html   |    5 +-
 .../confview/ConfigurationViewService.html         |    5 +-
 .../ConfigurationMenu_010-implementation.html      |    5 +-
 .../ConfigurationMenu_020-examples-and-usage.html  |    5 +-
 ...onfigurationViewService_010-implementation.html |    5 +-
 ...gurationViewService_020-examples-and-usage.html |    5 +-
 .../services/conmap/ContentMappingService.html     |    5 +-
 .../ContentMappingService_010-implementation.html  |    5 +-
 ...ntentMappingService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/email/EmailService.html  |    5 +-
 .../hooks/EmailService_010-implementation.html     |    5 +-
 .../hooks/EmailService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/error/ErrorDetails.html  |    5 +-
 .../services/error/ErrorReportingService.html      |    5 +-
 .../applib/index/services/error/SimpleTicket.html  |    5 +-
 .../applib/index/services/error/Ticket.html        |    5 +-
 .../ErrorReportingService_010-implementation.html  |    5 +-
 ...rorReportingService_020-examples-and-usage.html |    5 +-
 .../index/services/eventbus/EventBusService.html   |    5 +-
 .../hooks/EventBusService_010-implementation.html  |    5 +-
 .../EventBusService_020-examples-and-usage.html    |    5 +-
 .../applib/index/services/exceprecog/Category.html |    5 +-
 .../services/exceprecog/ExceptionRecognizer.html   |    5 +-
 .../exceprecog/ExceptionRecognizerAbstract.html    |    5 +-
 .../exceprecog/ExceptionRecognizerForType.html     |    5 +-
 .../exceprecog/ExceptionRecognizerService.html     |    5 +-
 .../index/services/exceprecog/Recognition.html     |    5 +-
 ...eptionRecognizerService_010-implementation.html |    5 +-
 ...onRecognizerService_020-examples-and-usage.html |    5 +-
 .../ExceptionRecognizer_010-implementation.html    |    5 +-
 ...ExceptionRecognizer_020-examples-and-usage.html |    5 +-
 .../index/services/factory/FactoryService.html     |    5 +-
 .../hooks/FactoryService_010-implementation.html   |    5 +-
 .../FactoryService_020-examples-and-usage.html     |    5 +-
 .../index/services/grid/GridLoaderService.html     |    5 +-
 .../applib/index/services/grid/GridService.html    |    5 +-
 .../index/services/grid/GridSystemService.html     |    5 +-
 .../GridLoaderService_010-implementation.html      |    5 +-
 .../GridLoaderService_020-examples-and-usage.html  |    5 +-
 .../grid/hooks/GridService_010-implementation.html |    5 +-
 .../hooks/GridService_020-examples-and-usage.html  |    5 +-
 .../GridSystemService_010-implementation.html      |    5 +-
 .../GridSystemService_020-examples-and-usage.html  |    5 +-
 .../applib/index/services/health/Health.html       |    5 +-
 .../index/services/health/HealthCheckService.html  |    5 +-
 .../HealthCheckService_010-implementation.html     |    5 +-
 .../HealthCheckService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/hint/HintIdProvider.html |    5 +-
 .../applib/index/services/hint/HintStore.html      |    5 +-
 .../hooks/HintIdProvider_010-implementation.html   |    5 +-
 .../HintIdProvider_020-examples-and-usage.html     |    5 +-
 .../hint/hooks/HintStore_010-implementation.html   |    5 +-
 .../hooks/HintStore_020-examples-and-usage.html    |    5 +-
 .../services/homepage/HomePageResolverService.html |    5 +-
 ...HomePageResolverService_010-implementation.html |    5 +-
 ...PageResolverService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/i18n/LocaleProvider.html |    5 +-
 .../2.0.0-M5/applib/index/services/i18n/Mode.html  |    5 +-
 .../index/services/i18n/TranslatableString.html    |    5 +-
 .../index/services/i18n/TranslationService.html    |    5 +-
 .../index/services/i18n/TranslationsResolver.html  |    5 +-
 .../hooks/LocaleProvider_010-implementation.html   |    5 +-
 .../LocaleProvider_020-examples-and-usage.html     |    5 +-
 .../TranslationService_010-implementation.html     |    5 +-
 .../TranslationService_020-examples-and-usage.html |    5 +-
 .../TranslationsResolver_010-implementation.html   |    5 +-
 ...ranslationsResolver_020-examples-and-usage.html |    5 +-
 .../index/services/iactn/ActionInvocation.html     |    5 +-
 .../applib/index/services/iactn/Execution.html     |    5 +-
 .../index/services/iactn/ExecutionContext.html     |    5 +-
 .../applib/index/services/iactn/Interaction.html   |    5 +-
 .../index/services/iactn/InteractionContext.html   |    5 +-
 .../applib/index/services/iactn/PropertyEdit.html  |    5 +-
 .../applib/index/services/iactn/Sequence.html      | 1007 --------
 .../applib/index/services/iactn/SequenceType.html  |    5 +-
 .../iactn/hooks/Execution_010-implementation.html  |    5 +-
 .../hooks/Execution_020-examples-and-usage.html    |    5 +-
 .../InteractionContext_010-implementation.html     |    5 +-
 .../InteractionContext_020-examples-and-usage.html |    5 +-
 .../hooks/Interaction_010-implementation.html      |    5 +-
 .../hooks/Interaction_020-examples-and-usage.html  |    5 +-
 .../index/services/inject/ServiceInjector.html     |   29 +-
 .../hooks/ServiceInjector_010-implementation.html  |    5 +-
 .../ServiceInjector_020-examples-and-usage.html    |    5 +-
 .../applib/index/services/jaxb/JaxbService.html    |    5 +-
 .../jaxb/hooks/JaxbService_010-implementation.html |    5 +-
 .../hooks/JaxbService_020-examples-and-usage.html  |    5 +-
 .../index/services/layout/LayoutService.html       |    5 +-
 .../index/services/layout/LayoutServiceMenu.html   |    5 +-
 .../applib/index/services/layout/Style.html        |    5 +-
 .../LayoutServiceMenu_010-implementation.html      |    5 +-
 .../LayoutServiceMenu_020-examples-and-usage.html  |    5 +-
 .../hooks/LayoutService_010-implementation.html    |    5 +-
 .../LayoutService_020-examples-and-usage.html      |    5 +-
 .../index/services/linking/DeepLinkService.html    |    5 +-
 .../hooks/DeepLinkService_010-implementation.html  |    5 +-
 .../DeepLinkService_020-examples-and-usage.html    |    5 +-
 .../index/services/menu/MenuBarsLoaderService.html |    5 +-
 .../index/services/menu/MenuBarsService.html       |    5 +-
 .../MenuBarsLoaderService_010-implementation.html  |    5 +-
 ...nuBarsLoaderService_020-examples-and-usage.html |    5 +-
 .../hooks/MenuBarsService_010-implementation.html  |    5 +-
 .../MenuBarsService_020-examples-and-usage.html    |    5 +-
 .../index/services/message/MessageService.html     |    5 +-
 .../hooks/MessageService_010-implementation.html   |    5 +-
 .../MessageService_020-examples-and-usage.html     |    5 +-
 .../applib/index/services/metamodel/BeanSort.html  |    5 +-
 .../applib/index/services/metamodel/Config.html    |    5 +-
 .../index/services/metamodel/DomainMember.html     |    5 +-
 .../index/services/metamodel/DomainModel.html      |    5 +-
 .../index/services/metamodel/MetaModelService.html |    5 +-
 .../services/metamodel/MetaModelServiceMenu.html   |    5 +-
 .../MetaModelServiceMenu_010-implementation.html   |    5 +-
 ...etaModelServiceMenu_020-examples-and-usage.html |    5 +-
 .../hooks/MetaModelService_010-implementation.html |    5 +-
 .../MetaModelService_020-examples-and-usage.html   |    5 +-
 .../index/services/metrics/MetricsService.html     |    5 +-
 .../hooks/MetricsService_010-implementation.html   |    5 +-
 .../MetricsService_020-examples-and-usage.html     |    5 +-
 .../services/publishing/log/CommandLogger.html     |    5 +-
 .../publishing/log/EntityChangesLogger.html        |    5 +-
 .../publishing/log/EntityPropertyChangeLogger.html |    5 +-
 .../services/publishing/log/ExecutionLogger.html   |    5 +-
 .../services/publishing/spi/CommandSubscriber.html |    5 +-
 .../services/publishing/spi/EntityChanges.html     |    5 +-
 .../publishing/spi/EntityChangesSubscriber.html    |    5 +-
 .../publishing/spi/EntityPropertyChange.html       |    5 +-
 .../spi/EntityPropertyChangeSubscriber.html        |    5 +-
 .../publishing/spi/ExecutionSubscriber.html        |    5 +-
 .../CommandSubscriber_010-implementation.html      |    5 +-
 .../CommandSubscriber_020-examples-and-usage.html  |    5 +-
 ...EntityChangesSubscriber_010-implementation.html |    5 +-
 ...tyChangesSubscriber_020-examples-and-usage.html |    5 +-
 ...ropertyChangeSubscriber_010-implementation.html |    5 +-
 ...rtyChangeSubscriber_020-examples-and-usage.html |    5 +-
 .../ExecutionSubscriber_010-implementation.html    |    5 +-
 ...ExecutionSubscriber_020-examples-and-usage.html |    5 +-
 .../queryresultscache/MethodReferences.html        |    5 +-
 .../queryresultscache/QueryResultsCache.html       |    5 +-
 .../QueryResultsCacheControl.html                  |    5 +-
 ...ueryResultsCacheControl_010-implementation.html |    5 +-
 ...ResultsCacheControl_020-examples-and-usage.html |    5 +-
 .../QueryResultsCache_010-implementation.html      |    5 +-
 .../QueryResultsCache_020-examples-and-usage.html  |    5 +-
 .../registry/InstanceByPriorityComparator.html     |    5 +-
 .../index/services/registry/ServiceRegistry.html   |    5 +-
 .../hooks/ServiceRegistry_010-implementation.html  |    5 +-
 .../ServiceRegistry_020-examples-and-usage.html    |    5 +-
 .../index/services/repository/EntityState.html     |    5 +-
 .../services/repository/RepositoryService.html     |    5 +-
 .../RepositoryService_010-implementation.html      |    5 +-
 .../RepositoryService_020-examples-and-usage.html  |    5 +-
 .../index/services/routing/RoutingService.html     |    5 +-
 .../hooks/RoutingService_010-implementation.html   |    5 +-
 .../RoutingService_020-examples-and-usage.html     |    5 +-
 .../index/services/scratchpad/Scratchpad.html      |    5 +-
 .../hooks/Scratchpad_010-implementation.html       |    5 +-
 .../hooks/Scratchpad_020-examples-and-usage.html   |    5 +-
 .../services/session/SessionLoggingService.html    |    5 +-
 .../session/SessionLoggingServiceLogging.html      |    5 +-
 .../SessionLoggingService_010-implementation.html  |    5 +-
 ...ssionLoggingService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/sudo/SudoService.html    |    7 +-
 .../SudoServiceListener_010-implementation.html    |    5 +-
 ...SudoServiceListener_020-examples-and-usage.html |    5 +-
 .../sudo/hooks/SudoService_010-implementation.html |    5 +-
 .../hooks/SudoService_020-examples-and-usage.html  |    7 +-
 .../applib/index/services/swagger/Format.html      |    5 +-
 .../index/services/swagger/SwaggerService.html     |    5 +-
 .../applib/index/services/swagger/Visibility.html  |    5 +-
 .../hooks/SwaggerService_010-implementation.html   |    5 +-
 .../SwaggerService_020-examples-and-usage.html     |    5 +-
 .../TableColumnOrderForCollectionTypeAbstract.html |    5 +-
 .../services/tablecol/TableColumnOrderService.html |    5 +-
 ...TableColumnOrderService_010-implementation.html |    5 +-
 ...eColumnOrderService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/title/TitleService.html  |    5 +-
 .../hooks/TitleService_010-implementation.html     |    5 +-
 .../hooks/TitleService_020-examples-and-usage.html |    5 +-
 .../services/urlencoding/UrlEncodingService.html   |    5 +-
 ...rlEncodingServiceUsingBaseEncodingAbstract.html |    5 +-
 .../UrlEncodingService_010-implementation.html     |    5 +-
 .../UrlEncodingService_020-examples-and-usage.html |    5 +-
 .../applib/index/services/user/RoleMemento.html    |    5 +-
 .../applib/index/services/user/UserMemento.html    |    5 +-
 .../applib/index/services/user/UserService.html    |    7 +-
 .../user/hooks/UserService_010-implementation.html |    5 +-
 .../hooks/UserService_020-examples-and-usage.html  |    7 +-
 .../services/userprof/UserProfileService.html      |    5 +-
 .../UserProfileService_010-implementation.html     |    5 +-
 .../UserProfileService_020-examples-and-usage.html |    5 +-
 .../services/userreg/EmailNotificationService.html |    5 +-
 .../applib/index/services/userreg/UserDetails.html |    5 +-
 .../services/userreg/UserRegistrationService.html  |    7 +-
 .../userreg/events/EmailEventAbstract.html         |    5 +-
 .../userreg/events/EmailRegistrationEvent.html     |    5 +-
 .../userreg/events/PasswordResetEvent.html         |    5 +-
 ...mailNotificationService_010-implementation.html |    5 +-
 ...NotificationService_020-examples-and-usage.html |    5 +-
 ...UserRegistrationService_010-implementation.html |    7 +-
 ...RegistrationService_020-examples-and-usage.html |    5 +-
 .../index/services/wrapper/DisabledException.html  |    5 +-
 .../index/services/wrapper/HiddenException.html    |    5 +-
 .../index/services/wrapper/InvalidException.html   |    5 +-
 .../index/services/wrapper/WrapperFactory.html     |    5 +-
 .../index/services/wrapper/WrappingObject.html     |    5 +-
 .../services/wrapper/control/AsyncControl.html     |    5 +-
 .../services/wrapper/control/ControlAbstract.html  |    5 +-
 .../services/wrapper/control/ExceptionHandler.html |    5 +-
 .../wrapper/control/ExceptionHandlerAbstract.html  |    5 +-
 .../services/wrapper/control/ExecutionMode.html    |    5 +-
 .../services/wrapper/control/SyncControl.html      |    5 +-
 .../index/services/wrapper/events/AccessEvent.html |    5 +-
 .../wrapper/events/ActionArgumentEvent.html        |    5 +-
 .../wrapper/events/ActionInvocationEvent.html      |    5 +-
 .../wrapper/events/ActionUsabilityEvent.html       |    5 +-
 .../wrapper/events/ActionVisibilityEvent.html      |    5 +-
 .../wrapper/events/CollectionAccessEvent.html      |    5 +-
 .../wrapper/events/CollectionAddToEvent.html       |    5 +-
 .../wrapper/events/CollectionMethodEvent.html      |    5 +-
 .../wrapper/events/CollectionRemoveFromEvent.html  |    5 +-
 .../wrapper/events/CollectionUsabilityEvent.html   |    5 +-
 .../services/wrapper/events/InteractionEvent.html  |    5 +-
 .../services/wrapper/events/ObjectTitleEvent.html  |    5 +-
 .../wrapper/events/ObjectValidityEvent.html        |    5 +-
 .../wrapper/events/ObjectVisibilityEvent.html      |    5 +-
 .../services/wrapper/events/ParseValueEvent.html   |    5 +-
 .../wrapper/events/PropertyAccessEvent.html        |    5 +-
 .../wrapper/events/PropertyModifyEvent.html        |    5 +-
 .../wrapper/events/PropertyUsabilityEvent.html     |    5 +-
 .../wrapper/events/PropertyVisibilityEvent.html    |    5 +-
 .../wrapper/events/ProposedHolderEvent.html        |    5 +-
 .../services/wrapper/events/UsabilityEvent.html    |    5 +-
 .../services/wrapper/events/ValidityEvent.html     |    5 +-
 .../services/wrapper/events/VisibilityEvent.html   |    5 +-
 .../hooks/WrapperFactory_010-implementation.html   |    5 +-
 .../WrapperFactory_020-examples-and-usage.html     |    5 +-
 .../wrapper/listeners/InteractionAdapter.html      |    5 +-
 .../wrapper/listeners/InteractionListener.html     |    5 +-
 .../applib/index/services/xactn/TransactionId.html |    5 +-
 .../index/services/xactn/TransactionService.html   |    5 +-
 .../index/services/xactn/TransactionState.html     |    5 +-
 .../services/xactn/TransactionalProcessor.html     |    5 +-
 .../TransactionService_010-implementation.html     |    5 +-
 .../TransactionService_020-examples-and-usage.html |    5 +-
 .../TransactionalProcessor_010-implementation.html |    5 +-
 ...nsactionalProcessor_020-examples-and-usage.html |    5 +-
 .../applib/index/services/xml/XmlService.html      |    5 +-
 .../xml/hooks/XmlService_010-implementation.html   |    5 +-
 .../hooks/XmlService_020-examples-and-usage.html   |    5 +-
 .../services/xmlsnapshot/XmlSnapshotService.html   |    5 +-
 .../xmlsnapshot/XmlSnapshotService~Snapshot.html   |    5 +-
 .../XmlSnapshotService~Snapshot~Builder.html       |    5 +-
 .../XmlSnapshotService_010-implementation.html     |    5 +-
 .../XmlSnapshotService_020-examples-and-usage.html |    5 +-
 .../snapshot/SnapshottableWithInclusions.html      |    5 +-
 .../applib/index/spec/AbstractSpecification.html   |    5 +-
 .../applib/index/spec/AbstractSpecification2.html  |    5 +-
 .../2.0.0-M5/applib/index/spec/Specification.html  |    5 +-
 .../2.0.0-M5/applib/index/spec/Specification2.html |    5 +-
 .../applib/index/spec/SpecificationAnd.html        |    5 +-
 .../applib/index/spec/SpecificationNot.html        |    5 +-
 .../applib/index/spec/SpecificationOr.html         |    5 +-
 .../applib/index/types/DescriptionType.html        |    5 +-
 .../applib/index/types/MemberIdentifierType.html   |    5 +-
 .../applib/index/types/TargetActionType.html       |    5 +-
 .../applib/index/types/TargetClassType.html        |    5 +-
 .../refguide/2.0.0-M5/applib/index/util/Enums.html |    5 +-
 .../2.0.0-M5/applib/index/util/Equality.html       |    5 +-
 .../2.0.0-M5/applib/index/util/Hashing.html        |    5 +-
 .../2.0.0-M5/applib/index/util/JaxbUtil.html       |    5 +-
 .../applib/index/util/ObjectContracts.html         |    5 +-
 .../2.0.0-M5/applib/index/util/ReasonBuffer.html   |    5 +-
 .../2.0.0-M5/applib/index/util/ReasonBuffer2.html  |    5 +-
 .../2.0.0-M5/applib/index/util/Reasons.html        |    5 +-
 .../2.0.0-M5/applib/index/util/TitleBuffer.html    |    5 +-
 .../applib/index/util/TitleBufferException.html    |    5 +-
 .../2.0.0-M5/applib/index/util/ToString.html       |    5 +-
 .../applib/index/util/hooks/Enums_examples.html    |    5 +-
 .../hooks/ObjectContracts_examples-and-usage.html  |    5 +-
 .../applib/index/util/schema/ChangesDtoUtils.html  |    5 +-
 .../applib/index/util/schema/CommandDtoUtils.html  |    5 +-
 .../applib/index/util/schema/CommonDtoUtils.html   |    5 +-
 .../index/util/schema/InteractionDtoUtils.html     |    5 +-
 .../index/util/schema/MemberExecutionDtoUtils.html |    5 +-
 .../refguide/2.0.0-M5/applib/index/value/Blob.html |    5 +-
 .../refguide/2.0.0-M5/applib/index/value/Clob.html |    5 +-
 .../2.0.0-M5/applib/index/value/HasHtml.html       |    5 +-
 .../applib/index/value/LocalResourcePath.html      |    5 +-
 .../2.0.0-M5/applib/index/value/Markup.html        |    5 +-
 .../applib/index/value/NamedWithMimeType.html      |    5 +-
 .../applib/index/value/OpenUrlStrategy.html        |    5 +-
 .../2.0.0-M5/applib/index/value/Password.html      |    5 +-
 .../applib/index/value/hooks/Blob_usage-notes.html |    5 +-
 .../applib/index/value/hooks/Clob_usage-notes.html |    5 +-
 .../2.0.0-M5/commons/index/collections/Can.html    |    5 +-
 .../commons/index/collections/Cardinality.html     |    5 +-
 .../2.0.0-M5/commons/index/functional/Result.html  |    5 +-
 .../index/resource/ResourceCoordinates.html        |    5 +-
 content/refguide/2.0.0-M5/config/about.html        |    5 +-
 .../application-specific/application-css.html      |    5 +-
 .../2.0.0-M5/config/section-hooks/Other~post.html  |    5 +-
 .../2.0.0-M5/config/section-hooks/Other~pre.html   |    5 +-
 .../config/section-hooks/datanucleus~post.html     |    5 +-
 .../config/section-hooks/datanucleus~pre.html      |    5 +-
 .../config/section-hooks/isis.applib~post.html     |    5 +-
 .../config/section-hooks/isis.applib~pre.html      |    5 +-
 .../section-hooks/isis.core.config~post.html       |    5 +-
 .../config/section-hooks/isis.core.config~pre.html |    5 +-
 .../isis.core.meta-model.introspector~post.html    |    5 +-
 .../isis.core.meta-model.introspector~pre.html     |    5 +-
 .../isis.core.meta-model.validator~post.html       |    5 +-
 .../isis.core.meta-model.validator~pre.html        |    5 +-
 .../section-hooks/isis.core.meta-model~post.html   |    5 +-
 .../section-hooks/isis.core.meta-model~pre.html    |    5 +-
 .../isis.core.runtime-services~post.html           |    5 +-
 .../isis.core.runtime-services~pre.html            |    5 +-
 .../section-hooks/isis.core.runtime~post.html      |    5 +-
 .../section-hooks/isis.core.runtime~pre.html       |    5 +-
 .../config/section-hooks/isis.extensions~post.html |    5 +-
 .../config/section-hooks/isis.extensions~pre.html  |    5 +-
 .../config/section-hooks/isis.incubator~post.html  |    5 +-
 .../config/section-hooks/isis.incubator~pre.html   |    5 +-
 .../config/section-hooks/isis.legacy~post.html     |    5 +-
 .../config/section-hooks/isis.legacy~pre.html      |    5 +-
 .../config/section-hooks/isis.mappings~post.html   |    5 +-
 .../config/section-hooks/isis.mappings~pre.html    |    5 +-
 .../isis.persistence.schema~post.html              |    5 +-
 .../section-hooks/isis.persistence.schema~pre.html |    5 +-
 .../section-hooks/isis.security.shiro~post.html    |    5 +-
 .../section-hooks/isis.security.shiro~pre.html     |    5 +-
 .../section-hooks/isis.security.spring~post.html   |    5 +-
 .../section-hooks/isis.security.spring~pre.html    |    5 +-
 .../config/section-hooks/isis.subdomains~post.html |    5 +-
 .../config/section-hooks/isis.subdomains~pre.html  |    5 +-
 .../config/section-hooks/isis.testing~post.html    |    5 +-
 .../config/section-hooks/isis.testing~pre.html     |    5 +-
 .../section-hooks/isis.value-types~post.html       |    5 +-
 .../config/section-hooks/isis.value-types~pre.html |    5 +-
 .../isis.viewer.restfulobjects~post.html           |    5 +-
 .../isis.viewer.restfulobjects~pre.html            |    5 +-
 .../section-hooks/isis.viewer.wicket~post.html     |    5 +-
 .../section-hooks/isis.viewer.wicket~pre.html      |    5 +-
 .../config/section-hooks/resteasy~post.html        |    5 +-
 .../config/section-hooks/resteasy~pre.html         |    5 +-
 .../2.0.0-M5/config/section-hooks/spring~post.html |    5 +-
 .../2.0.0-M5/config/section-hooks/spring~pre.html  |    5 +-
 .../refguide/2.0.0-M5/config/sections/Other.html   |    5 +-
 .../2.0.0-M5/config/sections/datanucleus.html      |    5 +-
 .../2.0.0-M5/config/sections/isis.applib.html      |    5 +-
 .../2.0.0-M5/config/sections/isis.core.config.html |    5 +-
 .../config/sections/isis.core.meta-model.html      |    5 +-
 .../isis.core.meta-model.introspector.html         |    5 +-
 .../sections/isis.core.meta-model.validator.html   |    5 +-
 .../sections/isis.core.runtime-services.html       |    5 +-
 .../config/sections/isis.core.runtime.html         |    5 +-
 .../2.0.0-M5/config/sections/isis.extensions.html  |    5 +-
 .../2.0.0-M5/config/sections/isis.legacy.html      |    5 +-
 .../config/sections/isis.persistence.schema.html   |    5 +-
 .../config/sections/isis.security.shiro.html       |    5 +-
 .../config/sections/isis.security.spring.html      |    5 +-
 .../2.0.0-M5/config/sections/isis.testing.html     |    5 +-
 .../2.0.0-M5/config/sections/isis.value-types.html |    5 +-
 .../sections/isis.viewer.restfulobjects.html       |    5 +-
 .../config/sections/isis.viewer.wicket.html        |    5 +-
 .../2.0.0-M5/config/sections/resteasy.html         |    5 +-
 .../DataSourceIntrospectionService.html            |    5 +-
 .../interaction/session/InteractionFactory.html    |    5 +-
 .../services/command/CommandDtoFactory.html        |    5 +-
 .../services/ixn/InteractionDtoFactory.html        |    5 +-
 .../services/publishing/CommandPublisher.html      |    5 +-
 .../services/publishing/ExecutionPublisher.html    |    5 +-
 .../transaction/TransactionServiceSpring.html      |    5 +-
 .../runtimeservices/xml/XmlServiceDefault.html     |    5 +-
 .../security/authentication/Authentication.html    |    5 +-
 .../authentication/AuthenticationRequest.html      |    5 +-
 .../security/authentication/Authenticator.html     |    5 +-
 .../index/security/authorization/Authorizor.html   |    5 +-
 .../changetracking/EntityChangeTracker.html        |    5 +-
 .../changetracking/EntityChangeTrackerDefault.html |    5 +-
 .../changetracking/EntityChangesPublisher.html     |    5 +-
 .../EntityPropertyChangePublisher.html             |    5 +-
 .../events/TransactionAfterCompletionEvent.html    |    5 +-
 .../commandlog/impl/CommandSubscriberForJdo.html   |    5 +-
 .../impl/IsisModuleExtCommandLogImpl.html          |    5 +-
 .../impl/mixins/HasInteractionId_command.html      |    5 +-
 .../mixins/HasUsername_recentCommandsByUser.html   |    5 +-
 .../commandlog/impl/ui/CommandServiceMenu.html     |    5 +-
 .../primary/IsisModuleExtCommandReplayPrimary.html |    5 +-
 .../primary/config/PrimaryConfig.html              |    5 +-
 .../primary/mixins/Object_openOnSecondary.html     |    5 +-
 .../primary/restapi/CommandRetrievalService.html   |    5 +-
 .../primary/ui/CommandReplayOnPrimaryService.html  |    5 +-
 .../IsisModuleExtCommandReplaySecondary.html       |    5 +-
 .../commandreplay/secondary/SecondaryStatus.html   |    5 +-
 .../secondary/analyser/CommandReplayAnalyser.html  |    5 +-
 .../analyser/CommandReplayAnalyserException.html   |    5 +-
 .../analyser/CommandReplayAnalyserResult.html      |    5 +-
 .../analysis/CommandReplayAnalysisService.html     |    5 +-
 .../secondary/clock/TickingClockService.html       |    5 +-
 .../secondary/config/SecondaryConfig.html          |    5 +-
 .../executor/CommandExecutorServiceWithTime.html   |    5 +-
 .../secondary/fetch/CommandFetcher.html            |    5 +-
 .../secondary/job/ReplicateAndReplayJob.html       |    5 +-
 .../secondary/job/SecondaryStatusData.html         |    5 +-
 .../jobcallables/ReplicateAndRunCommands.html      |    5 +-
 .../secondary/mixins/CommandJdo_exclude.html       |    5 +-
 .../secondary/mixins/CommandJdo_replayQueue.html   |    5 +-
 .../secondary/mixins/Object_openOnPrimary.html     |    5 +-
 .../spi/ReplayCommandExecutionController.html      |    5 +-
 .../ui/CommandReplayOnSecondaryService.html        |    5 +-
 .../index/cors/impl/IsisModuleExtCorsImpl.html     |    5 +-
 .../fullcalendar/applib/CalendarEventable.html     |    5 +-
 .../index/fullcalendar/applib/Calendarable.html    |    5 +-
 .../applib/IsisModuleExtFullCalendarApplib.html    |    5 +-
 .../spi/CalendarableDereferencingService.html      |    5 +-
 .../fullcalendar/applib/value/CalendarEvent.html   |    5 +-
 .../ui/component/IsisModuleExtFullCalendarUi.html  |    5 +-
 .../hsqldbmgr/dom/IsisModuleExtHsqldbMgr.html      |    5 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.html  |    5 +-
 .../applib/IsisModuleExtJaxRsClientApplib.html     |    5 +-
 .../jaxrsclient/applib/client/JaxRsClient.html     |    5 +-
 .../jaxrsclient/applib/client/JaxRsResponse.html   |    5 +-
 .../applib/IsisModuleIncModelApplib.html           |    5 +-
 .../modelannotation/applib/annotation/Model.html   |    5 +-
 .../metamodel/IsisModuleExtModelAnnotation.html    |    5 +-
 .../SupportingMethodValidatorRefinerFactory.html   |    5 +-
 .../services/IncubatorMetaModelPlugin.html         |    5 +-
 .../index/quartz/IsisModuleExtQuartzImpl.html      |    5 +-
 .../index/quartz/context/JobExecutionData.html     |    5 +-
 .../spring/AutowiringSpringBeanJobFactory.html     |    5 +-
 .../restclient/ActionParameterListBuilder.html     |    5 +-
 .../index/restclient/IsisModuleExtRestClient.html  |    5 +-
 .../index/restclient/ResponseDigest.html           |    5 +-
 .../extensions/index/restclient/RestfulClient.html |    5 +-
 .../index/restclient/RestfulClientConfig.html      |    5 +-
 .../index/restclient/RestfulClientException.html   |    5 +-
 .../index/restclient/auth/BasicAuthFilter.html     |    5 +-
 .../restclient/log/ClientConversationFilter.html   |    5 +-
 .../restclient/log/ClientConversationLogger.html   |    5 +-
 .../index/secman/api/IsisModuleExtSecmanApi.html   |    5 +-
 .../index/secman/api/SecmanConfiguration.html      |    5 +-
 .../extensions/index/secman/api/SecurityRealm.html |    5 +-
 .../secman/api/SecurityRealmCharacteristic.html    |    5 +-
 .../index/secman/api/SecurityRealmService.html     |    5 +-
 .../secman/api/authorizor/AuthorizorSecman.html    |    5 +-
 .../api/encryption/PasswordEncryptionService.html  |    5 +-
 .../encryption/PasswordEncryptionServiceNone.html  |    5 +-
 .../index/secman/api/events/UserCreatedEvent.html  |    5 +-
 .../api/permission/ApplicationPermission.html      |    5 +-
 .../api/permission/ApplicationPermissionMode.html  |    5 +-
 .../ApplicationPermissionRepository.html           |    5 +-
 .../api/permission/ApplicationPermissionRule.html  |    5 +-
 .../api/permission/ApplicationPermissionValue.html |    5 +-
 .../permission/ApplicationPermissionValueSet.html  |    5 +-
 .../permission/PermissionsEvaluationService.html   |    5 +-
 .../PermissionsEvaluationServiceAbstract.html      |    5 +-
 ...PermissionsEvaluationServiceAllowBeatsVeto.html |    5 +-
 ...PermissionsEvaluationServiceVetoBeatsAllow.html |    5 +-
 .../index/secman/api/role/ApplicationRole.html     |    5 +-
 .../secman/api/role/ApplicationRoleRepository.html |    5 +-
 .../secman/api/tenancy/ApplicationTenancy.html     |    5 +-
 .../api/tenancy/ApplicationTenancyEvaluator.html   |    5 +-
 .../api/tenancy/ApplicationTenancyRepository.html  |    5 +-
 .../index/secman/api/tenancy/HasAtPath.html        |    5 +-
 .../index/secman/api/user/AccountType.html         |    5 +-
 .../index/secman/api/user/ApplicationUser.html     |    5 +-
 .../secman/api/user/ApplicationUserRepository.html |    5 +-
 .../secman/api/user/ApplicationUserStatus.html     |    5 +-
 .../IsisModuleExtSecmanEncryptionJbcrypt.html      |    5 +-
 .../PasswordEncryptionServiceUsingJBcrypt.html     |    5 +-
 .../jdo/IsisModuleExtSecmanPersistenceJdo.html     |    5 +-
 .../secman/jdo/seed/SeedSecurityModuleService.html |    5 +-
 .../jdo/seed/SeedUsersAndRolesFixtureScript.html   |    5 +-
 .../secman/jdo/seed/scripts/GlobalTenancy.html     |    5 +-
 ...xtFixturesFixtureResultsRoleAndPermissions.html |    5 +-
 .../IsisExtSecmanAdminRoleAndPermissions.html      |    5 +-
 .../jdo/seed/scripts/IsisExtSecmanAdminUser.html   |    5 +-
 .../IsisExtSecmanFixtureRoleAndPermissions.html    |    5 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.html |    5 +-
 .../jpa/IsisModuleExtSecmanPersistenceJpa.html     |    5 +-
 .../secman/jpa/seed/SeedSecurityModuleService.html |    5 +-
 .../jpa/seed/SeedUsersAndRolesFixtureScript.html   |    5 +-
 .../secman/jpa/seed/scripts/GlobalTenancy.html     |    5 +-
 ...xtFixturesFixtureResultsRoleAndPermissions.html |    5 +-
 .../IsisExtSecmanAdminRoleAndPermissions.html      |    5 +-
 .../jpa/seed/scripts/IsisExtSecmanAdminUser.html   |    5 +-
 .../IsisExtSecmanFixtureRoleAndPermissions.html    |    5 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.html |    5 +-
 ...tyModuleAppUserRegistrationServiceAbstract.html |    5 +-
 .../secman/model/IsisModuleExtSecmanModel.html     |    5 +-
 .../index/secman/model/app/user/MeService.html     |  938 --------
 .../index/secman/model/dom/user/MeService.html     |    5 +-
 .../shiro/IsisModuleExtSecmanRealmShiro.html       |    5 +-
 .../shiro/IsisModuleExtSecmanShiroRealm.html       |    5 +-
 .../services/SecurityRealmServiceUsingShiro.html   |    5 +-
 .../index/secman/shiro/util/ShiroUtils.html        |    5 +-
 .../realm/impl/IsisLdapContextFactory.html         |    5 +-
 .../shirorealmldap/realm/impl/IsisLdapRealm.html   |    5 +-
 .../impl/IsisModuleExtShiroRealmLdapImpl.html      |    5 +-
 .../ui/IsisModuleExtExcelDownloadUi.html           |    5 +-
 .../ui/components/CollectionContentsAsExcel.html   |    5 +-
 .../CollectionContentsAsExcelFactory.html          |    5 +-
 .../pdfjs/applib/annotations/PdfJsViewer.html      |    5 +-
 .../wicket/pdfjs/applib/config/PdfJsConfig.html    |    5 +-
 .../viewer/wicket/pdfjs/applib/config/Scale.html   |    5 +-
 .../pdfjs/applib/spi/PdfJsViewerAdvisor.html       |    5 +-
 .../wicket/pdfjs/ui/IsisModuleExtPdfjsUi.html      |    5 +-
 .../jdo/applib/IsisModulePersistenceJdoApplib.html |    5 +-
 .../jdo/applib/services/JdoSupportService.html     |  291 ++-
 .../JdoSupportService_010-examples-and-usage.html} |  372 +--
 .../jdo/datanucleus/IsisModuleJdoDatanucleus.html  |    5 +-
 .../changetracking/JdoLifecycleListener.html       |    5 +-
 .../jdo/datanucleus/dialect/DnJdoDialect.html      |    5 +-
 .../mixins/Persistable_datanucleusIdLong.html      |    5 +-
 .../mixins/Persistable_datanucleusVersionLong.html |    5 +-
 .../Persistable_datanucleusVersionTimestamp.html   |    5 +-
 .../mixins/Persistable_downloadJdoMetadata.html    |    5 +-
 .../applib/IsisBookmarkConverter.html              |    5 +-
 .../applib/IsisLocalResourcePathConverter.html     |    5 +-
 .../typeconverters/applib/IsisMarkupConverter.html |    5 +-
 .../applib/IsisPasswordConverter.html              |    5 +-
 .../JavaAwtBufferedImageByteArrayConverter.html    |    5 +-
 .../schema/v2/IsisChangesDtoConverter.html         |    5 +-
 .../schema/v2/IsisCommandDtoConverter.html         |    5 +-
 .../schema/v2/IsisInteractionDtoConverter.html     |    5 +-
 .../schema/v2/IsisOidDtoConverter.html             |    5 +-
 .../time/IsoOffsetTimeConverter.html               |    5 +-
 .../time/IsoZonedDateTimeConverter.html            |    5 +-
 .../applib/ByteArrayBlobRdbmsMapping.html          |    5 +-
 .../valuetypes/applib/IsisBlobMapping.html         |    5 +-
 .../valuetypes/applib/IsisClobMapping.html         |    5 +-
 .../JpaEntityInjectionPointResolver.html           |    5 +-
 .../jpa/applib/services/JpaSupportService.html     |    5 +-
 .../jpa/eclipselink/IsisModuleJpaEclipselink.html  |    5 +-
 content/refguide/2.0.0-M5/schema/about.html        |    5 +-
 content/refguide/2.0.0-M5/schema/aim.html          |    5 +-
 content/refguide/2.0.0-M5/schema/chg.html          |    5 +-
 content/refguide/2.0.0-M5/schema/cmd.html          |    5 +-
 content/refguide/2.0.0-M5/schema/common.html       |    5 +-
 .../2.0.0-M5/schema/index/IsisModuleSchema.html    |    5 +-
 content/refguide/2.0.0-M5/schema/ixn.html          |    5 +-
 content/refguide/2.0.0-M5/schema/mml.html          |    5 +-
 .../index/bypass/IsisModuleSecurityBypass.html     |    5 +-
 .../bypass/authentication/AuthenticatorBypass.html |    5 +-
 .../bypass/authorization/AuthorizorBypass.html     |    5 +-
 .../index/keycloak/IsisModuleSecurityKeycloak.html |    5 +-
 .../authentication/AuthenticatorKeycloak.html      |    5 +-
 .../keycloak/authorization/AuthorizorKeycloak.html |  938 --------
 .../index/keycloak/webmodule/KeycloakFilter.html   |    5 +-
 .../keycloak/webmodule/WebModuleKeycloak.html      |    5 +-
 .../index/shiro/IsisModuleSecurityShiro.html       |    5 +-
 .../shiro/authentication/AuthenticatorShiro.html   |    5 +-
 .../index/shiro/authorization/AuthorizorShiro.html |    5 +-
 .../index/shiro/authorization/IsisPermission.html  |    5 +-
 .../authorization/IsisPermissionResolver.html      |    5 +-
 .../index/shiro/webmodule/WebModuleShiro.html      |    5 +-
 .../index/spring/IsisModuleSecuritySpring.html     |    5 +-
 .../spring/authentication/AuthenticatorSpring.html |    5 +-
 .../spring/webmodule/SpringSecurityFilter.html     |    5 +-
 .../spring/webmodule/WebModuleSpringSecurity.html  |    5 +-
 .../subdomains/index/base/applib/Chained.html      |    5 +-
 .../subdomains/index/base/applib/Dflt.html         |    5 +-
 .../applib/IsisModuleSubdomainsBaseApplib.html     |    5 +-
 .../subdomains/index/base/applib/PowerType.html    |    5 +-
 .../subdomains/index/base/applib/Titled.html       |    5 +-
 .../subdomains/index/base/applib/TitledEnum.html   |    5 +-
 .../base/applib/services/BaseServicesModule.html   |    5 +-
 .../applib/services/calendar/CalendarService.html  |    5 +-
 .../index/base/applib/types/DescriptionType.html   |    5 +-
 .../index/base/applib/types/FqcnType.html          |    5 +-
 .../index/base/applib/types/MoneyType.html         |    5 +-
 .../index/base/applib/types/NameType.html          |    5 +-
 .../index/base/applib/types/NotesType.html         |    5 +-
 .../base/applib/types/ObjectIdentifierType.html    |    5 +-
 .../index/base/applib/types/PercentageType.html    |    5 +-
 .../index/base/applib/types/ProperNameType.html    |    5 +-
 .../index/base/applib/types/ReferenceType.html     |    5 +-
 .../index/base/applib/types/TitleType.html         |    5 +-
 .../index/base/applib/types/UrlTemplateType.html   |    5 +-
 .../index/base/applib/types/UserNameType.html      |    5 +-
 .../index/base/applib/types/XxxType.html           |    5 +-
 .../index/base/applib/utils/ClassUtils.html        |    5 +-
 .../index/base/applib/utils/JodaPeriodUtils.html   |    5 +-
 .../index/base/applib/utils/MathUtils.html         |    5 +-
 .../index/base/applib/utils/MessageUtils.html      |    5 +-
 .../index/base/applib/utils/StringUtils.html       |    5 +-
 .../index/base/applib/utils/TitleBuilder.html      |    5 +-
 .../base/applib/valuetypes/AbstractInterval.html   |    5 +-
 .../base/applib/valuetypes/LocalDateInterval.html  |    5 +-
 .../index/base/applib/valuetypes/VT.html           |    5 +-
 .../index/base/applib/with/WithCodeComparable.html |    5 +-
 .../index/base/applib/with/WithCodeGetter.html     |    5 +-
 .../index/base/applib/with/WithCodeUnique.html     |    5 +-
 .../applib/with/WithDescriptionComparable.html     |    5 +-
 .../base/applib/with/WithDescriptionGetter.html    |    5 +-
 .../base/applib/with/WithDescriptionUnique.html    |    5 +-
 .../index/base/applib/with/WithInterval.html       |    5 +-
 .../base/applib/with/WithIntervalContiguous.html   |    5 +-
 .../base/applib/with/WithIntervalMutable.html      |    5 +-
 .../index/base/applib/with/WithNameComparable.html |    5 +-
 .../index/base/applib/with/WithNameGetter.html     |    5 +-
 .../index/base/applib/with/WithNameUnique.html     |    5 +-
 .../base/applib/with/WithReferenceComparable.html  |    5 +-
 .../base/applib/with/WithReferenceGetter.html      |    5 +-
 .../base/applib/with/WithReferenceUnique.html      |    5 +-
 .../index/base/applib/with/WithSequence.html       |    5 +-
 .../index/base/applib/with/WithStartDate.html      |    5 +-
 .../base/applib/with/WithTitleComparable.html      |    5 +-
 .../index/base/applib/with/WithTitleGetter.html    |    5 +-
 .../index/base/applib/with/WithTitleUnique.html    |    5 +-
 .../applib/IsisModuleSubdomainsExcelApplib.html    |    5 +-
 .../index/excel/applib/dom/AggregationType.html    |    5 +-
 .../excel/applib/dom/ExcelMetaDataEnabled.html     |    5 +-
 .../index/excel/applib/dom/ExcelService.html       |    5 +-
 .../index/excel/applib/dom/HyperLink.html          |    5 +-
 .../index/excel/applib/dom/PivotColumn.html        |    5 +-
 .../index/excel/applib/dom/PivotDecoration.html    |    5 +-
 .../index/excel/applib/dom/PivotRow.html           |    5 +-
 .../index/excel/applib/dom/PivotValue.html         |    5 +-
 .../index/excel/applib/dom/RowHandler.html         |    5 +-
 .../index/excel/applib/dom/WorksheetContent.html   |    5 +-
 .../index/excel/applib/dom/WorksheetSpec.html      |    5 +-
 .../excel/applib/dom/util/AnnotationList.html      |    5 +-
 .../excel/applib/dom/util/AnnotationTriplet.html   |    5 +-
 .../applib/dom/util/ExcelFileBlobConverter.html    |    5 +-
 .../excel/applib/dom/util/ExcelServiceImpl.html    |    5 +-
 .../index/excel/applib/dom/util/Mode.html          |    5 +-
 .../index/excel/applib/dom/util/PivotUtils.html    |    5 +-
 .../index/excel/applib/dom/util/SheetPivoter.html  |    5 +-
 .../index/excel/testing/ExcelFixture.html          |    5 +-
 .../index/excel/testing/ExcelFixture2.html         |    5 +-
 .../excel/testing/ExcelFixtureRowHandler.html      |    5 +-
 .../excel/testing/ExcelFixtureWorkbookHandler.html |    5 +-
 .../excel/testing/FixtureAwareRowHandler.html      |    5 +-
 .../testing/IsisModuleSubdomainsExcelTesting.html  |    5 +-
 .../applib/IsisModuleSubdomainsSpringApplib.html   |    5 +-
 .../spring/applib/service/BeanDescriptor.html      |    5 +-
 .../index/spring/applib/service/ContextBeans.html  |    5 +-
 .../spring/applib/service/SpringBeansService.html  |    5 +-
 .../IsisModuleSubdomainsXDocReportApplib.html      |    5 +-
 .../xdocreport/applib/service/OutputType.html      |    5 +-
 .../xdocreport/applib/service/XDocReportModel.html |    5 +-
 .../applib/service/XDocReportService.html          |    5 +-
 .../applib/IsisModuleTestingFakeDataApplib.html    |    5 +-
 .../services/AbstractRandomValueGenerator.html     |    5 +-
 .../index/fakedata/applib/services/Addresses.html  |    5 +-
 .../fakedata/applib/services/BigDecimals.html      |    5 +-
 .../fakedata/applib/services/BigIntegers.html      |    5 +-
 .../index/fakedata/applib/services/Books.html      |    5 +-
 .../index/fakedata/applib/services/Booleans.html   |    5 +-
 .../index/fakedata/applib/services/Bytes.html      |    5 +-
 .../index/fakedata/applib/services/Chars.html      |    5 +-
 .../fakedata/applib/services/Collections.html      |    5 +-
 .../index/fakedata/applib/services/Comms.html      |    5 +-
 .../fakedata/applib/services/CreditCards.html      |    5 +-
 .../index/fakedata/applib/services/Doubles.html    |    5 +-
 .../index/fakedata/applib/services/Enums.html      |    5 +-
 .../fakedata/applib/services/FakeDataService.html  |    5 +-
 .../index/fakedata/applib/services/Floats.html     |    5 +-
 .../index/fakedata/applib/services/Integers.html   |    5 +-
 .../index/fakedata/applib/services/IsisBlobs.html  |    5 +-
 .../index/fakedata/applib/services/IsisClobs.html  |    5 +-
 .../fakedata/applib/services/IsisPasswords.html    |    5 +-
 .../fakedata/applib/services/J8DateTimes.html      |    5 +-
 .../fakedata/applib/services/J8LocalDates.html     |    5 +-
 .../index/fakedata/applib/services/J8Periods.html  |    5 +-
 .../fakedata/applib/services/JavaSqlDates.html     |    5 +-
 .../applib/services/JavaSqlTimestamps.html         |    5 +-
 .../fakedata/applib/services/JavaUtilDates.html    |    5 +-
 .../fakedata/applib/services/JodaDateTimes.html    |    5 +-
 .../fakedata/applib/services/JodaLocalDates.html   |    5 +-
 .../fakedata/applib/services/JodaPeriods.html      |    5 +-
 .../index/fakedata/applib/services/Longs.html      |    5 +-
 .../index/fakedata/applib/services/Lorem.html      |    5 +-
 .../index/fakedata/applib/services/Names.html      |    5 +-
 .../index/fakedata/applib/services/Shorts.html     |    5 +-
 .../index/fakedata/applib/services/Strings.html    |    5 +-
 .../index/fakedata/applib/services/Urls.html       |    5 +-
 .../index/fakedata/applib/services/Uuids.html      |    5 +-
 .../h2console/ui/IsisModuleTestingH2ConsoleUi.html |    5 +-
 .../index/h2console/ui/services/H2ManagerMenu.html |    5 +-
 .../h2console/ui/webmodule/WebModuleH2Console.html |    5 +-
 .../applib/ExceptionRecognizerTranslate.html       |    5 +-
 .../applib/IsisIntegrationTestAbstract.html        |    5 +-
 .../applib/IsisInteractionHandler.html             |    5 +-
 .../integtestsupport/applib/ThrowableMatchers.html |    5 +-
 .../applib/swagger/SwaggerExporter.html            |    5 +-
 .../applib/validate/DomainModelValidator.html      |    5 +-
 .../applib/IsisModuleTestingSpecSupportApplib.html |    5 +-
 .../integration/ObjectFactoryForIntegration.html   |    5 +-
 .../testing/index/specsupport/applib/specs/V.html  |    5 +-
 .../IsisModuleTestingUnitTestSupportApplib.html    |    5 +-
 .../applib/bean/AbstractBeanPropertiesTest.html    |    5 +-
 .../bean/FixtureDatumFactoriesForAnyPojo.html      |    5 +-
 .../bean/FixtureDatumFactoriesForApplib.html       |    5 +-
 .../applib/bean/FixtureDatumFactoriesForJoda.html  |    5 +-
 .../applib/bean/FixtureDatumFactoriesForTime.html  |    5 +-
 .../unittestsupport/applib/bean/PojoTester.html    |    5 +-
 .../core/AbstractApplyToAllContractTest.html       |    5 +-
 ...irectionalRelationshipContractTestAbstract.html |    5 +-
 .../applib/core/bidir/Instantiator.html            |    5 +-
 .../applib/core/bidir/InstantiatorSimple.html      |    5 +-
 .../applib/core/bidir/Instantiators.html           |    5 +-
 .../ComparableContractTest_compareTo.html          |    5 +-
 .../core/comparable/ComparableContractTester.html  |    5 +-
 .../unittestsupport/applib/core/files/Files.html   |    5 +-
 .../applib/core/jaxb/JaxbMatchers.html             |    5 +-
 .../applib/core/jmocking/Imposterisers.html        |    5 +-
 .../core/jmocking/InjectIntoJMockAction.html       |    5 +-
 .../applib/core/jmocking/IsisActions.html          |    5 +-
 .../applib/core/jmocking/JMockActions.html         |    5 +-
 .../applib/core/jmocking/JUnitRuleMockery2.html    |    5 +-
 .../applib/core/jmocking/PostponedAction.html      |    5 +-
 .../core/soap/SoapEndpointPublishingRule.html      |    5 +-
 .../applib/core/soap/SoapEndpointSpec.html         |    5 +-
 .../sortedsets/SortedSetsContractTestAbstract.html |    5 +-
 .../applib/core/streams/NullPrintStream.html       |    5 +-
 .../applib/core/utils/CollectUtils.html            |    5 +-
 .../applib/core/utils/IndentPrinter.html           |    5 +-
 .../applib/core/utils/ReflectUtils.html            |    5 +-
 .../applib/core/utils/StringUtils.html             |    5 +-
 .../core/value/ValueTypeContractTestAbstract.html  |    5 +-
 .../applib/dom/assertions/Asserting.html           |    5 +-
 .../applib/dom/matchers/IsisMatchers.html          |    5 +-
 .../dom/privatecons/PrivateConstructorTester.html  |    5 +-
 .../applib/dom/reflect/ReflectUtils.html           |    5 +-
 .../applib/dom/repo/FinderInteraction.html         |    5 +-
 .../applib/IsisModuleValAsciidocApplib.html        |    5 +-
 .../asciidoc/applib/jaxb/AsciiDocJaxbAdapter.html  |    5 +-
 .../index/asciidoc/applib/value/AsciiDoc.html      |    5 +-
 .../metamodel/IsisModuleValAsciidocMetaModel.html  |    5 +-
 .../IsisModuleValAsciidocPersistenceJdoDn5.html    |    5 +-
 .../jdo/dn5/converters/IsisAsciiDocConverter.html  |    5 +-
 .../ui/wkt/IsisModuleValAsciidocUiWkt.html         |    5 +-
 .../applib/IsisModuleValMarkdownApplib.html        |    5 +-
 .../markdown/applib/jaxb/MarkdownJaxbAdapter.html  |    5 +-
 .../index/markdown/applib/value/Converter.html     |    5 +-
 .../metamodel/IsisModuleValMarkdownMetaModel.html  |    5 +-
 .../IsisModuleValMarkdownPersistenceJdoDn5.html    |    5 +-
 .../jdo/dn5/converters/IsisMarkdownConverter.html  |    5 +-
 .../ui/wkt/IsisModuleValMarkdownUiWkt.html         |    5 +-
 .../index/sse/applib/IsisModuleValSseApplib.html   |    5 +-
 .../sse/applib/annotations/ServerSentEvents.html   |    5 +-
 .../index/sse/applib/annotations/SseSource.html    |    5 +-
 .../index/sse/applib/service/SseChannel.html       |    5 +-
 .../index/sse/applib/service/SseService.html       |    5 +-
 .../index/sse/ui/wkt/IsisModuleValSseUiWkt.html    |    5 +-
 .../sse/ui/wkt/services/SseServiceDefault.html     |    5 +-
 .../wkt/webmodule/WebModuleServerSentEvents.html   |    5 +-
 .../IsisModuleViewerRestfulObjectsApplib.html      |    5 +-
 .../restfulobjects/applib/JsonRepresentation.html  |    5 +-
 .../restfulobjects/applib/LinkRepresentation.html  |    5 +-
 .../viewer/index/restfulobjects/applib/Rel.html    |    5 +-
 .../index/restfulobjects/applib/RelDefinition.html |    5 +-
 .../restfulobjects/applib/RepresentationType.html  |    5 +-
 .../restfulobjects/applib/RestfulHttpMethod.html   |    5 +-
 .../restfulobjects/applib/RestfulMediaType.html    |    5 +-
 .../restfulobjects/applib/RestfulRequest.html      |    5 +-
 .../restfulobjects/applib/RestfulResponse.html     |    5 +-
 .../applib/boot/BootstrapResource.html             |    5 +-
 .../AbstractObjectMemberRepresentation.html        |    5 +-
 .../domainobjects/ActionResultRepresentation.html  |    5 +-
 .../DomainObjectMemberRepresentation.html          |    5 +-
 .../domainobjects/DomainObjectRepresentation.html  |    5 +-
 .../applib/domainobjects/DomainObjectResource.html |    5 +-
 .../applib/domainobjects/DomainRepresentation.html |    5 +-
 .../domainobjects/DomainServiceResource.html       |    5 +-
 .../applib/domainobjects/ListRepresentation.html   |    5 +-
 .../domainobjects/ObjectActionRepresentation.html  |    5 +-
 .../ObjectCollectionRepresentation.html            |    5 +-
 .../ObjectPropertyRepresentation.html              |    5 +-
 .../domainobjects/ScalarValueRepresentation.html   |    5 +-
 .../AbstractTypeMemberRepresentation.html          |    5 +-
 .../ActionDescriptionRepresentation.html           |    5 +-
 .../ActionParameterDescriptionRepresentation.html  |    5 +-
 .../CollectionDescriptionRepresentation.html       |    5 +-
 .../domaintypes/DomainTypeRepresentation.html      |    5 +-
 .../applib/domaintypes/DomainTypeResource.html     |    5 +-
 .../PropertyDescriptionRepresentation.html         |    5 +-
 .../TypeActionResultRepresentation.html            |    5 +-
 .../applib/domaintypes/TypeListRepresentation.html |    5 +-
 .../applib/dtos/ScalarValueDtoV2.html              |    5 +-
 .../applib/errors/ErrorRepresentation.html         |    5 +-
 .../applib/health/HealthRepresentation.html        |    5 +-
 .../applib/health/HealthResource.html              |    5 +-
 .../applib/homepage/HomePageRepresentation.html    |    5 +-
 .../applib/homepage/HomePageResource.html          |    5 +-
 .../applib/menubars/MenuBarsResource.html          |    5 +-
 .../applib/user/UserRepresentation.html            |    5 +-
 .../restfulobjects/applib/user/UserResource.html   |    5 +-
 .../restfulobjects/applib/util/JsonMapper.html     |    5 +-
 .../restfulobjects/applib/util/JsonNodeUtils.html  |    5 +-
 .../restfulobjects/applib/util/MediaTypes.html     |    5 +-
 .../index/restfulobjects/applib/util/Parser.html   |    5 +-
 .../index/restfulobjects/applib/util/PathNode.html |    5 +-
 .../applib/util/UrlEncodingUtils.html              |    5 +-
 .../applib/version/VersionRepresentation.html      |    5 +-
 .../applib/version/VersionResource.html            |    5 +-
 ...isModuleViewerRestfulObjectsJaxrsResteasy4.html |    5 +-
 .../conneg/RestfulObjectsJaxbWriterForXml.html     |    5 +-
 .../webmodule/WebModuleJaxrsResteasy4.html         |    5 +-
 .../restfulobjects/rendering/IResourceContext.html |    5 +-
 .../IsisModuleRestfulObjectsRendering.html         |    5 +-
 .../rendering/service/RepresentationService.html   |    5 +-
 .../RepresentationServiceContentNegotiator.html    |  972 --------
 .../acceptheader/AcceptHeaderServiceForRest.html   |    5 +-
 .../service/conneg/ContentNegotiationService.html  |    5 +-
 .../conneg/ContentNegotiationServiceAbstract.html  |    5 +-
 ...entNegotiationServiceForRestfulObjectsV1_0.html |    5 +-
 .../ContentNegotiationServiceOrgApacheIsisV1.html  |    5 +-
 .../ContentNegotiationServiceOrgApacheIsisV2.html  |    5 +-
 .../ContentNegotiationServiceXRoDomainType.html    |    5 +-
 ...onServiceForRestfulObjectsV1_0_usage-notes.html |    5 +-
 ...otiationServiceOrgApacheIsisV1_usage-notes.html |    5 +-
 ...otiationServiceOrgApacheIsisV2_usage-notes.html |    5 +-
 ...egotiationServiceXRoDomainType_usage-notes.html |    5 +-
 .../service/swagger/SwaggerServiceMenu.html        |    5 +-
 .../IsisModuleViewerRestfulObjectsViewer.html      |    5 +-
 .../wicket/model/IsisModuleViewerWicketModel.html  |    5 +-
 .../index/wicket/ui/IsisModuleViewerWicketUi.html  |    5 +-
 .../viewer/IsisModuleViewerWicketViewer.html       |    5 +-
 .../wicket/viewer/mixins/Object_clearHints.html    |    5 +-
 .../relnotes/2.0.0-M5/2018/2.0.0-M1/mignotes.html  |   33 +-
 .../2018/2.0.0-M1/mignotes/legacy-modules.html     |   33 +-
 .../2018/2.0.0-M1/mignotes/meta-annotations.html   |   33 +-
 .../2018/2.0.0-M1/mignotes/moved-types.html        |   33 +-
 .../2018/2.0.0-M1/mignotes/other-changes.html      |   33 +-
 .../2.0.0-M1/mignotes/removed-annotations.html     |   33 +-
 .../mignotes/removed-configuration-properties.html |   33 +-
 .../2018/2.0.0-M1/mignotes/removed-types.html      |   33 +-
 .../2.0.0-M1/mignotes/updated-annotations.html     |   33 +-
 .../2018/2.0.0-M1/mignotes/updated-classes.html    |   33 +-
 .../relnotes/2.0.0-M5/2018/2.0.0-M1/relnotes.html  |   36 +-
 .../relnotes/2.0.0-M5/2019/2.0.0-M2/relnotes.html  |   38 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M3/mignotes.html  |   33 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M3/relnotes.html  |   36 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M4/mignotes.html  |   33 +-
 .../relnotes/2.0.0-M5/2020/2.0.0-M4/relnotes.html  |   40 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M5/mignotes.html  |   33 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M5/relnotes.html  |   48 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M6/mignotes.html  |   33 +-
 .../relnotes/2.0.0-M5/2021/2.0.0-M6/relnotes.html  |   33 +-
 content/relnotes/2.0.0-M5/about.html               |   37 +-
 content/security/2.0.0-M5/about.html               |   95 +-
 content/security/2.0.0-M5/audit-trail/about.html   |   88 +-
 content/security/2.0.0-M5/bypass/about.html        |   96 +-
 content/security/2.0.0-M5/core/about.html          |   96 +-
 .../domain-services-api-for-applications.html      |   96 +-
 content/security/2.0.0-M5/keycloak/about.html      |   96 +-
 content/security/2.0.0-M5/secman/about.html        |   96 +-
 content/security/2.0.0-M5/secman/api.html          |   97 +-
 .../2.0.0-M5/secman/jbcrypt-encryption.html        |   97 +-
 .../security/2.0.0-M5/secman/jdo-persistence.html  |   97 +-
 content/security/2.0.0-M5/secman/model.html        |   97 +-
 content/security/2.0.0-M5/secman/shiro-realm.html  |   96 +-
 content/security/2.0.0-M5/session-log/about.html   |   86 +-
 .../security/2.0.0-M5/shiro-realm-ldap/about.html  |   96 +-
 content/security/2.0.0-M5/shiro/about.html         |  102 +-
 .../shiro/about/configuring-isis-to-use-shiro.html |   86 +-
 .../shiro/about/enhanced-wildcard-permission.html  |   88 +-
 .../security/2.0.0-M5/shiro/about/ini-realm.html   |   88 +-
 .../security/2.0.0-M5/shiro/about/jdbc-realm.html  |   88 +-
 .../security/2.0.0-M5/shiro/about/ldap-realm.html  |   86 +-
 content/security/2.0.0-M5/shiro/about/run-as.html  |   86 +-
 .../2.0.0-M5/shiro/about/shiro-caching.html        |   86 +-
 .../security/2.0.0-M5/usage-by-isis-viewers.html   |   98 +-
 .../minio => security/latest/spring}/about.html    |   70 +-
 content/setupguide/2.0.0-M5/about.html             |    5 +-
 .../eclipse/_attachments/isis-templates.xml        |  930 ++++----
 .../eclipse/_attachments/jmock2-templates.xml      |   84 +-
 .../eclipse/_attachments/junit4-templates.xml      |   70 +-
 content/setupguide/2.0.0-M5/eclipse/about.html     |    7 +-
 content/setupguide/2.0.0-M5/intellij/about.html    |    5 +-
 .../2.0.0-M5/intellij/hints-and-tips.html          |    5 +-
 content/sitemap-comguide.xml                       |   36 +-
 content/sitemap-conguide.xml                       |   22 +-
 content/sitemap-core.xml                           |   34 +-
 content/sitemap-docs.xml                           |   78 +-
 content/sitemap-extensions.xml                     |    8 +-
 content/sitemap-incubator.xml                      |   16 +-
 content/sitemap-legacy.xml                         |   14 +-
 content/sitemap-mappings.xml                       |   12 +-
 content/sitemap-pjdo.xml                           |   62 +-
 content/sitemap-pjpa.xml                           |   22 +-
 content/sitemap-refguide.xml                       | 2480 ++++++++++----------
 content/sitemap-relnotes.xml                       |   42 +-
 content/sitemap-security.xml                       |   50 +-
 content/sitemap-setupguide.xml                     |    8 +-
 content/sitemap-subdomains.xml                     |   22 +-
 content/sitemap-testing.xml                        |   36 +-
 content/sitemap-tooling.xml                        |    4 +-
 content/sitemap-userguide.xml                      |  134 +-
 content/sitemap-valuetypes.xml                     |    8 +-
 content/sitemap-vro.xml                            |   50 +-
 content/sitemap-vw.xml                             |   78 +-
 content/subdomains/2.0.0-M5/about.html             |    5 +-
 content/subdomains/2.0.0-M5/base/about.html        |    5 +-
 content/subdomains/2.0.0-M5/docx/about.html        |    5 +-
 content/subdomains/2.0.0-M5/excel/about.html       |    5 +-
 content/subdomains/2.0.0-M5/freemarker/about.html  |    5 +-
 content/subdomains/2.0.0-M5/ognl/about.html        |    5 +-
 content/subdomains/2.0.0-M5/pdfbox/about.html      |    5 +-
 content/subdomains/2.0.0-M5/settings/about.html    |    5 +-
 content/subdomains/2.0.0-M5/spring/about.html      |    5 +-
 content/subdomains/2.0.0-M5/xdocreport/about.html  |    5 +-
 content/subdomains/2.0.0-M5/zip/about.html         |    5 +-
 content/testing/2.0.0-M5/about.html                |    5 +-
 content/testing/2.0.0-M5/fakedata/about.html       |    5 +-
 content/testing/2.0.0-M5/fixtures/about.html       |    5 +-
 .../fixtures/fixture-scripts/api-and-usage.html    |    5 +-
 .../fixture-scripts/mocking-the-clock.html         |    5 +-
 .../fixtures/fixture-scripts/sudo-service.html     |    5 +-
 .../services/ExecutionParametersService.html       |    5 +-
 .../2.0.0-M5/fixtures/services/FixtureScripts.html |    5 +-
 .../FixtureScriptsSpecificationProvider.html       |    5 +-
 content/testing/2.0.0-M5/h2console/about.html      |    5 +-
 .../2.0.0-M5/h2console/services/H2ManagerMenu.html |    5 +-
 content/testing/2.0.0-M5/hsqldbmgr/about.html      |    5 +-
 .../hsqldbmgr/services/HsqlDbManagerMenu.html      |    5 +-
 .../testing/2.0.0-M5/integtestsupport/about.html   |    5 +-
 .../integtestsupport/domain-model-validator.html   |    5 +-
 .../integtestsupport/swagger-exporter.html         |    5 +-
 content/testing/2.0.0-M5/specsupport/about.html    |    5 +-
 .../testing/2.0.0-M5/unittestsupport/about.html    |    5 +-
 content/tooling/2.0.0-M5/about.html                |    5 +-
 content/tooling/2.0.0-M5/tooling-cli/about.html    |  268 +--
 .../userguide/2.0.0-M5/_to-repurpose/about.html    |    5 +-
 content/userguide/2.0.0-M5/about.html              |    5 +-
 content/userguide/2.0.0-M5/btb/about.html          |    5 +-
 .../userguide/2.0.0-M5/btb/headless-access.html    |    5 +-
 content/userguide/2.0.0-M5/btb/hints-and-tips.html |    7 +-
 .../2.0.0-M5/btb/hints-and-tips/are-you-sure.html  |    5 +-
 .../2.0.0-M5/btb/hints-and-tips/custom-css.html    |    5 +-
 .../how-to-handle-void-and-null-results.html       |    5 +-
 .../how-to-implement-a-spellchecker.html           |    5 +-
 .../btb/hints-and-tips/persisted-title.html        |    5 +-
 .../replacing-default-service-implementations.html |    5 +-
 .../simulating-collections-of-values.html          |    5 +-
 .../subclass-properties-in-tables.html             |    5 +-
 .../hints-and-tips/transactions-and-errors.html    |    7 +-
 .../btb/hints-and-tips/vetoing-visibility.html     |    5 +-
 .../hints-and-tips/view-model-instantiation.html   |    5 +-
 content/userguide/2.0.0-M5/btb/i18n.html           |    5 +-
 .../userguide/2.0.0-M5/btb/other-techniques.html   |    5 +-
 .../userguide/2.0.0-M5/btb/programming-model.html  |    5 +-
 .../btb/programming-model/custom-validator.html    |    5 +-
 .../2.0.0-M5/btb/programming-model/finetuning.html |    5 +-
 content/userguide/2.0.0-M5/flyway/about.html       |    5 +-
 content/userguide/2.0.0-M5/fun/about.html          |    5 +-
 content/userguide/2.0.0-M5/fun/business-rules.html |    5 +-
 .../2.0.0-M5/fun/business-rules/usability.html     |    5 +-
 .../2.0.0-M5/fun/business-rules/validity.html      |    5 +-
 .../2.0.0-M5/fun/business-rules/visibility.html    |    5 +-
 .../userguide/2.0.0-M5/fun/concepts-patterns.html  |    9 +-
 .../apache-isis-vs-cqrs-and-event-sourcing.html    |    5 +-
 .../fun/concepts-patterns/architecture.html        |    9 +-
 .../fun/concepts-patterns/core-values.html         |    5 +-
 .../fun/concepts-patterns/deployment-options.html  |    5 +-
 .../concepts-patterns/domain-driven-design.html    |    5 +-
 .../2.0.0-M5/fun/concepts-patterns/metamodel.html  |    5 +-
 .../concepts-patterns/naked-objects-pattern.html   |    5 +-
 .../2.0.0-M5/fun/domain-entities-and-services.html |   13 +-
 .../fun/domain-entities-and-services/crud.html     |   11 +-
 .../domain-entities.html                           |    5 +-
 .../domain-services.html                           |    7 +-
 .../inject-services.html                           |    5 +-
 .../2.0.0-M5/fun/drop-downs-and-defaults.html      |    5 +-
 .../userguide/2.0.0-M5/fun/meta-annotations.html   |    5 +-
 content/userguide/2.0.0-M5/fun/mixins.html         |    5 +-
 content/userguide/2.0.0-M5/fun/modules.html        |    5 +-
 content/userguide/2.0.0-M5/fun/object-members.html |    5 +-
 .../2.0.0-M5/fun/object-members/actions.html       |    5 +-
 .../2.0.0-M5/fun/object-members/collections.html   |    5 +-
 .../2.0.0-M5/fun/object-members/properties.html    |    5 +-
 content/userguide/2.0.0-M5/fun/overview.html       |    7 +-
 .../2.0.0-M5/fun/overview/business-rules.html      |    5 +-
 .../userguide/2.0.0-M5/fun/overview/events.html    |    7 +-
 .../2.0.0-M5/fun/overview/identifiers.html         |    5 +-
 .../userguide/2.0.0-M5/fun/overview/modules.html   |    5 +-
 .../2.0.0-M5/fun/overview/object-members.html      |    5 +-
 .../2.0.0-M5/fun/overview/programming-model.html   |    5 +-
 .../fun/overview/types-of-domain-objects.html      |    5 +-
 .../userguide/2.0.0-M5/fun/programming-model.html  |    5 +-
 content/userguide/2.0.0-M5/fun/ui.html             |    7 +-
 .../2.0.0-M5/fun/ui/action-icons-and-css.html      |    5 +-
 .../userguide/2.0.0-M5/fun/ui/menubars-layout.html |    5 +-
 .../2.0.0-M5/fun/ui/names-and-descriptions.html    |    5 +-
 .../userguide/2.0.0-M5/fun/ui/object-layout.html   |    5 +-
 .../2.0.0-M5/fun/ui/object-titles-and-icons.html   |    7 +-
 .../userguide/2.0.0-M5/fun/ui/table-columns.html   |    5 +-
 content/userguide/2.0.0-M5/fun/view-models.html    |    5 +-
 .../2.0.0-M5/fun/view-models/UNUSED-dto.html       |    5 +-
 content/userguide/2.0.0-M5/quartz/about.html       |    5 +-
 content/valuetypes/2.0.0-M5/about.html             |    5 +-
 content/valuetypes/2.0.0-M5/asciidoc/about.html    |    5 +-
 content/valuetypes/2.0.0-M5/markdown/about.html    |    5 +-
 content/valuetypes/2.0.0-M5/sse/about.html         |    5 +-
 content/vro/2.0.0-M5/about.html                    |   10 +-
 content/vro/2.0.0-M5/architecture.html             |   10 +-
 content/vro/2.0.0-M5/configuration-properties.html |    8 +-
 content/vro/2.0.0-M5/cors/about.html               |   14 +-
 content/vro/2.0.0-M5/health-check.html             |    8 +-
 content/vro/2.0.0-M5/hints-and-tips.html           |   12 +-
 .../vro/2.0.0-M5/hints-and-tips/angular-tips.html  |    8 +-
 .../2.0.0-M5/hints-and-tips/pretty-printing.html   |    8 +-
 .../hints-and-tips/restful-image-property.html     |    8 +-
 .../2.0.0-M5/hints-and-tips/troubleshooting.html   |    8 +-
 .../hints-and-tips/using-chrome-devtools.html      |    8 +-
 .../hints-and-tips/view-model-as-parameter.html    |    8 +-
 content/vro/2.0.0-M5/layout-resources.html         |    8 +-
 ...ration-properties.html => other-resources.html} |   35 +-
 content/vro/2.0.0-M5/ro-spec.html                  |    8 +-
 content/vro/2.0.0-M5/security.html                 |    8 +-
 .../2.0.0-M5/simplified-representations-v2.html    |    8 +-
 .../vro/2.0.0-M5/simplified-representations.html   |    8 +-
 .../action-invocation.html                         |    8 +-
 .../apache-isis-profile.html                       |    8 +-
 .../configuration-properties.html                  |    8 +-
 .../simplified-representations/domain-object.html  |    8 +-
 .../object-collection.html                         |    8 +-
 .../other-representations.html                     |    8 +-
 content/vw/2.0.0-M5/about.html                     |   10 +-
 content/vw/2.0.0-M5/configuration-properties.html  |    8 +-
 content/vw/2.0.0-M5/customisation.html             |    8 +-
 content/vw/2.0.0-M5/customisation/about-page.html  |    8 +-
 .../vw/2.0.0-M5/customisation/auto-refresh.html    |    8 +-
 content/vw/2.0.0-M5/customisation/brand-logo.html  |    8 +-
 .../customisation/cheap-n-cheerful-theme.html      |    8 +-
 .../2.0.0-M5/customisation/custom-javascript.html  |    8 +-
 .../2.0.0-M5/customisation/request-parameters.html |    8 +-
 .../customisation/top-level-index-page.html        |    8 +-
 .../customisation/tweaking-css-classes.html        |    8 +-
 .../customisation/using-different-css-file.html    |    8 +-
 .../vw/2.0.0-M5/customisation/welcome-page.html    |    8 +-
 content/vw/2.0.0-M5/exceldownload/about.html       |   14 +-
 content/vw/2.0.0-M5/extending.html                 |    8 +-
 .../2.0.0-M5/extending/custom-bootstrap-theme.html |    8 +-
 content/vw/2.0.0-M5/extending/custom-pages.html    |    8 +-
 .../login-via-query-args-prototyping.html          |    8 +-
 .../extending/replacing-page-elements.html         |    8 +-
 content/vw/2.0.0-M5/features.html                  |   12 +-
 content/vw/2.0.0-M5/features/blob-attachments.html |    8 +-
 content/vw/2.0.0-M5/features/bookmarked-pages.html |    8 +-
 .../vw/2.0.0-M5/features/hints-and-copy-url.html   |    8 +-
 content/vw/2.0.0-M5/features/recent-pages.html     |    8 +-
 .../features/sidebar-vs-modal-dialogs.html         |    8 +-
 content/vw/2.0.0-M5/features/titles-in-tables.html |    8 +-
 .../vw/2.0.0-M5/features/user-registration.html    |   12 +-
 content/vw/2.0.0-M5/features/where-am-i.html       |    8 +-
 content/vw/2.0.0-M5/fullcalendar/about.html        |    8 +-
 content/vw/2.0.0-M5/gmap3/about.html               |    8 +-
 content/vw/2.0.0-M5/hints-and-tips.html            |   12 +-
 .../hints-and-tips/highlight-current-row.html      |    8 +-
 .../i18n-label-in-wicket-viewer.html               |    8 +-
 .../2.0.0-M5/hints-and-tips/per-user-themes.html   |    8 +-
 .../vw/2.0.0-M5/hints-and-tips/svg-support.html    |    8 +-
 ...ration-properties.html => other-resources.html} |   35 +-
 content/vw/2.0.0-M5/pdfjs/about.html               |    8 +-
 content/vw/2.0.0-M5/security.html                  |   10 +-
 1647 files changed, 12635 insertions(+), 22235 deletions(-)

diff --git a/content/404.html b/content/404.html
index 61cff4e..391239e 100644
--- a/content/404.html
+++ b/content/404.html
@@ -257,9 +257,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="/security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="/security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/comguide/2.0.0-M5/about.html b/content/comguide/2.0.0-M5/about.html
index 6507e07..b2164fd 100644
--- a/content/comguide/2.0.0-M5/about.html
+++ b/content/comguide/2.0.0-M5/about.html
@@ -159,40 +159,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -310,9 +334,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/comguide/2.0.0-M5/algolia-search.html b/content/comguide/2.0.0-M5/algolia-search.html
index a64b14c..992a4c6 100644
--- a/content/comguide/2.0.0-M5/algolia-search.html
+++ b/content/comguide/2.0.0-M5/algolia-search.html
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="release-process-prereqs.html" title="Appendix: Release Process Prereqs">
+  <link rel="next" href="release-process-prereqs.html" title="Release Process Prereqs">
   <link rel="prev" href="key-generation.html" title="Key Generation">
   </head>
   <body class="article">
@@ -147,7 +147,7 @@
 <div class="nav-panel-pagination">
   <a class="page-previous" rel="prev" href="key-generation.html" title="Key Generation"><span></span></a>
   <a class="page-next" rel="next"
-     href="release-process-prereqs.html" title="Appendix: Release Process Prereqs"><span></span></a>
+     href="release-process-prereqs.html" title="Release Process Prereqs"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
   <a class="page-parent disabled" rel="prev" href="" title="Key Generation"><span></span></a>
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,7 +413,8 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
-    <li><a href="algolia-search.html">Appendix: Algolia Search</a></li>
+    <li>Appendices</li>
+    <li><a href="algolia-search.html">Algolia Search</a></li>
   </ul>
 </nav>
   <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/antora/components/comguide/modules/ROOT/pages/algolia-search.adoc">Edit</a></div>
diff --git a/content/comguide/2.0.0-M5/antora-publish-procedure.html b/content/comguide/2.0.0-M5/antora-publish-procedure.html
index 77bb4a9..e1560ac 100644
--- a/content/comguide/2.0.0-M5/antora-publish-procedure.html
+++ b/content/comguide/2.0.0-M5/antora-publish-procedure.html
@@ -158,40 +158,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -309,9 +333,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/comguide/2.0.0-M5/applying-patches.html b/content/comguide/2.0.0-M5/applying-patches.html
index 2415915..b16bf1c 100644
--- a/content/comguide/2.0.0-M5/applying-patches.html
+++ b/content/comguide/2.0.0-M5/applying-patches.html
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="cutting-a-release.html" title="Cutting a Release">
+  <link rel="next" href="updating-the-website.html" title="Updating the Website">
   <link rel="prev" href="merging-a-pull-request.html" title="Merging a Pull Request">
   </head>
   <body class="article">
@@ -147,7 +147,7 @@
 <div class="nav-panel-pagination">
   <a class="page-previous" rel="prev" href="merging-a-pull-request.html" title="Merging a Pull Request"><span></span></a>
   <a class="page-next" rel="next"
-     href="cutting-a-release.html" title="Cutting a Release"><span></span></a>
+     href="updating-the-website.html" title="Updating the Website"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
   <a class="page-parent disabled" rel="prev" href="" title="Merging a Pull Request"><span></span></a>
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
+  <li class="nav-item is-current-page" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,6 +413,7 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
+    <li>Occasionally</li>
     <li><a href="applying-patches.html">Applying Patches</a></li>
   </ul>
 </nav>
diff --git a/content/comguide/2.0.0-M5/cutting-a-release.html b/content/comguide/2.0.0-M5/cutting-a-release.html
index 3f8734f..95924a3 100644
--- a/content/comguide/2.0.0-M5/cutting-a-release.html
+++ b/content/comguide/2.0.0-M5/cutting-a-release.html
@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
   <link rel="next" href="verifying-releases.html" title="Verifying Releases">
-  <link rel="prev" href="applying-patches.html" title="Applying Patches">
+  <link rel="prev" href="updating-the-website.html" title="Updating the Website">
   </head>
   <body class="article">
 <header class="header">
@@ -145,12 +145,12 @@
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
-  <a class="page-previous" rel="prev" href="applying-patches.html" title="Applying Patches"><span></span></a>
+  <a class="page-previous" rel="prev" href="updating-the-website.html" title="Updating the Website"><span></span></a>
   <a class="page-next" rel="next"
      href="verifying-releases.html" title="Verifying Releases"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title="Applying Patches"><span></span></a>
+  <a class="page-parent disabled" rel="prev" href="" title="Updating the Website"><span></span></a>
 -->
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
+  </li>
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,6 +413,7 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
+    <li>Release</li>
     <li><a href="cutting-a-release.html">Cutting a Release</a></li>
   </ul>
 </nav>
diff --git a/content/comguide/2.0.0-M5/key-generation.html b/content/comguide/2.0.0-M5/key-generation.html
index ec06607..b05592a 100644
--- a/content/comguide/2.0.0-M5/key-generation.html
+++ b/content/comguide/2.0.0-M5/key-generation.html
@@ -11,8 +11,8 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="algolia-search.html" title="Appendix: Algolia Search">
-  <link rel="prev" href="release-process-for-interim-releases.html" title="Interim Releases">
+  <link rel="next" href="algolia-search.html" title="Algolia Search">
+  <link rel="prev" href="post-release-unsuccessful.html" title="Post Release (Unsuccessful)">
   </head>
   <body class="article">
 <header class="header">
@@ -145,12 +145,12 @@
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
-  <a class="page-previous" rel="prev" href="release-process-for-interim-releases.html" title="Interim Releases"><span></span></a>
+  <a class="page-previous" rel="prev" href="post-release-unsuccessful.html" title="Post Release (Unsuccessful)"><span></span></a>
   <a class="page-next" rel="next"
-     href="algolia-search.html" title="Appendix: Algolia Search"><span></span></a>
+     href="algolia-search.html" title="Algolia Search"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title="Interim Releases"><span></span></a>
+  <a class="page-parent disabled" rel="prev" href="" title="Post Release (Unsuccessful)"><span></span></a>
 -->
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="key-generation.html">Key Generation</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,6 +413,7 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
+    <li>Appendices</li>
     <li><a href="key-generation.html">Key Generation</a></li>
   </ul>
 </nav>
diff --git a/content/comguide/2.0.0-M5/merging-a-pull-request.html b/content/comguide/2.0.0-M5/merging-a-pull-request.html
index 4ce1939..d802289 100644
--- a/content/comguide/2.0.0-M5/merging-a-pull-request.html
+++ b/content/comguide/2.0.0-M5/merging-a-pull-request.html
@@ -159,41 +159,65 @@ page.parent doesn't seem to be set...
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
-  <li class="nav-item is-current-page" data-depth="1">
+  <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item is-current-page" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,6 +413,7 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
+    <li>Occasionally</li>
     <li><a href="merging-a-pull-request.html">Merging a Pull Request</a></li>
   </ul>
 </nav>
diff --git a/content/comguide/2.0.0-M5/pmc-notes.html b/content/comguide/2.0.0-M5/pmc-notes.html
index 68169d1..93f459a 100644
--- a/content/comguide/2.0.0-M5/pmc-notes.html
+++ b/content/comguide/2.0.0-M5/pmc-notes.html
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="prev" href="policies.html" title="Appendix: Policies">
+  <link rel="prev" href="policies.html" title="Policies">
   </head>
   <body class="article">
 <header class="header">
@@ -144,12 +144,12 @@
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
-  <a class="page-previous" rel="prev" href="policies.html" title="Appendix: Policies"><span></span></a>
+  <a class="page-previous" rel="prev" href="policies.html" title="Policies"><span></span></a>
   <a class="page-next disabled" rel="next"
      href="" title=""><span></span></a>
 <!--
 page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title="Appendix: Policies"><span></span></a>
+  <a class="page-parent disabled" rel="prev" href="" title="Policies"><span></span></a>
 -->
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -159,40 +159,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -310,9 +334,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -385,7 +412,8 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
-    <li><a href="pmc-notes.html">Appendix: PMC Notes</a></li>
+    <li>Appendices</li>
+    <li><a href="pmc-notes.html">PMC Notes</a></li>
   </ul>
 </nav>
   <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/antora/components/comguide/modules/ROOT/pages/pmc-notes.adoc">Edit</a></div>
diff --git a/content/comguide/2.0.0-M5/policies.html b/content/comguide/2.0.0-M5/policies.html
index 1c510a7..e6e9a7d 100644
--- a/content/comguide/2.0.0-M5/policies.html
+++ b/content/comguide/2.0.0-M5/policies.html
@@ -11,8 +11,8 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="pmc-notes.html" title="Appendix: PMC Notes">
-  <link rel="prev" href="release-process-prereqs.html" title="Appendix: Release Process Prereqs">
+  <link rel="next" href="pmc-notes.html" title="PMC Notes">
+  <link rel="prev" href="release-process-prereqs.html" title="Release Process Prereqs">
   </head>
   <body class="article">
 <header class="header">
@@ -145,12 +145,12 @@
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
-  <a class="page-previous" rel="prev" href="release-process-prereqs.html" title="Appendix: Release Process Prereqs"><span></span></a>
+  <a class="page-previous" rel="prev" href="release-process-prereqs.html" title="Release Process Prereqs"><span></span></a>
   <a class="page-next" rel="next"
-     href="pmc-notes.html" title="Appendix: PMC Notes"><span></span></a>
+     href="pmc-notes.html" title="PMC Notes"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title="Appendix: Release Process Prereqs"><span></span></a>
+  <a class="page-parent disabled" rel="prev" href="" title="Release Process Prereqs"><span></span></a>
 -->
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,7 +413,8 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
-    <li><a href="policies.html">Appendix: Policies</a></li>
+    <li>Appendices</li>
+    <li><a href="policies.html">Policies</a></li>
   </ul>
 </nav>
   <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/antora/components/comguide/modules/ROOT/pages/policies.adoc">Edit</a></div>
diff --git a/content/comguide/2.0.0-M5/policies/git-policy.html b/content/comguide/2.0.0-M5/policies/git-policy.html
index 68701a6..22491d1 100644
--- a/content/comguide/2.0.0-M5/policies/git-policy.html
+++ b/content/comguide/2.0.0-M5/policies/git-policy.html
@@ -158,40 +158,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -309,9 +333,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/comguide/2.0.0-M5/policies/versioning-policy.html b/content/comguide/2.0.0-M5/policies/versioning-policy.html
index a6b3233..de81de5 100644
--- a/content/comguide/2.0.0-M5/policies/versioning-policy.html
+++ b/content/comguide/2.0.0-M5/policies/versioning-policy.html
@@ -158,40 +158,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="../post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="../pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -309,9 +333,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/comguide/2.0.0-M5/post-release-successful.html b/content/comguide/2.0.0-M5/post-release-successful.html
index 0bf358c..f0b129f 100644
--- a/content/comguide/2.0.0-M5/post-release-successful.html
+++ b/content/comguide/2.0.0-M5/post-release-successful.html
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item is-current-page" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,6 +413,8 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
+    <li>Release</li>
+    <li>Post Release</li>
     <li><a href="post-release-successful.html">Post Release (Successful)</a></li>
   </ul>
 </nav>
@@ -918,17 +947,7 @@ git push origin 2.0.0-M5</code></pre>
 <div class="ulist">
 <ul>
 <li>
-<p>Update the home page of the website, <code>antora/supplemental-ui/index.html</code></p>
-<div class="ulist">
-<ul>
-<li>
-<p>update any mention of <code>master</code> &#8594; <code>2.0.0-M5</code></p>
-<div class="paragraph">
-<p>This should be the two sets of starter app instructions for helloworld and simpleapp.</p>
-</div>
-</li>
-<li>
-<p>update any mention of <code>latest</code> &#8594; <code>2.0.0-M5</code></p>
+<p>With the home page of the website, <code>antora/supplemental-ui/index.html</code>, update any mention of <code>latest</code> &#8594; <code>2.0.0-M5</code></p>
 <div class="paragraph">
 <p>This should be in hyperlinks, <code>&lt;a href="docs/&#8230;&#8203;"&gt;</code></p>
 </div>
@@ -945,9 +964,6 @@ that this isn&#8217;t performed in the docs branch (<a href="#create-doc-branch"
 </table>
 </div>
 </li>
-</ul>
-</div>
-</li>
 <li>
 <p>Now update <code>site.yml</code></p>
 <div class="paragraph">
@@ -1253,89 +1269,17 @@ Copy-n-paste the above mailing list announcement should suffice.</p>
 </div>
 </div>
 <div class="sect1">
-<h2 id="update-dependencies"><a class="anchor" href="#update-dependencies"></a>Update dependencies</h2>
+<h2 id="update-baseline-for-nightly-builds"><a class="anchor" href="#update-baseline-for-nightly-builds"></a>Update BASELINE for nightly builds</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>With the release complete, now is a good time to bump versions of dependencies (so that there is a full release cycle to identify any possible issues).</p>
-</div>
-<div class="paragraph">
-<p>You will probably want to create a new JIRA ticket for these updates (or if minor then use the "catch-all" JIRA ticket raised earlier for the next release).</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-note" title="Note"></i>
-</td>
-<td class="content">
-We now use github&#8217;s dependabot feature to keep on top of dependency updates, so this section is no longer quite so critical.
-</td>
-</tr>
-</table>
-</div>
-<div class="sect2">
-<h3 id="merge-in-any-changes-from-org-apacheapache"><a class="anchor" href="#merge-in-any-changes-from-org-apacheapache"></a>Merge in any changes from <code>org.apache:apache</code></h3>
-<div class="paragraph">
-<p>Check (via <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache%22%20a%3A%22apache%22">search.maven.org</a>) whether there is a newer version of the Apache parent <code>org.apache:apache</code>.</p>
-</div>
-<div class="paragraph">
-<p>If there are, merge in these changes to the <code>isis-parent</code> POM.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="update-plugin-versions"><a class="anchor" href="#update-plugin-versions"></a>Update plugin versions</h3>
-<div class="paragraph">
-<p>The <code>maven-versions-plugin</code> should be used to determine if there are newer versions of any of the plugins used to build Apache Isis.
-Since this goes off to the internet, it may take a minute or two to run:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn versions:display-plugin-updates &gt; /tmp/foo
-grep "\-&gt;" /tmp/foo | /bin/sort -u</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Review the generated output and make updates as you see fit.
-(However, if updating, please check by searching for known issues with newer versions).</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="update-dependency-versions"><a class="anchor" href="#update-dependency-versions"></a>Update dependency versions</h3>
-<div class="paragraph">
-<p>The <code>maven-versions-plugin</code> should be used to determine if there are newer versions of any of Isis' dependencies.
-Since this goes off to the internet, it may take a minute or two to run:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn versions:display-dependency-updates &gt; /tmp/foo
-grep "\-&gt;" /tmp/foo | /bin/sort -u</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Update any of the dependencies that are out-of-date.
-That said, do note that some dependencies may show up with a new dependency, when in fact the dependency is for an old, badly named version.
-Also, there may be new dependencies that you do not wish to move to, eg release candidates or milestones.</p>
-</div>
-<div class="paragraph">
-<p>For example, here is a report showing both of these cases:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">[INFO]   asm:asm ..................................... 3.3.1 -&gt; 20041228.180559
-[INFO]   commons-httpclient:commons-httpclient .......... 3.1 -&gt; 3.1-jbossorg-1
-[INFO]   commons-logging:commons-logging ......... 1.1.1 -&gt; 99.0-does-not-exist
-[INFO]   dom4j:dom4j ................................. 1.6.1 -&gt; 20040902.021138
-[INFO]   org.datanucleus:datanucleus-api-jdo ................ 3.1.2 -&gt; 3.2.0-m1
-[INFO]   org.datanucleus:datanucleus-core ................... 3.1.2 -&gt; 3.2.0-m1
-[INFO]   org.datanucleus:datanucleus-jodatime ............... 3.1.1 -&gt; 3.2.0-m1
-[INFO]   org.datanucleus:datanucleus-rdbms .................. 3.1.2 -&gt; 3.2.0-m1
-[INFO]   org.easymock:easymock ................................... 2.5.2 -&gt; 3.1
-[INFO]   org.jboss.resteasy:resteasy-jaxrs ............. 2.3.1.GA -&gt; 3.0-beta-1</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>For these artifacts you will need to search <a href="http://search.maven.org">Maven central repo</a> directly yourself to confirm there are no newer dependencies not shown in this list.</p>
+<p>Nightly builds (non-ASF) are generated using CI definitions in the <a href="https://github.com/apache-isis-committers/isis-nightly">github.com/apache-isis-committers/isis-nightly</a> repo, published to the <a href="https://nexus.incode.work/repository/nightly-builds/">nightly-builds</a> repo of <a href="https://nexus.incode.work/">nexus.incode.work</a>:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p>bump the <code>BASELINE</code> variable in <a href="https://github.com/apache-isis-committers/isis-nightly/blob/0fdea0c4e7419b40acc9a03746e4c3cac3f262b2/.github/workflows/apache-isis-ci-nightly.yml#L15">apache-isis-ci-nightly.yml</a> (workflow file).</p>
+</li>
+</ul>
 </div>
 </div>
 </div>
diff --git a/content/comguide/2.0.0-M5/post-release-unsuccessful.html b/content/comguide/2.0.0-M5/post-release-unsuccessful.html
index 1a9fd1e..54f75dd 100644
--- a/content/comguide/2.0.0-M5/post-release-unsuccessful.html
+++ b/content/comguide/2.0.0-M5/post-release-unsuccessful.html
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="release-process-for-interim-releases.html" title="Interim Releases">
+  <link rel="next" href="key-generation.html" title="Key Generation">
   <link rel="prev" href="post-release-successful.html" title="Post Release (Successful)">
   </head>
   <body class="article">
@@ -147,7 +147,7 @@
 <div class="nav-panel-pagination">
   <a class="page-previous" rel="prev" href="post-release-successful.html" title="Post Release (Successful)"><span></span></a>
   <a class="page-next" rel="next"
-     href="release-process-for-interim-releases.html" title="Interim Releases"><span></span></a>
+     href="key-generation.html" title="Key Generation"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
   <a class="page-parent disabled" rel="prev" href="" title="Post Release (Successful)"><span></span></a>
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
+  <li class="nav-item is-current-page" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,6 +413,8 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
+    <li>Release</li>
+    <li>Post Release</li>
     <li><a href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a></li>
   </ul>
 </nav>
diff --git a/content/comguide/2.0.0-M5/release-process-prereqs.html b/content/comguide/2.0.0-M5/release-process-prereqs.html
index 19a7a7e..a237950 100644
--- a/content/comguide/2.0.0-M5/release-process-prereqs.html
+++ b/content/comguide/2.0.0-M5/release-process-prereqs.html
@@ -11,8 +11,8 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="policies.html" title="Appendix: Policies">
-  <link rel="prev" href="algolia-search.html" title="Appendix: Algolia Search">
+  <link rel="next" href="policies.html" title="Policies">
+  <link rel="prev" href="algolia-search.html" title="Algolia Search">
   </head>
   <body class="article">
 <header class="header">
@@ -145,12 +145,12 @@
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
-  <a class="page-previous" rel="prev" href="algolia-search.html" title="Appendix: Algolia Search"><span></span></a>
+  <a class="page-previous" rel="prev" href="algolia-search.html" title="Algolia Search"><span></span></a>
   <a class="page-next" rel="next"
-     href="policies.html" title="Appendix: Policies"><span></span></a>
+     href="policies.html" title="Policies"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title="Appendix: Algolia Search"><span></span></a>
+  <a class="page-parent disabled" rel="prev" href="" title="Algolia Search"><span></span></a>
 -->
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,7 +413,8 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
-    <li><a href="release-process-prereqs.html">Appendix: Release Process Prereqs</a></li>
+    <li>Appendices</li>
+    <li><a href="release-process-prereqs.html">Release Process Prereqs</a></li>
   </ul>
 </nav>
   <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/antora/components/comguide/modules/ROOT/pages/release-process-prereqs.adoc">Edit</a></div>
diff --git a/content/comguide/2.0.0-M5/applying-patches.html b/content/comguide/2.0.0-M5/updating-the-website.html
similarity index 74%
copy from content/comguide/2.0.0-M5/applying-patches.html
copy to content/comguide/2.0.0-M5/updating-the-website.html
index 2415915..7cada4f 100644
--- a/content/comguide/2.0.0-M5/applying-patches.html
+++ b/content/comguide/2.0.0-M5/updating-the-website.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Applying Patches :: Apache Isis</title>
-    <link rel="canonical" href="https://isis.apache.org/comguide/2.0.0-M5/applying-patches.html">
+    <title>Updating the Website :: Apache Isis</title>
+    <link rel="canonical" href="https://isis.apache.org/comguide/2.0.0-M5/updating-the-website.html">
     <meta name="generator" content="Antora 2.3.4">
     <link rel="stylesheet" href="../../_/css/site.css">
     <link rel="stylesheet" href="../../_/css/site-custom.css">
@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
   <link rel="next" href="cutting-a-release.html" title="Cutting a Release">
-  <link rel="prev" href="merging-a-pull-request.html" title="Merging a Pull Request">
+  <link rel="prev" href="applying-patches.html" title="Applying Patches">
   </head>
   <body class="article">
 <header class="header">
@@ -145,12 +145,12 @@
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
-  <a class="page-previous" rel="prev" href="merging-a-pull-request.html" title="Merging a Pull Request"><span></span></a>
+  <a class="page-previous" rel="prev" href="applying-patches.html" title="Applying Patches"><span></span></a>
   <a class="page-next" rel="next"
      href="cutting-a-release.html" title="Cutting a Release"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title="Merging a Pull Request"><span></span></a>
+  <a class="page-parent disabled" rel="prev" href="" title="Applying Patches"><span></span></a>
 -->
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item is-current-page" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,115 +413,185 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
-    <li><a href="applying-patches.html">Applying Patches</a></li>
+    <li>Occasionally</li>
+    <li><a href="updating-the-website.html">Updating the Website</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/antora/components/comguide/modules/ROOT/pages/applying-patches.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
-<h1 class="page">Applying Patches</h1>
+<h1 class="page">Updating the Website</h1>
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>If a patch is received on a JIRA ticket, then it should be reviewed and applied using command line tools.</p>
+<p>As part of the release process we <a href="post-release-successful.html#generate-website" class="page">generate</a> and publish the website.
+An (intentional) side-effect of this process is to create a branch for the release (that is, <code>2.0.0-M5</code>).
+This branch can then be used for documentation updates.</p>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="inspect-the-patch"><a class="anchor" href="#inspect-the-patch"></a>Inspect the patch</h2>
+<h2 id="update-docs"><a class="anchor" href="#update-docs"></a>Update docs</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>First, take a look at what changes are in the patch.
-You can do this easily with <code>git apply</code></p>
+<p>In the regular <code>isis</code> repo:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p>Check out the branch:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git apply --stat ISIS-xxx.patch</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout 2.0.0-M5</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>Note that this command does not apply the patch, but only shows you the stats about what it’ll do.
-After peeking into the patch file with your favorite editor, you can see what the actual changes are.</p>
-</div>
-<div class="paragraph">
-<p>Next, you&#8217;re interested in how troublesome the patch is going to be.
-Git allows you to test the patch before you actually apply it.</p>
-</div>
+</li>
+<li>
+<p>make documentation updates, and commit changes</p>
+</li>
+<li>
+<p>generate the website:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git apply --check ISIS-xxx.patch</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">sh preview.sh</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>If you don&#8217;t get any errors, the patch has no conflicts.
-Otherwise you may see what trouble you’ll run into.</p>
+<p>This will write to <code>antora/target/site</code>; we&#8217;ll use the results in the <a href="#publish-website">next section</a>.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+this requires Java 11 for the projdoc tooling.
+</td>
+</tr>
+</table>
+</div>
+</li>
+</ul>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="apply-a-clean-patch"><a class="anchor" href="#apply-a-clean-patch"></a>Apply a (clean) patch</h2>
+<h2 id="publish-website"><a class="anchor" href="#publish-website"></a>Publish website</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>To apply a clean patch (adding the items and commit/signoff in a single step), use <code>git am</code>:</p>
+<p>We now copy the results of the Antora website generation over to the <code>isis-site</code> repo:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p>in the <code>isis-site</code> repo, check out the <code>asf-site</code> branch:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git am --signoff &lt; ISIS-xxx.patch</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">cd ../isis-site
+
+git checkout asf-site
+git pull --ff-only</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>This preserves the original author&#8217;s commit message.</p>
+</li>
+<li>
+<p>still in the <code>isis-site</code> repo, delete all the files in <code>content/</code> <em>except</em> for the <code>schema</code> and <code>versions</code> directories:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">pushd content
+for a in $(ls -1 | grep -v schema | grep -v versions)
+do
+    rm -rf $a
+done
+popd</code></pre>
 </div>
-<div class="paragraph">
-<p>However, this can fail if the patch file does not contain the original committers email address.
-In this case you will need to abort the <code>am</code> session:</p>
 </div>
+</li>
+<li>
+<p>Copy the generated Antora site to <code>isis-site</code> repo&#8217;s <code>contents</code> directory:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git am abort</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">cd ../isis
+
+cp -Rf antora/target/site/* ../isis-site/content/.</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>and continue on by applying a non-clean patch, as described next.</p>
+</li>
+<li>
+<p>Back in the <code>isis-site</code> repo, commit the changes and preview:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">cd ../isis-site
+
+git add .
+git commit -m "$ISISJIRA : production changes to website"
+
+sh preview.sh</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p>If everything looks ok, then push the changes to make live, and switch back to the <code>isis</code> repo:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push origin asf-site</code></pre>
+</div>
+</div>
+</li>
+</ul>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="apply-a-non-clean-patch"><a class="anchor" href="#apply-a-non-clean-patch"></a>Apply a (non-clean) patch</h2>
+<h2 id="update-the-algolia-search-index"><a class="anchor" href="#update-the-algolia-search-index"></a>Update the Algolia search index</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>If the patch does not apply cleanly, then the original authors commit message cannot be preserved.
-This sequence in this case is:</p>
+<p>Create a <code>algolia.env</code> file holding the <code>APP_ID</code> and the admin <code>API_KEY</code>, in the root of <code>isis-site</code>:</p>
 </div>
 <div class="listingblock">
+<div class="title">algolia.env</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git apply ISIS-xxx.patch</code></pre>
-</div>
+<pre class="highlightjs highlight"><code class="language-ini hljs" data-lang="ini">APPLICATION_ID=...
+API_KEY=...</code></pre>
+</div>
+</div>
+<div class="admonitionblock caution">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-caution" title="Caution"></i>
+</td>
+<td class="content">
+This file should not be checked into the repo, because the API_KEY allows the index to be modified or deleted.
+</td>
+</tr>
+</table>
 </div>
 <div class="paragraph">
-<p>Fix up any issues.
-The add and commit as usual</p>
+<p>We use the Algolia-provided <a href="https://hub.docker.com/r/algolia/docsearch-scraper">docker image</a> for the crawler to perform the search (as per the link:as per <a href="https://docsearch.algolia.com/docs/run-your-own/#run-the-crawl-from-the-docker-image">docs</a>):</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git add .
-git commit -am "&lt;original authors' commit message&gt;" --signoff</code></pre>
-</div>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">cd content
+docker run -it --env-file=../algolia.env -e "CONFIG=$(cat ../algolia-config.json | jq -r tostring)" algolia/docsearch-scraper</code></pre>
 </div>
-<div class="paragraph">
-<p>The <code>--signoff</code> simply adds a line to the commit message indicating you have signed off the commit.</p>
 </div>
 <div class="paragraph">
-<p>Information adapted from <a href="https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/">this blog post</a> and <a href="http://wiki.eclipse.org/Jetty/Contributor/Contributing_Patches">this wiki page</a>.</p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="diff-files"><a class="anchor" href="#diff-files"></a>Diff files</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>If a diff file has been provided instead of a patch, then use for example the eGit&#8217;s wizards (Eclipse&#8217;s Git integration).</p>
+<p>This posts the index up to the <a href="https://algolia.com">Algolia</a> site.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-note" title="Note"></i>
+</td>
+<td class="content">
+Additional config options for the crawler can be found <a href="https://www.algolia.com/doc/api-reference/crawler/">here</a>.
+</td>
+</tr>
+</table>
 </div>
 </div>
 </div>
diff --git a/content/comguide/2.0.0-M5/verifying-releases.html b/content/comguide/2.0.0-M5/verifying-releases.html
index 277db12..7101daf 100644
--- a/content/comguide/2.0.0-M5/verifying-releases.html
+++ b/content/comguide/2.0.0-M5/verifying-releases.html
@@ -160,40 +160,64 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Occasionally</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="merging-a-pull-request.html">Merging a Pull Request</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="applying-patches.html">Applying Patches</a>
   </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="updating-the-website.html">Updating the Website</a>
+  </li>
+</ul>
+  </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="cutting-a-release.html">Cutting a Release</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="1">
+  <li class="nav-item is-current-page" data-depth="2">
     <a class="nav-link" href="verifying-releases.html">Verifying Releases</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="2">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Post Release</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-successful.html">Post Release (Successful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item" data-depth="3">
     <a class="nav-link" href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-for-interim-releases.html">Interim Releases</a>
+</ul>
+  </li>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
+    <button class="nav-item-toggle"></button>
+    <span class="nav-text">Appendices</span>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="key-generation.html">Key Generation</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="algolia-search.html">Appendix: Algolia Search</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="algolia-search.html">Algolia Search</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="release-process-prereqs.html">Appendix: Release Process Prereqs</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="release-process-prereqs.html">Release Process Prereqs</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="policies.html">Appendix: Policies</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="policies.html">Policies</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="pmc-notes.html">Appendix: PMC Notes</a>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="pmc-notes.html">PMC Notes</a>
+  </li>
+</ul>
   </li>
 </ul>
   </li>
@@ -311,9 +335,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -386,6 +413,7 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="about.html">Committers' Guide</a></li>
+    <li>Release</li>
     <li><a href="verifying-releases.html">Verifying Releases</a></li>
   </ul>
 </nav>
diff --git a/content/conguide/2.0.0-M5/about.html b/content/conguide/2.0.0-M5/about.html
index b7852dc..4f2d43c 100644
--- a/content/conguide/2.0.0-M5/about.html
+++ b/content/conguide/2.0.0-M5/about.html
@@ -320,9 +320,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/agilej/about.html b/content/conguide/2.0.0-M5/agilej/about.html
index 64f5c96..a01a3e2 100644
--- a/content/conguide/2.0.0-M5/agilej/about.html
+++ b/content/conguide/2.0.0-M5/agilej/about.html
@@ -319,9 +319,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/building-apache-isis.html b/content/conguide/2.0.0-M5/building-apache-isis.html
index b6062c8..34dfd32 100644
--- a/content/conguide/2.0.0-M5/building-apache-isis.html
+++ b/content/conguide/2.0.0-M5/building-apache-isis.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/contributing.html b/content/conguide/2.0.0-M5/contributing.html
index 64e38c7..3f0f7c4 100644
--- a/content/conguide/2.0.0-M5/contributing.html
+++ b/content/conguide/2.0.0-M5/contributing.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/documentation/about.html b/content/conguide/2.0.0-M5/documentation/about.html
index 48abee9..f42dac7 100644
--- a/content/conguide/2.0.0-M5/documentation/about.html
+++ b/content/conguide/2.0.0-M5/documentation/about.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html b/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html
index 9bd5ed5..006f96c 100644
--- a/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html
+++ b/content/conguide/2.0.0-M5/documentation/asciidoc-syntax.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html b/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html
index c5cd91a..391fd3e 100644
--- a/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html
+++ b/content/conguide/2.0.0-M5/documentation/building-docs-and-website.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -486,28 +489,36 @@ This requires:</p>
 <h2 id="build"><a class="anchor" href="#build"></a>Build</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>To build the website:</p>
+<p>The <code>preview.sh</code> script can be used to build the website, also calling the documentation tooling that automates documentation from code (the <a href="../../../core/2.0.0-M5/_overview/about.html" class="page">System Overview</a>, large parts of the <a href="../../../refguide/2.0.0-M5/about.html" class="page">Reference Guide</a> and the <a href="../../../refguide/2.0.0-M5/config/about.html" class="page">Configuration Guide</a>).</p>
+</div>
+<div class="paragraph">
+<p>Use <code>preview.sh -h</code> to view options.
+The lower case flags skip steps, while the upper case flags exclude all steps except those indicated:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>use <code>build-site.sh</code>; or even better &#8230;&#8203;</p>
+<p><code>preview.sh</code></p>
+<div class="paragraph">
+<p>builds everything and serves up the site</p>
+</div>
 </li>
 <li>
-<p>use <code>preview.sh</code>, to build and then preview in a web browser</p>
-</li>
-</ul>
-</div>
+<p><code>preview.sh -AS</code></p>
 <div class="paragraph">
-<p>Both scripts can be found at the root of this git repo.</p>
+<p>runs only Antora generation and serves up the site</p>
 </div>
+</li>
+<li>
+<p><code>preview.sh -ekcdl</code></p>
+<div class="paragraph">
+<p>does the same thing, by skipping the other 5 steps.</p>
 </div>
+</li>
+</ul>
 </div>
-<div class="sect1">
-<h2 id="updating-the-generated-system-overview"><a class="anchor" href="#updating-the-generated-system-overview"></a>Updating the Generated System Overview</h2>
-<div class="sectionbody">
 <div class="paragraph">
-<p>The <a href="../../../refguide/2.0.0-M5/_overview/about.html" class="page">System Overview</a> contains a set of <code>.adoc</code> files that are generated from Java classes.</p>
+<p>The script can be found at the root of this git repo.</p>
 </div>
 </div>
 </div>
diff --git a/content/conguide/2.0.0-M5/documentation/tooling.html b/content/conguide/2.0.0-M5/documentation/tooling.html
index 96dd76f..1610a8d 100644
--- a/content/conguide/2.0.0-M5/documentation/tooling.html
+++ b/content/conguide/2.0.0-M5/documentation/tooling.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-Isis-code-style-cleanup.xml b/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-Isis-code-style-cleanup.xml
index 5be4fc3..6e6fcd5 100644
--- a/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-Isis-code-style-cleanup.xml
+++ b/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-Isis-code-style-cleanup.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<profiles version="2">
-<profile kind="CleanUpProfile" name="Apache Isis" version="2">
-<setting id="cleanup.remove_unused_private_fields" value="true"/>
-<setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
-<setting id="cleanup.never_use_blocks" value="false"/>
-<setting id="cleanup.remove_unused_private_methods" value="true"/>
-<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
-<setting id="cleanup.convert_to_enhanced_for_loop" value="true"/>
-<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
-<setting id="cleanup.sort_members" value="false"/>
-<setting id="cleanup.remove_unused_local_variables" value="false"/>
-<setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
-<setting id="cleanup.remove_unused_private_members" value="false"/>
-<setting id="cleanup.remove_unnecessary_casts" value="true"/>
-<setting id="cleanup.make_parameters_final" value="true"/>
-<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
-<setting id="cleanup.remove_private_constructors" value="true"/>
-<setting id="cleanup.use_blocks" value="true"/>
-<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
-<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
-<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
-<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
-<setting id="cleanup.add_default_serial_version_id" value="true"/>
-<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
-<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
-<setting id="cleanup.make_variable_declarations_final" value="true"/>
-<setting id="cleanup.add_missing_nls_tags" value="false"/>
-<setting id="cleanup.format_source_code" value="true"/>
-<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="true"/>
-<setting id="cleanup.add_missing_override_annotations" value="true"/>
-<setting id="cleanup.remove_unused_private_types" value="true"/>
-<setting id="cleanup.add_missing_methods" value="false"/>
-<setting id="cleanup.make_local_variable_final" value="true"/>
-<setting id="cleanup.correct_indentation" value="true"/>
-<setting id="cleanup.remove_unused_imports" value="true"/>
-<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
-<setting id="cleanup.make_private_fields_final" value="true"/>
-<setting id="cleanup.add_generated_serial_version_id" value="false"/>
-<setting id="cleanup.organize_imports" value="true"/>
-<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
-<setting id="cleanup.sort_members_all" value="false"/>
-<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
-<setting id="cleanup.add_missing_annotations" value="true"/>
-<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
-<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="true"/>
-<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
-<setting id="cleanup.use_this_for_non_static_method_access" value="false"/>
-<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
-<setting id="cleanup.add_serial_version_id" value="true"/>
-<setting id="cleanup.format_source_code_changes_only" value="false"/>
-<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="false"/>
-<setting id="cleanup.always_use_blocks" value="true"/>
-</profile>
-</profiles>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+         http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<profiles version="2">
+<profile kind="CleanUpProfile" name="Apache Isis" version="2">
+<setting id="cleanup.remove_unused_private_fields" value="true"/>
+<setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.never_use_blocks" value="false"/>
+<setting id="cleanup.remove_unused_private_methods" value="true"/>
+<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
+<setting id="cleanup.convert_to_enhanced_for_loop" value="true"/>
+<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
+<setting id="cleanup.sort_members" value="false"/>
+<setting id="cleanup.remove_unused_local_variables" value="false"/>
+<setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
+<setting id="cleanup.remove_unused_private_members" value="false"/>
+<setting id="cleanup.remove_unnecessary_casts" value="true"/>
+<setting id="cleanup.make_parameters_final" value="true"/>
+<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
+<setting id="cleanup.remove_private_constructors" value="true"/>
+<setting id="cleanup.use_blocks" value="true"/>
+<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
+<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
+<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
+<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
+<setting id="cleanup.add_default_serial_version_id" value="true"/>
+<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
+<setting id="cleanup.make_variable_declarations_final" value="true"/>
+<setting id="cleanup.add_missing_nls_tags" value="false"/>
+<setting id="cleanup.format_source_code" value="true"/>
+<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="true"/>
+<setting id="cleanup.add_missing_override_annotations" value="true"/>
+<setting id="cleanup.remove_unused_private_types" value="true"/>
+<setting id="cleanup.add_missing_methods" value="false"/>
+<setting id="cleanup.make_local_variable_final" value="true"/>
+<setting id="cleanup.correct_indentation" value="true"/>
+<setting id="cleanup.remove_unused_imports" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
+<setting id="cleanup.make_private_fields_final" value="true"/>
+<setting id="cleanup.add_generated_serial_version_id" value="false"/>
+<setting id="cleanup.organize_imports" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
+<setting id="cleanup.sort_members_all" value="false"/>
+<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
+<setting id="cleanup.add_missing_annotations" value="true"/>
+<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="true"/>
+<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
+<setting id="cleanup.use_this_for_non_static_method_access" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
+<setting id="cleanup.add_serial_version_id" value="true"/>
+<setting id="cleanup.format_source_code_changes_only" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="false"/>
+<setting id="cleanup.always_use_blocks" value="true"/>
+</profile>
+</profiles>
diff --git a/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-formatting.xml b/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-formatting.xml
index 54a593f..d286b76 100644
--- a/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-formatting.xml
+++ b/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-formatting.xml
@@ -1,297 +1,297 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="ASF" version="11">
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="300"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-</profile>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+         http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="ASF" version="11">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="300"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
 </profiles>
\ No newline at end of file
diff --git a/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-template.xml b/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-template.xml
index 86faa8b..1beec47 100644
--- a/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-template.xml
+++ b/content/conguide/2.0.0-M5/eclipse/_attachments/Apache-code-style-template.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<templates>
-<template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
- * @return the ${bare_field_name}
- */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
- * @param ${param} the ${bare_field_name} to set
- */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
- * ${tags}
- */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/**&#13;
- *  Licensed to the Apache Software Foundation (ASF) under one or more&#13;
- *  contributor license agreements.  See the NOTICE file distributed with&#13;
- *  this work for additional information regarding copyright ownership.&#13;
- *  The ASF licenses this file to You under the Apache License, Version 2.0&#13;
- *  (the "License"); you may not use this file except in compliance with&#13;
- *  the License.  You may obtain a copy of the License at&#13;
- *&#13;
- *     http://www.apache.org/licenses/LICENSE-2.0&#13;
- *&#13;
- *  Unless required by applicable law or agreed to in writing, software&#13;
- *  distributed under the License is distributed on an "AS IS" BASIS,&#13;
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#13;
- *  See the License for the specific language governing permissions and&#13;
- *  limitations under the License.&#13;
- */</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * ${tags}
- *
- * @version $$Rev$$ $$Date$$
- */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"/><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Javadoc)
- * ${see_to_overridden}
- */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
- * ${tags}
- * ${see_to_target}
- */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-${package_declaration}
-
-${typecomment}
-${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
-</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
-</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
-</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
-</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
-${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
-${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};
-</template>
-</templates>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<templates>
+<template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
+ * @return the ${bare_field_name}
+ */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
+ * @param ${param} the ${bare_field_name} to set
+ */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
+ * ${tags}
+ */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/**&#13;
+ *  Licensed to the Apache Software Foundation (ASF) under one or more&#13;
+ *  contributor license agreements.  See the NOTICE file distributed with&#13;
+ *  this work for additional information regarding copyright ownership.&#13;
+ *  The ASF licenses this file to You under the Apache License, Version 2.0&#13;
+ *  (the "License"); you may not use this file except in compliance with&#13;
+ *  the License.  You may obtain a copy of the License at&#13;
+ *&#13;
+ *     http://www.apache.org/licenses/LICENSE-2.0&#13;
+ *&#13;
+ *  Unless required by applicable law or agreed to in writing, software&#13;
+ *  distributed under the License is distributed on an "AS IS" BASIS,&#13;
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#13;
+ *  See the License for the specific language governing permissions and&#13;
+ *  limitations under the License.&#13;
+ */</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
+ * ${tags}
+ *
+ * @version $$Rev$$ $$Date$$
+ */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"/><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
+ * ${tags}
+ */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Javadoc)
+ * ${see_to_overridden}
+ */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
+ * ${tags}
+ * ${see_to_target}
+ */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
+${package_declaration}
+
+${typecomment}
+${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
+</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
+</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
+</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
+</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
+${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
+${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
+// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};
+</template>
+</templates>
diff --git a/content/conguide/2.0.0-M5/eclipse/about.html b/content/conguide/2.0.0-M5/eclipse/about.html
index 877c157..d9ed890 100644
--- a/content/conguide/2.0.0-M5/eclipse/about.html
+++ b/content/conguide/2.0.0-M5/eclipse/about.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/git/about.html b/content/conguide/2.0.0-M5/git/about.html
index f19548f..b58bcff 100644
--- a/content/conguide/2.0.0-M5/git/about.html
+++ b/content/conguide/2.0.0-M5/git/about.html
@@ -320,9 +320,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/conguide/2.0.0-M5/intellij/_attachments/Apache-Isis-importorder.xml b/content/conguide/2.0.0-M5/intellij/_attachments/Apache-Isis-importorder.xml
index 550034d..c7954e2 100644
--- a/content/conguide/2.0.0-M5/intellij/_attachments/Apache-Isis-importorder.xml
+++ b/content/conguide/2.0.0-M5/intellij/_attachments/Apache-Isis-importorder.xml
@@ -1,61 +1,61 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. The ASF licenses this file to
-you under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of
-the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-by applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, either express or implied. See the License for the specific
-language governing permissions and limitations under the License.
--->
-<code_scheme name="Apache-Isis" version="173">
-  <JavaCodeStyleSettings>
-    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-      <value />
-    </option>
-    <option name="IMPORT_LAYOUT_TABLE">
-      <value>
-        <package name="java" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="java" withSubpackages="true" static="true" />
-        <emptyLine />
-        <package name="javax" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="javax" withSubpackages="true" static="true" />
-        <emptyLine />
-        <package name="com" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="com" withSubpackages="true" static="true" />
-        <emptyLine />
-        <package name="org" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="org" withSubpackages="true" static="true" />
-        <emptyLine />
-        <package name="org.apache.isis" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="org.apache.isis" withSubpackages="true" static="true" />
-        <emptyLine />
-        <package name="org.isisaddons" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="org.isisaddons" withSubpackages="true" static="true" />
-        <emptyLine />
-        <package name="org.incode" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="org.incode" withSubpackages="true" static="true" />
-        <emptyLine />
-        <package name="lombok" withSubpackages="true" static="false" />
-        <package name="lombok.experimental" withSubpackages="true" static="false" />
-        <package name="lombok.extern.log4j" withSubpackages="true" static="false" />
-        <package name="lombok.extern" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="" withSubpackages="true" static="true" />
-      </value>
-    </option>
-  </JavaCodeStyleSettings>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE file distributed with this work for additional
+information regarding copyright ownership. The ASF licenses this file to
+you under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of
+the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+by applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.
+-->
+<code_scheme name="Apache-Isis" version="173">
+  <JavaCodeStyleSettings>
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="java" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="com" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="com" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="org" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="org.apache.isis" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.apache.isis" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="org.isisaddons" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.isisaddons" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="org.incode" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.incode" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="lombok" withSubpackages="true" static="false" />
+        <package name="lombok.experimental" withSubpackages="true" static="false" />
+        <package name="lombok.extern.log4j" withSubpackages="true" static="false" />
+        <package name="lombok.extern" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+  </JavaCodeStyleSettings>
 </code_scheme>
\ No newline at end of file
diff --git a/content/conguide/2.0.0-M5/intellij/about.html b/content/conguide/2.0.0-M5/intellij/about.html
index 563573e..019b7f9 100644
--- a/content/conguide/2.0.0-M5/intellij/about.html
+++ b/content/conguide/2.0.0-M5/intellij/about.html
@@ -321,9 +321,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg b/content/core/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg b/content/core/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-0230c8e4072b808bb006a225fdcd7abc5fc87752.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg b/content/core/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg b/content/core/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-1453847bed368ce85f415b17cdf90fd62a056a9b.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg b/content/core/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-14772700eda20fa11b253c46866367e33f4a263b.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg b/content/core/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-324ba54ae1b35393d89a54c34fc09aaade28da2c.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg b/content/core/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-412761b61755a662695ad967fe8bff44034633b1.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg b/content/core/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-415bb880da3d6291f07b2309b72c30d23e203862.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg b/content/core/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg b/content/core/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg b/content/core/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg b/content/core/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg b/content/core/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg b/content/core/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg b/content/core/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-8414526961173c7544fb1cd428be58cb7d649d23.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg b/content/core/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg b/content/core/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-865b843f2968fd1ddbf6dea450b915aff67f59ad.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg b/content/core/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg b/content/core/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg b/content/core/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg b/content/core/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-9a41e0a9cd62ff42635c6def5baef38282722299.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg b/content/core/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-a02d72d118f555411ac927d71e37d031eee3f467.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg b/content/core/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-a1eef212f9499278372b4df33828b0639e41657b.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg b/content/core/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg b/content/core/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg b/content/core/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg b/content/core/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-abb1a9625c2c360681402c4aa0f1abb2fbbaa347.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg b/content/core/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg b/content/core/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg b/content/core/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg b/content/core/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg b/content/core/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-e856623de7dacab9c5307569b758efe0cbaf25c4.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg b/content/core/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-bbcaf47ef6e5f6a70d9c8d0db9ab6fcc441cab74.svg b/content/core/2.0.0-M5/_overview/_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg
similarity index 99%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-bbcaf47ef6e5f6a70d9c8d0db9ab6fcc441cab74.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg
index 525a7ba..5532943 100644
--- a/content/refguide/2.0.0-M5/_overview/_images/diag-bbcaf47ef6e5f6a70d9c8d0db9ab6fcc441cab74.svg
+++ b/content/core/2.0.0-M5/_overview/_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg
@@ -44,7 +44,7 @@ link 2 to 16--><path d="M146.7,868.7292 C195.02,930.5792 311.23,1079.3192 362.49
 link 2 to 23--><path d="M216.07,840.9492 C235.32,840.9492 255.84,840.9492 275.76,840.9492 " fill="none" id="2-to-23" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="280.8,840.9492,271.8,836.9492,275.8,840.9492,271.8,844.9492,280.8,840.9492" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="250" y="837.4766"/><!--MD5=[4e74f4bf4b09d37138dfb3a42c5ccc13]
 link 2 to 5--><path d="M183.91,813.3492 C213.35,799.5492 249.85,782.4492 283.78,766.5492 " fill="none" id="2-to-5" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="288.33,764.4192,278.4833,764.6276,283.8049,766.5461,281.8864,771.8677,288.33,764.4192" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="250" y="780.4766"/><!--MD5=[676073e7019c75b59fc [...]
 link 2 to 9--><path d="M143.25,813.3792 C170.15,774.1092 223.52,701.2692 281,650.9492 C286.45,646.1792 292.29,641.5292 298.32,637.0492 " fill="none" id="2-to-9" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="302.52,633.9792,292.8896,636.0419,298.4776,636.9218,297.5976,642.5098,302.52,633.9792" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x="2 [...]
-link 2 to 12--><path d="M138.16,813.1992 C164.76,757.1992 227.02,626.7292 281,517.9492 C309.56,460.3992 343.36,394.4192 365.1,352.2392 " fill="none" id="2-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="367.43,347.7292,359.7402,353.8828,365.1313,352.1695,366.8446,357.5607,367.43,347.7292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x=" [...]
+link 2 to 12--><path d="M138.16,813.1992 C164.76,757.1992 227.02,626.7292 281,517.9492 C309.56,460.3992 343.36,394.4192 365.1,352.2392 " fill="none" id="2-to-12" style="stroke:#707070;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#707070" points="367.43,347.7292,359.7402,353.8828,365.1313,352.1695,366.8446,357.5607,367.43,347.7292" style="stroke:#707070;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="0" x=" [...]
 @startuml(id=Extensions)
 title Extensions - Containers
 caption Artifact Hierarchy (Maven)
@@ -58,22 +58,22 @@ skinparam {
 }
 hide stereotype
 left to right direction
-skinparam rectangle<<11>> {
+skinparam rectangle<<22>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<22>> {
+skinparam rectangle<<11>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<23>> {
+skinparam rectangle<<12>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<12>> {
+skinparam rectangle<<23>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
@@ -163,12 +163,12 @@ skinparam rectangle<<20>> {
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<21>> {
+skinparam rectangle<<10>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
 }
-skinparam rectangle<<10>> {
+skinparam rectangle<<21>> {
   BackgroundColor #438dd5
   FontColor #fffffe
   BorderColor #2E6295
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg b/content/core/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg b/content/core/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-f46b0c1ba9ac25b96799a1244b38bcb13119e884.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg b/content/core/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-f89a4bd70a6766c16dd9e8381dd754c7b553d179.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg b/content/core/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg
diff --git a/content/refguide/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg b/content/core/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg
similarity index 100%
rename from content/refguide/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg
rename to content/core/2.0.0-M5/_overview/_images/diag-fb4b65a335f366118a821d62f2f2d059b98b941d.svg
diff --git a/content/refguide/2.0.0-M5/_overview/about.html b/content/core/2.0.0-M5/_overview/about.html
similarity index 70%
rename from content/refguide/2.0.0-M5/_overview/about.html
rename to content/core/2.0.0-M5/_overview/about.html
index fe53239..6539fcb 100644
--- a/content/refguide/2.0.0-M5/_overview/about.html
+++ b/content/core/2.0.0-M5/_overview/about.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>System Overview :: Apache Isis</title>
-    <link rel="canonical" href="https://isis.apache.org/refguide/2.0.0-M5/_overview/about.html">
+    <link rel="canonical" href="https://isis.apache.org/core/2.0.0-M5/_overview/about.html">
     <meta name="generator" content="Antora 2.3.4">
     <link rel="stylesheet" href="../../../_/css/site.css">
     <link rel="stylesheet" href="../../../_/css/site-custom.css">
@@ -139,7 +139,7 @@
   </nav>
 </header>
 <div class="body ">
-<div class="nav-container" data-component="refguide" data-version="2.0.0-M5">
+<div class="nav-container" data-component="core" data-version="2.0.0-M5">
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
@@ -153,507 +153,45 @@ page.parent doesn't seem to be set...
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
   <nav class="nav-menu">
-    <h3 class="title"><a href="../about.html">Reference Guide</a></h3>
+    <h3 class="title"><a href="../about.html">Design Docs</a></h3>
 <ul class="nav-list">
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-svc/about.html">Domain Services</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/acceptheader/AcceptHeaderService.html">AcceptHeaderService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/appfeat/ApplicationFeatureRepository.html">ApplicationFeatureRepository</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/bookmark/BookmarkService.html">BookmarkService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/bookmarkui/BookmarkUiService.html">BookmarkUiService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/clock/ClockService.html">ClockService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/commanddto/processor/spi/CommandDtoProcessorService.html">CommandDtoProcessorService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/command/CommandExecutorService.html">CommandExecutorService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/publishing/spi/CommandSubscriber.html">CommandSubscriber</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/confview/ConfigurationMenu.html">ConfigurationMenu</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/confview/ConfigurationViewService.html">ConfigurationViewService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/conmap/ContentMappingService.html">ContentMappingService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/linking/DeepLinkService.html">DeepLinkService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/userreg/EmailNotificationService.html">EmailNotificationService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/email/EmailService.html">EmailService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/publishing/spi/EntityChangesSubscriber.html">EntityChangesSubscriber</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/publishing/spi/EntityPropertyChangeSubscriber.html">EntityPropertyChangeSubscriber</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/error/ErrorReportingService.html">ErrorReportingService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/eventbus/EventBusService.html">EventBusService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/exceprecog/ExceptionRecognizerService.html">ExceptionRecognizerService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/factory/FactoryService.html">FactoryService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/grid/GridLoaderService.html">GridLoaderService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/grid/GridService.html">GridService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/grid/GridSystemService.html">GridSystemService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/health/HealthCheckService.html">HealthCheckService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/hint/HintStore.html">HintStore</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/homepage/HomePageResolverService.html">HomePageResolverService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/iactn/InteractionContext.html">InteractionContext</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/jaxb/JaxbService.html">JaxbService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/layout/LayoutService.html">LayoutService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/layout/LayoutServiceMenu.html">LayoutServiceMenu</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/i18n/LocaleProvider.html">LocaleProvider</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/menu/MenuBarsLoaderService.html">MenuBarsLoaderService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/menu/MenuBarsService.html">MenuBarsService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/message/MessageService.html">MessageService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/metamodel/MetaModelService.html">MetamodelService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/metamodel/MetaModelServiceMenu.html">MetamodelServiceMenu</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/metrics/MetricsService.html">MetricsService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/publishing/spi/ExecutionSubscriber.html">ExecutionSubscriber</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/queryresultscache/QueryResultsCache.html">QueryResultsCache</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/repository/RepositoryService.html">RepositoryService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/routing/RoutingService.html">RoutingService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/scratchpad/Scratchpad.html">Scratchpad</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/inject/ServiceInjector.html">ServiceInjector</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/registry/ServiceRegistry.html">ServiceRegistry</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/session/SessionLoggingService.html">SessionLoggingService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/sudo/SudoService.html">SudoService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/swagger/SwaggerService.html">SwaggerService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/tablecol/TableColumnOrderService.html">TableColumnOrderService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/title/TitleService.html">TitleService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/i18n/TranslationService.html">TranslationService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/i18n/TranslationsResolver.html">TranslationsResolver</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/xactn/TransactionalProcessor.html">TransactionProcessor</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/xactn/TransactionService.html">TransactionService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/urlencoding/UrlEncodingService.html">UrlEncodingService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/userprof/UserProfileService.html">UserProfileService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/userreg/UserRegistrationService.html">UserRegistrationService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/user/UserService.html">UserService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/wrapper/WrapperFactory.html">WrapperFactory</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/xml/XmlService.html">XmlService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/services/xmlsnapshot/XmlSnapshotService.html">XmlSnapshotService</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../archdesign/about.html">Architecture &amp; Design</a>
   </li>
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-ant/about.html">Annotations</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/Action.html">Action</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/ActionLayout.html">ActionLayout</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/Collection.html">Collection</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/CollectionLayout.html">CollectionLayout</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/Column.html">Column</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/Digits.html">Digits</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/Discriminator.html">Discriminator</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/DomainObject.html">DomainObject</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/DomainObjectLayout.html">DomainObjectLayout</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/DomainService.html">DomainService</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/DomainServiceLayout.html">DomainServiceLayout</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/Facets.html">Facets</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/HomePage.html">HomePage</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/MemberOrder.html">MemberOrder</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/NotPersistent.html">NotPersistent.</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/Nullable.html">Nullable</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/MinLength.html">MinLength</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/Parameter.html">Parameter</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/ParameterLayout.html">ParameterLayout</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/Pattern.html">Pattern</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/PersistenceCapable.html">PersistenceCapable</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/PrimaryKey.html">PrimaryKey</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/Programmatic.html">Programmatic</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/Property.html">Property</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/PropertyLayout.html">PropertyLayout</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/InteractionScope.html">RequestScoped</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib/index/annotation/Title.html">Title</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-ant/XmlRootElement.html">XmlRootElement</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../commons/about.html">Commons</a>
   </li>
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-methods/about.html">Methods</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-methods/prefixes.html">Supporting Methods</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-methods/ui-hints.html">UI Hint Methods</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-methods/lifecycle.html">Lifecycle Methods</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../codegen-bytebuddy/about.html">Byte Buddy Proxy Factory</a>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-classes/about.html">Classes</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-classes/non-persisted-objects.html">Non-persisted objects</a>
+    <a class="nav-link" href="../metamodel/about.html">MetaModel</a>
 <ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/ViewModel.html">ViewModel</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/RecreatableDomainObject.html">RecreatableDomainObject</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-classes/value-types.html">Value Types</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/value/Blob.html">Blob</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/value/Clob.html">Clob</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/value/Markup.html">Markup</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/value/LocalResourcePath.html">LocalResourcePath</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/value/Password.html">Password</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-classes/utility.html">Utility Classes</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/util/Enums.html">Enums</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/util/JaxbUtil.html">JaxbUtil</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/util/ObjectContracts.html">ObjectContracts</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/util/Reasons.html">Reasons</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/util/ReasonBuffer.html">ReasonBuffer</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/util/ReasonBuffer2.html">ReasonBuffer2</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/util/TitleBuffer.html">TitleBuffer</a>
+    <a class="nav-link" href="../metamodel/class-diagram.html">Class Diagram</a>
   </li>
 </ul>
   </li>
-  <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../applib-classes/mixees-and-mixins.html">Mixees and Mixins</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/layout/Object_downloadLayoutXml.html">Object_downloadLayoutXml</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/metamodel/Object_downloadMetamodelXml.html">Object_downloadMetamodelXml</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/metamodel/Object_rebuildMetamodel.html">Object_rebuildMetamodel</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/metamodel/Object_objectType.html">Object_objectType</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/metamodel/Object_objectIdentifier.html">Object_objectIdentifier</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../viewer/index/wicket/viewer/mixins/Object_clearHints.html">Object_clearHints</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/rest/Object_openRestApi.html">Object_openRestApi</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/dto/Dto_downloadXml.html">Dto_downloadXml</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/dto/Dto_downloadXsd.html">Dto_downloadXsd</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../persistence/index/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.html">Persistable_downloadJdoMetadata</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../persistence/index/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.html">Persistable_datanucleusIdLong</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../persistence/index/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.html">Persistable_datanucleusVersionLong</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../persistence/index/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.html">Persistable_datanucleusVersionTimestamp</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../extensions/index/commandlog/impl/mixins/HasInteractionId_command.html">HasInteractionId_command</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../applib/index/mixins/system/DomainChangeRecord_openTargetObject.html">DomainChangeRecord_openTargetObject</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-classes/spec.html">Specification pattern</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../applib-classes/layout.html">Layout</a>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="../runtime/about.html">Runtime</a>
   </li>
-</ul>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="../runtimeservices/about.html">Runtime Services</a>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../config/about.html">Configuration</a>
+    <a class="nav-link" href="../webapp/about.html">Webapp</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.applib.html">Applib</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.core.config.html">Core Configuration</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.core.meta-model.html">Core MetaModel</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.core.meta-model.introspector.html">Core MetaModel Introspection</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.core.meta-model.validator.html">MetaModel Validator</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.core.runtime.html">Core Runtime</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.core.runtime-services.html">Core Runtime Services</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.persistence.schema.html">Core Persistence Schema</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.security.shiro.html">Shiro Security Implementation</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.security.spring.html">Spring Security Implementation</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/datanucleus.html">DataNucleus</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.viewer.restfulobjects.html">Restful Objects Viewer</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.viewer.wicket.html">Wicket Viewer</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.extensions.html">Extensions</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.value-types.html">Value types</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.testing.html">Testing</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/isis.legacy.html">Legacy</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../config/sections/resteasy.html">RestEasy Configuration</a>
+    <a class="nav-link" href="../webapp/webmodules.html"><code>WebModule</code> interface</a>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../schema/about.html">Schema</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../schema/mml.html">MetaModel</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../schema/cmd.html">Command</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../schema/ixn.html">Interaction</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../schema/chg.html">Changes</a>
-  </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../schema/common.html">Common</a>
-  </li>
-</ul>
+    <a class="nav-link" href="../regressiontests/about.html">Regression Tests</a>
   </li>
 </ul>
   </li>
@@ -662,7 +200,7 @@ page.parent doesn't seem to be set...
 </div>
 <div class="nav-panel-explore" data-panel="explore">
   <div class="context">
-    <span class="title">Reference Guide</span>
+    <span class="title">Design Docs</span>
     <span class="version">2.0.0-M5</span>
   </div>
   <ul class="components">
@@ -698,11 +236,11 @@ page.parent doesn't seem to be set...
         </li>
       </ul>
     </li>
-    <li class="component">
+    <li class="component is-current">
       <span class="title">Design Docs</span>
       <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../core/2.0.0-M5/about.html">2.0.0-M5</a>
+        <li class="version is-current is-latest">
+          <a href="../about.html">2.0.0-M5</a>
         </li>
       </ul>
     </li>
@@ -746,11 +284,11 @@ page.parent doesn't seem to be set...
         </li>
       </ul>
     </li>
-    <li class="component is-current">
+    <li class="component">
       <span class="title">Reference Guide</span>
       <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../about.html">2.0.0-M5</a>
+        <li class="version is-latest">
+          <a href="../../../refguide/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
     </li>
@@ -771,9 +309,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -845,11 +386,11 @@ page.parent doesn't seem to be set...
   <a href="../../../docs/2.0.0-M5/about.html" class="home-link"></a>
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
-    <li><a href="../about.html">Reference Guide</a></li>
+    <li><a href="../about.html">Design Docs</a></li>
     <li><a href="about.html">System Overview</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/antora/components/refguide-index/modules/_overview/pages/about.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/2.0.0-M5/core/adoc/modules/_overview/pages/about.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -1222,7 +763,7 @@ org.projectlombok:lombok:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../testing/index/fakedata/applib/IsisModuleTestingFakeDataApplib.html" class="page">IsisModuleTestingFakeDataApplib</a>, <a href="../testing/index/fakedata/applib/services/AbstractRandomValueGenerator.html" class="page">AbstractRandomValueGenerator</a>, <a href="../testing/index/fakedata/applib/services/Addresses.html" class="page">Addresses</a>, <a href="../testing/index/fakedata/applib/services/BigDecimals.html" class="page">BigDecimals</a>, <a href="../testing/index/fakeda [...]
+<p><a href="../../../refguide/2.0.0-M5/testing/index/fakedata/applib/IsisModuleTestingFakeDataApplib.html" class="page">IsisModuleTestingFakeDataApplib</a>, <a href="../../../refguide/2.0.0-M5/testing/index/fakedata/applib/services/AbstractRandomValueGenerator.html" class="page">AbstractRandomValueGenerator</a>, <a href="../../../refguide/2.0.0-M5/testing/index/fakedata/applib/services/Addresses.html" class="page">Addresses</a>, <a href="../../../refguide/2.0.0-M5/testing/index/fakedata/ [...]
 </div>
 </div>
 </div></div></td>
@@ -1378,7 +919,7 @@ org.apache.isis.core:isis-core-webapp:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../testing/index/h2console/ui/IsisModuleTestingH2ConsoleUi.html" class="page">IsisModuleTestingH2ConsoleUi</a>, <a href="../testing/index/h2console/ui/services/H2ManagerMenu.html" class="page">H2ManagerMenu</a>, <a href="../testing/index/h2console/ui/webmodule/WebModuleH2Console.html" class="page">WebModuleH2Console</a></p>
+<p><a href="../../../refguide/2.0.0-M5/testing/index/h2console/ui/IsisModuleTestingH2ConsoleUi.html" class="page">IsisModuleTestingH2ConsoleUi</a>, <a href="../../../refguide/2.0.0-M5/testing/index/h2console/ui/services/H2ManagerMenu.html" class="page">H2ManagerMenu</a>, <a href="../../../refguide/2.0.0-M5/testing/index/h2console/ui/webmodule/WebModuleH2Console.html" class="page">WebModuleH2Console</a></p>
 </div>
 </div>
 </div></div></td>
@@ -1424,7 +965,7 @@ org.hsqldb:hsqldb:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.html" class="page">IsisModuleExtHsqldbMgr</a>, <a href="../extensions/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.html" class="page">HsqlDbManagerMenu</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.html" class="page">IsisModuleExtHsqldbMgr</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.html" class="page">HsqlDbManagerMenu</a></p>
 </div>
 </div>
 </div></div></td>
@@ -1486,7 +1027,7 @@ org.springframework.boot:spring-boot-starter-test:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../testing/index/integtestsupport/applib/ExceptionRecognizerTranslate.html" class="page">ExceptionRecognizerTranslate</a>, <a href="../testing/index/integtestsupport/applib/IsisIntegrationTestAbstract.html" class="page">IsisIntegrationTestAbstract</a>, <a href="../testing/index/integtestsupport/applib/IsisInteractionHandler.html" class="page">IsisInteractionHandler</a>, <a href="../testing/index/integtestsupport/applib/ThrowableMatchers.html" class="page">ThrowableMatchers</a [...]
+<p><a href="../../../refguide/2.0.0-M5/testing/index/integtestsupport/applib/ExceptionRecognizerTranslate.html" class="page">ExceptionRecognizerTranslate</a>, <a href="../../../refguide/2.0.0-M5/testing/index/integtestsupport/applib/IsisIntegrationTestAbstract.html" class="page">IsisIntegrationTestAbstract</a>, <a href="../../../refguide/2.0.0-M5/testing/index/integtestsupport/applib/IsisInteractionHandler.html" class="page">IsisInteractionHandler</a>, <a href="../../../refguide/2.0.0-M5 [...]
 </div>
 </div>
 </div></div></td>
@@ -1535,7 +1076,7 @@ org.junit.jupiter:junit-jupiter-api:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../testing/index/specsupport/applib/IsisModuleTestingSpecSupportApplib.html" class="page">IsisModuleTestingSpecSupportApplib</a>, <a href="../testing/index/specsupport/applib/integration/ObjectFactoryForIntegration.html" class="page">ObjectFactoryForIntegration</a>, <a href="../testing/index/specsupport/applib/specs/V.html" class="page">V</a></p>
+<p><a href="../../../refguide/2.0.0-M5/testing/index/specsupport/applib/IsisModuleTestingSpecSupportApplib.html" class="page">IsisModuleTestingSpecSupportApplib</a>, <a href="../../../refguide/2.0.0-M5/testing/index/specsupport/applib/integration/ObjectFactoryForIntegration.html" class="page">ObjectFactoryForIntegration</a>, <a href="../../../refguide/2.0.0-M5/testing/index/specsupport/applib/specs/V.html" class="page">V</a></p>
 </div>
 </div>
 </div></div></td>
@@ -1589,7 +1130,7 @@ org.springframework.boot:spring-boot-starter-test:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../testing/index/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.html" class="page">IsisModuleTestingUnitTestSupportApplib</a>, <a href="../testing/index/unittestsupport/applib/bean/AbstractBeanPropertiesTest.html" class="page">AbstractBeanPropertiesTest</a>, <a href="../testing/index/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.html" class="page">FixtureDatumFactoriesForAnyPojo</a>, <a href="../testing/index/unittestsupport/applib/bean/FixtureDat [...]
+<p><a href="../../../refguide/2.0.0-M5/testing/index/unittestsupport/applib/IsisModuleTestingUnitTestSupportApplib.html" class="page">IsisModuleTestingUnitTestSupportApplib</a>, <a href="../../../refguide/2.0.0-M5/testing/index/unittestsupport/applib/bean/AbstractBeanPropertiesTest.html" class="page">AbstractBeanPropertiesTest</a>, <a href="../../../refguide/2.0.0-M5/testing/index/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.html" class="page">FixtureDatumFactoriesForAnyPo [...]
 </div>
 </div>
 </div></div></td>
@@ -2147,7 +1688,7 @@ org.yaml:snakeyaml:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../commons/index/collections/Can.html" class="page">Can</a>, <a href="../commons/index/collections/Cardinality.html" class="page">Cardinality</a>, <a href="../commons/index/functional/Result.html" class="page">Result</a>, <a href="../commons/index/resource/ResourceCoordinates.html" class="page">ResourceCoordinates</a></p>
+<p><a href="../../../refguide/2.0.0-M5/commons/index/collections/Can.html" class="page">Can</a>, <a href="../../../refguide/2.0.0-M5/commons/index/collections/Cardinality.html" class="page">Cardinality</a>, <a href="../../../refguide/2.0.0-M5/commons/index/functional/Result.html" class="page">Result</a>, <a href="../../../refguide/2.0.0-M5/commons/index/resource/ResourceCoordinates.html" class="page">ResourceCoordinates</a></p>
 </div>
 </div>
 </div></div></td>
@@ -2252,7 +1793,7 @@ org.jmock:jmock:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../applib/index/AbstractViewModel.html" class="page">AbstractViewModel</a>, <a href="../applib/index/Identifier.html" class="page">Identifier</a>, <a href="../applib/index/IsisModuleApplib.html" class="page">IsisModuleApplib</a>, <a href="../applib/index/RecreatableDomainObject.html" class="page">RecreatableDomainObject</a>, <a href="../applib/index/ViewModel.html" class="page">ViewModel</a>, <a href="../applib/index/adapters/AbstractValueSemanticsProvider.html" class="page"> [...]
+<p><a href="../../../refguide/2.0.0-M5/applib/index/AbstractViewModel.html" class="page">AbstractViewModel</a>, <a href="../../../refguide/2.0.0-M5/applib/index/Identifier.html" class="page">Identifier</a>, <a href="../../../refguide/2.0.0-M5/applib/index/IsisModuleApplib.html" class="page">IsisModuleApplib</a>, <a href="../../../refguide/2.0.0-M5/applib/index/RecreatableDomainObject.html" class="page">RecreatableDomainObject</a>, <a href="../../../refguide/2.0.0-M5/applib/index/ViewMode [...]
 </div>
 </div>
 </div></div></td>
@@ -2339,7 +1880,7 @@ org.springframework.boot:spring-boot-configuration-processor:jar:&lt;managed&gt;
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../core/index/config/datasources/DataSourceIntrospectionService.html" class="page">DataSourceIntrospectionService</a></p>
+<p><a href="../../../refguide/2.0.0-M5/core/index/config/datasources/DataSourceIntrospectionService.html" class="page">DataSourceIntrospectionService</a></p>
 </div>
 </div>
 </div></div></td>
@@ -2383,7 +1924,7 @@ org.apache.isis.core:isis-core-metamodel:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../core/index/interaction/session/InteractionFactory.html" class="page">InteractionFactory</a></p>
+<p><a href="../../../refguide/2.0.0-M5/core/index/interaction/session/InteractionFactory.html" class="page">InteractionFactory</a></p>
 </div>
 </div>
 </div></div></td>
@@ -2492,7 +2033,7 @@ org.jmock:jmock:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../core/index/metamodel/services/command/CommandDtoFactory.html" class="page">CommandDtoFactory</a>, <a href="../core/index/metamodel/services/ixn/InteractionDtoFactory.html" class="page">InteractionDtoFactory</a>, <a href="../core/index/metamodel/services/publishing/CommandPublisher.html" class="page">CommandPublisher</a>, <a href="../core/index/metamodel/services/publishing/ExecutionPublisher.html" class="page">ExecutionPublisher</a></p>
+<p><a href="../../../refguide/2.0.0-M5/core/index/metamodel/services/command/CommandDtoFactory.html" class="page">CommandDtoFactory</a>, <a href="../../../refguide/2.0.0-M5/core/index/metamodel/services/ixn/InteractionDtoFactory.html" class="page">InteractionDtoFactory</a>, <a href="../../../refguide/2.0.0-M5/core/index/metamodel/services/publishing/CommandPublisher.html" class="page">CommandPublisher</a>, <a href="../../../refguide/2.0.0-M5/core/index/metamodel/services/publishing/Execu [...]
 </div>
 </div>
 </div></div></td>
@@ -2606,7 +2147,7 @@ org.hsqldb:hsqldb:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../core/index/runtimeservices/transaction/TransactionServiceSpring.html" class="page">TransactionServiceSpring</a>, <a href="../core/index/runtimeservices/xml/XmlServiceDefault.html" class="page">XmlServiceDefault</a></p>
+<p><a href="../../../refguide/2.0.0-M5/core/index/runtimeservices/transaction/TransactionServiceSpring.html" class="page">TransactionServiceSpring</a>, <a href="../../../refguide/2.0.0-M5/core/index/runtimeservices/xml/XmlServiceDefault.html" class="page">XmlServiceDefault</a></p>
 </div>
 </div>
 </div></div></td>
@@ -2650,7 +2191,7 @@ org.junit.vintage:junit-vintage-engine:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../core/index/security/authentication/Authentication.html" class="page">Authentication</a>, <a href="../core/index/security/authentication/AuthenticationRequest.html" class="page">AuthenticationRequest</a>, <a href="../core/index/security/authentication/Authenticator.html" class="page">Authenticator</a>, <a href="../core/index/security/authorization/Authorizor.html" class="page">Authorizor</a></p>
+<p><a href="../../../refguide/2.0.0-M5/core/index/security/authentication/Authentication.html" class="page">Authentication</a>, <a href="../../../refguide/2.0.0-M5/core/index/security/authentication/AuthenticationRequest.html" class="page">AuthenticationRequest</a>, <a href="../../../refguide/2.0.0-M5/core/index/security/authentication/Authenticator.html" class="page">Authenticator</a>, <a href="../../../refguide/2.0.0-M5/core/index/security/authorization/Authorizor.html" class="page">Au [...]
 </div>
 </div>
 </div></div></td>
@@ -2693,7 +2234,7 @@ org.apache.isis.core:isis-core-metamodel:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../core/index/transaction/changetracking/EntityChangeTracker.html" class="page">EntityChangeTracker</a>, <a href="../core/index/transaction/changetracking/EntityChangeTrackerDefault.html" class="page">EntityChangeTrackerDefault</a>, <a href="../core/index/transaction/changetracking/EntityChangesPublisher.html" class="page">EntityChangesPublisher</a>, <a href="../core/index/transaction/changetracking/EntityPropertyChangePublisher.html" class="page">EntityPropertyChangePublishe [...]
+<p><a href="../../../refguide/2.0.0-M5/core/index/transaction/changetracking/EntityChangeTracker.html" class="page">EntityChangeTracker</a>, <a href="../../../refguide/2.0.0-M5/core/index/transaction/changetracking/EntityChangeTrackerDefault.html" class="page">EntityChangeTrackerDefault</a>, <a href="../../../refguide/2.0.0-M5/core/index/transaction/changetracking/EntityChangesPublisher.html" class="page">EntityChangesPublisher</a>, <a href="../../../refguide/2.0.0-M5/core/index/transact [...]
 </div>
 </div>
 </div></div></td>
@@ -2806,7 +2347,7 @@ org.springframework:spring-context:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../schema/index/IsisModuleSchema.html" class="page">IsisModuleSchema</a></p>
+<p><a href="../../../refguide/2.0.0-M5/schema/index/IsisModuleSchema.html" class="page">IsisModuleSchema</a></p>
 </div>
 </div>
 </div></div></td>
@@ -2884,7 +2425,7 @@ org.datanucleus:javax.jdo:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../persistence/index/jdo/applib/IsisModulePersistenceJdoApplib.html" class="page">IsisModulePersistenceJdoApplib</a>, <a href="../persistence/index/jdo/applib/services/JdoSupportService.html" class="page">JdoSupportService</a></p>
+<p><a href="../../../refguide/2.0.0-M5/persistence/index/jdo/applib/IsisModulePersistenceJdoApplib.html" class="page">IsisModulePersistenceJdoApplib</a>, <a href="../../../refguide/2.0.0-M5/persistence/index/jdo/applib/services/JdoSupportService.html" class="page">JdoSupportService</a></p>
 </div>
 </div>
 </div></div></td>
@@ -2938,7 +2479,7 @@ org.springframework.boot:spring-boot-starter-jdbc:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../persistence/index/jdo/datanucleus/IsisModuleJdoDatanucleus.html" class="page">IsisModuleJdoDatanucleus</a>, <a href="../persistence/index/jdo/datanucleus/changetracking/JdoLifecycleListener.html" class="page">JdoLifecycleListener</a>, <a href="../persistence/index/jdo/datanucleus/dialect/DnJdoDialect.html" class="page">DnJdoDialect</a>, <a href="../persistence/index/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.html" class="page">Persistable_datanucleusIdLong</a>, < [...]
+<p><a href="../../../refguide/2.0.0-M5/persistence/index/jdo/datanucleus/IsisModuleJdoDatanucleus.html" class="page">IsisModuleJdoDatanucleus</a>, <a href="../../../refguide/2.0.0-M5/persistence/index/jdo/datanucleus/changetracking/JdoLifecycleListener.html" class="page">JdoLifecycleListener</a>, <a href="../../../refguide/2.0.0-M5/persistence/index/jdo/datanucleus/dialect/DnJdoDialect.html" class="page">DnJdoDialect</a>, <a href="../../../refguide/2.0.0-M5/persistence/index/jdo/datanucl [...]
 </div>
 </div>
 </div></div></td>
@@ -3143,7 +2684,7 @@ org.apache.isis.core:isis-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../persistence/index/jpa/applib/integration/JpaEntityInjectionPointResolver.html" class="page">JpaEntityInjectionPointResolver</a>, <a href="../persistence/index/jpa/applib/services/JpaSupportService.html" class="page">JpaSupportService</a></p>
+<p><a href="../../../refguide/2.0.0-M5/persistence/index/jpa/applib/integration/JpaEntityInjectionPointResolver.html" class="page">JpaEntityInjectionPointResolver</a>, <a href="../../../refguide/2.0.0-M5/persistence/index/jpa/applib/services/JpaSupportService.html" class="page">JpaSupportService</a></p>
 </div>
 </div>
 </div></div></td>
@@ -3178,7 +2719,7 @@ org.springframework.boot:spring-boot-starter-data-jpa:jar:&lt;managed&gt;<br></p
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../persistence/index/jpa/eclipselink/IsisModuleJpaEclipselink.html" class="page">IsisModuleJpaEclipselink</a></p>
+<p><a href="../../../refguide/2.0.0-M5/persistence/index/jpa/eclipselink/IsisModuleJpaEclipselink.html" class="page">IsisModuleJpaEclipselink</a></p>
 </div>
 </div>
 </div></div></td>
@@ -3317,7 +2858,7 @@ org.springframework.boot:spring-boot-starter-security:jar:&lt;managed&gt;<br></p
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../security/index/spring/IsisModuleSecuritySpring.html" class="page">IsisModuleSecuritySpring</a>, <a href="../security/index/spring/authentication/AuthenticatorSpring.html" class="page">AuthenticatorSpring</a>, <a href="../security/index/spring/webmodule/SpringSecurityFilter.html" class="page">SpringSecurityFilter</a>, <a href="../security/index/spring/webmodule/WebModuleSpringSecurity.html" class="page">WebModuleSpringSecurity</a></p>
+<p><a href="../../../refguide/2.0.0-M5/security/index/spring/IsisModuleSecuritySpring.html" class="page">IsisModuleSecuritySpring</a>, <a href="../../../refguide/2.0.0-M5/security/index/spring/authentication/AuthenticatorSpring.html" class="page">AuthenticatorSpring</a>, <a href="../../../refguide/2.0.0-M5/security/index/spring/webmodule/SpringSecurityFilter.html" class="page">SpringSecurityFilter</a>, <a href="../../../refguide/2.0.0-M5/security/index/spring/webmodule/WebModuleSpringSec [...]
 </div>
 </div>
 </div></div></td>
@@ -3377,7 +2918,7 @@ o.a.i.security.bypass.authorization.AuthorizorBypass<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../security/index/bypass/IsisModuleSecurityBypass.html" class="page">IsisModuleSecurityBypass</a>, <a href="../security/index/bypass/authentication/AuthenticatorBypass.html" class="page">AuthenticatorBypass</a>, <a href="../security/index/bypass/authorization/AuthorizorBypass.html" class="page">AuthorizorBypass</a></p>
+<p><a href="../../../refguide/2.0.0-M5/security/index/bypass/IsisModuleSecurityBypass.html" class="page">IsisModuleSecurityBypass</a>, <a href="../../../refguide/2.0.0-M5/security/index/bypass/authentication/AuthenticatorBypass.html" class="page">AuthenticatorBypass</a>, <a href="../../../refguide/2.0.0-M5/security/index/bypass/authorization/AuthorizorBypass.html" class="page">AuthorizorBypass</a></p>
 </div>
 </div>
 </div></div></td>
@@ -3444,7 +2985,7 @@ org.apache.isis.core:isis-core-webapp:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../security/index/keycloak/IsisModuleSecurityKeycloak.html" class="page">IsisModuleSecurityKeycloak</a>, <a href="../security/index/keycloak/authentication/AuthenticatorKeycloak.html" class="page">AuthenticatorKeycloak</a>, <a href="../security/index/keycloak/webmodule/KeycloakFilter.html" class="page">KeycloakFilter</a>, <a href="../security/index/keycloak/webmodule/WebModuleKeycloak.html" class="page">WebModuleKeycloak</a></p>
+<p><a href="../../../refguide/2.0.0-M5/security/index/keycloak/IsisModuleSecurityKeycloak.html" class="page">IsisModuleSecurityKeycloak</a>, <a href="../../../refguide/2.0.0-M5/security/index/keycloak/authentication/AuthenticatorKeycloak.html" class="page">AuthenticatorKeycloak</a>, <a href="../../../refguide/2.0.0-M5/security/index/keycloak/webmodule/KeycloakFilter.html" class="page">KeycloakFilter</a>, <a href="../../../refguide/2.0.0-M5/security/index/keycloak/webmodule/WebModuleKeycl [...]
 </div>
 </div>
 </div></div></td>
@@ -3514,7 +3055,7 @@ org.apache.shiro:shiro-web:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../security/index/shiro/IsisModuleSecurityShiro.html" class="page">IsisModuleSecurityShiro</a>, <a href="../security/index/shiro/authentication/AuthenticatorShiro.html" class="page">AuthenticatorShiro</a>, <a href="../security/index/shiro/authorization/AuthorizorShiro.html" class="page">AuthorizorShiro</a>, <a href="../security/index/shiro/authorization/IsisPermission.html" class="page">IsisPermission</a>, <a href="../security/index/shiro/authorization/IsisPermissionResolver. [...]
+<p><a href="../../../refguide/2.0.0-M5/security/index/shiro/IsisModuleSecurityShiro.html" class="page">IsisModuleSecurityShiro</a>, <a href="../../../refguide/2.0.0-M5/security/index/shiro/authentication/AuthenticatorShiro.html" class="page">AuthenticatorShiro</a>, <a href="../../../refguide/2.0.0-M5/security/index/shiro/authorization/AuthorizorShiro.html" class="page">AuthorizorShiro</a>, <a href="../../../refguide/2.0.0-M5/security/index/shiro/authorization/IsisPermission.html" class=" [...]
 </div>
 </div>
 </div></div></td>
@@ -3642,7 +3183,7 @@ org.apache.isis.core:isis-core-internaltestsupport:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../viewer/index/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.html" class="page">IsisModuleViewerRestfulObjectsApplib</a>, <a href="../viewer/index/restfulobjects/applib/JsonRepresentation.html" class="page">JsonRepresentation</a>, <a href="../viewer/index/restfulobjects/applib/LinkRepresentation.html" class="page">LinkRepresentation</a>, <a href="../viewer/index/restfulobjects/applib/Rel.html" class="page">Rel</a>, <a href="../viewer/index/restfulobjects/applib/ [...]
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.html" class="page">IsisModuleViewerRestfulObjectsApplib</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/applib/JsonRepresentation.html" class="page">JsonRepresentation</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/applib/LinkRepresentation.html" class="page">LinkRepresentation</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restf [...]
 </div>
 </div>
 </div></div></td>
@@ -3688,7 +3229,7 @@ org.jboss.resteasy:resteasy-spring-boot-starter:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../viewer/index/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.html" class="page">IsisModuleViewerRestfulObjectsJaxrsResteasy4</a>, <a href="../viewer/index/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.html" class="page">RestfulObjectsJaxbWriterForXml</a>, <a href="../viewer/index/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.html" class="page">WebModuleJaxrsResteasy4</a></p>
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/jaxrsresteasy4/IsisModuleViewerRestfulObjectsJaxrsResteasy4.html" class="page">IsisModuleViewerRestfulObjectsJaxrsResteasy4</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.html" class="page">RestfulObjectsJaxbWriterForXml</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.html" class [...]
 </div>
 </div>
 </div></div></td>
@@ -3740,7 +3281,7 @@ org.apache.isis.viewer:isis-viewer-restfulobjects-applib:jar:&lt;managed&gt;<br>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../viewer/index/restfulobjects/rendering/IResourceContext.html" class="page">IResourceContext</a>, <a href="../viewer/index/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.html" class="page">IsisModuleRestfulObjectsRendering</a>, <a href="../viewer/index/restfulobjects/rendering/service/RepresentationService.html" class="page">RepresentationService</a>, <a href="../viewer/index/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.html" class="pa [...]
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/rendering/IResourceContext.html" class="page">IResourceContext</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.html" class="page">IsisModuleRestfulObjectsRendering</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/rendering/service/RepresentationService.html" class="page">RepresentationService</a>, <a href="../../../refguide/2.0.0-M5/viewe [...]
 </div>
 </div>
 </div></div></td>
@@ -3816,7 +3357,7 @@ org.datanucleus:javax.jdo:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../viewer/index/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.html" class="page">IsisModuleViewerRestfulObjectsViewer</a></p>
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/restfulobjects/viewer/IsisModuleViewerRestfulObjectsViewer.html" class="page">IsisModuleViewerRestfulObjectsViewer</a></p>
 </div>
 </div>
 </div></div></td>
@@ -3886,7 +3427,7 @@ org.apache.wicket:wicket-extensions:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../viewer/index/wicket/model/IsisModuleViewerWicketModel.html" class="page">IsisModuleViewerWicketModel</a></p>
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/wicket/model/IsisModuleViewerWicketModel.html" class="page">IsisModuleViewerWicketModel</a></p>
 </div>
 </div>
 </div></div></td>
@@ -3941,7 +3482,7 @@ org.wicketstuff:wicketstuff-select2:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../viewer/index/wicket/ui/IsisModuleViewerWicketUi.html" class="page">IsisModuleViewerWicketUi</a></p>
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/wicket/ui/IsisModuleViewerWicketUi.html" class="page">IsisModuleViewerWicketUi</a></p>
 </div>
 </div>
 </div></div></td>
@@ -3999,7 +3540,7 @@ org.springframework:spring-web:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../viewer/index/wicket/viewer/IsisModuleViewerWicketViewer.html" class="page">IsisModuleViewerWicketViewer</a>, <a href="../viewer/index/wicket/viewer/mixins/Object_clearHints.html" class="page">Object_clearHints</a></p>
+<p><a href="../../../refguide/2.0.0-M5/viewer/index/wicket/viewer/IsisModuleViewerWicketViewer.html" class="page">IsisModuleViewerWicketViewer</a>, <a href="../../../refguide/2.0.0-M5/viewer/index/wicket/viewer/mixins/Object_clearHints.html" class="page">Object_clearHints</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4096,7 +3637,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/sse/applib/IsisModuleValSseApplib.html" class="page">IsisModuleValSseApplib</a>, <a href="../valuetypes/index/sse/applib/annotations/ServerSentEvents.html" class="page">ServerSentEvents</a>, <a href="../valuetypes/index/sse/applib/annotations/SseSource.html" class="page">SseSource</a>, <a href="../valuetypes/index/sse/applib/service/SseChannel.html" class="page">SseChannel</a>, <a href="../valuetypes/index/sse/applib/service/SseService.html" class="page">S [...]
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/sse/applib/IsisModuleValSseApplib.html" class="page">IsisModuleValSseApplib</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/sse/applib/annotations/ServerSentEvents.html" class="page">ServerSentEvents</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/sse/applib/annotations/SseSource.html" class="page">SseSource</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/sse/applib/service/SseChannel.html" class="page" [...]
 </div>
 </div>
 </div></div></td>
@@ -4189,7 +3730,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/sse/ui/wkt/IsisModuleValSseUiWkt.html" class="page">IsisModuleValSseUiWkt</a>, <a href="../valuetypes/index/sse/ui/wkt/services/SseServiceDefault.html" class="page">SseServiceDefault</a>, <a href="../valuetypes/index/sse/ui/wkt/webmodule/WebModuleServerSentEvents.html" class="page">WebModuleServerSentEvents</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/sse/ui/wkt/IsisModuleValSseUiWkt.html" class="page">IsisModuleValSseUiWkt</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/sse/ui/wkt/services/SseServiceDefault.html" class="page">SseServiceDefault</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/sse/ui/wkt/webmodule/WebModuleServerSentEvents.html" class="page">WebModuleServerSentEvents</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4258,7 +3799,7 @@ org.asciidoctor:asciidoctorj-api:jar:${asciidoctorj.version}<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/asciidoc/applib/IsisModuleValAsciidocApplib.html" class="page">IsisModuleValAsciidocApplib</a>, <a href="../valuetypes/index/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.html" class="page">AsciiDocJaxbAdapter</a>, <a href="../valuetypes/index/asciidoc/applib/value/AsciiDoc.html" class="page">AsciiDoc</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/asciidoc/applib/IsisModuleValAsciidocApplib.html" class="page">IsisModuleValAsciidocApplib</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/asciidoc/applib/jaxb/AsciiDocJaxbAdapter.html" class="page">AsciiDocJaxbAdapter</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/asciidoc/applib/value/AsciiDoc.html" class="page">AsciiDoc</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4297,7 +3838,7 @@ org.apache.isis.valuetypes:isis-valuetypes-asciidoc-applib:jar:&lt;managed&gt;<b
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.html" class="page">IsisModuleValAsciidocMetaModel</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/asciidoc/metamodel/IsisModuleValAsciidocMetaModel.html" class="page">IsisModuleValAsciidocMetaModel</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4348,7 +3889,7 @@ Directory: /valuetypes/asciidoc/persistence/jdo-dn5</code></pre>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.html" class="page">IsisModuleValAsciidocPersistenceJdoDn5</a>, <a href="../valuetypes/index/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.html" class="page">IsisAsciiDocConverter</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/asciidoc/persistence/jdo/dn5/IsisModuleValAsciidocPersistenceJdoDn5.html" class="page">IsisModuleValAsciidocPersistenceJdoDn5</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/asciidoc/persistence/jdo/dn5/converters/IsisAsciiDocConverter.html" class="page">IsisAsciiDocConverter</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4447,7 +3988,7 @@ o.a.i.valuetypes.asciidoc.ui.wkt.components.schema.ixn.v2.InteractionDtoPanelFac
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.html" class="page">IsisModuleValAsciidocUiWkt</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/asciidoc/ui/wkt/IsisModuleValAsciidocUiWkt.html" class="page">IsisModuleValAsciidocUiWkt</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4517,7 +4058,7 @@ org.apache.isis.core:isis-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/markdown/applib/IsisModuleValMarkdownApplib.html" class="page">IsisModuleValMarkdownApplib</a>, <a href="../valuetypes/index/markdown/applib/jaxb/MarkdownJaxbAdapter.html" class="page">MarkdownJaxbAdapter</a>, <a href="../valuetypes/index/markdown/applib/value/Converter.html" class="page">Converter</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/markdown/applib/IsisModuleValMarkdownApplib.html" class="page">IsisModuleValMarkdownApplib</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/markdown/applib/jaxb/MarkdownJaxbAdapter.html" class="page">MarkdownJaxbAdapter</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/markdown/applib/value/Converter.html" class="page">Converter</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4556,7 +4097,7 @@ org.apache.isis.valuetypes:isis-valuetypes-markdown-applib:jar:&lt;managed&gt;<b
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/markdown/metamodel/IsisModuleValMarkdownMetaModel.html" class="page">IsisModuleValMarkdownMetaModel</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/markdown/metamodel/IsisModuleValMarkdownMetaModel.html" class="page">IsisModuleValMarkdownMetaModel</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4608,7 +4149,7 @@ org.datanucleus:datanucleus-core:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.html" class="page">IsisModuleValMarkdownPersistenceJdoDn5</a>, <a href="../valuetypes/index/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.html" class="page">IsisMarkdownConverter</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/markdown/persistence/jdo/dn5/IsisModuleValMarkdownPersistenceJdoDn5.html" class="page">IsisModuleValMarkdownPersistenceJdoDn5</a>, <a href="../../../refguide/2.0.0-M5/valuetypes/index/markdown/persistence/jdo/dn5/converters/IsisMarkdownConverter.html" class="page">IsisMarkdownConverter</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4661,7 +4202,7 @@ Directory: /valuetypes/markdown/ui/wicket</code></pre>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../valuetypes/index/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.html" class="page">IsisModuleValMarkdownUiWkt</a></p>
+<p><a href="../../../refguide/2.0.0-M5/valuetypes/index/markdown/ui/wkt/IsisModuleValMarkdownUiWkt.html" class="page">IsisModuleValMarkdownUiWkt</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4784,7 +4325,7 @@ org.springframework:spring-context:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.html" class="page">IsisModuleExtJaxRsClientApplib</a>, <a href="../extensions/index/jaxrsclient/applib/client/JaxRsClient.html" class="page">JaxRsClient</a>, <a href="../extensions/index/jaxrsclient/applib/client/JaxRsResponse.html" class="page">JaxRsResponse</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.html" class="page">IsisModuleExtJaxRsClientApplib</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/jaxrsclient/applib/client/JaxRsClient.html" class="page">JaxRsClient</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/jaxrsclient/applib/client/JaxRsResponse.html" class="page">JaxRsResponse</a></p>
 </div>
 </div>
 </div></div></td>
@@ -4877,7 +4418,7 @@ org.springframework:spring-context:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/restclient/ActionParameterListBuilder.html" class="page">ActionParameterListBuilder</a>, <a href="../extensions/index/restclient/IsisModuleExtRestClient.html" class="page">IsisModuleExtRestClient</a>, <a href="../extensions/index/restclient/ResponseDigest.html" class="page">ResponseDigest</a>, <a href="../extensions/index/restclient/RestfulClient.html" class="page">RestfulClient</a>, <a href="../extensions/index/restclient/RestfulClientConfig.html" class=" [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/restclient/ActionParameterListBuilder.html" class="page">ActionParameterListBuilder</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/restclient/IsisModuleExtRestClient.html" class="page">IsisModuleExtRestClient</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/restclient/ResponseDigest.html" class="page">ResponseDigest</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/restclient/RestfulClient.html" class="pa [...]
 </div>
 </div>
 </div></div></td>
@@ -4892,7 +4433,7 @@ org.springframework:spring-context:jar:&lt;managed&gt;<br></p>
 <div class="sectionbody">
 <div class="imageblock kroki">
 <div class="content">
-<img src="_images/diag-bbcaf47ef6e5f6a70d9c8d0db9ab6fcc441cab74.svg" alt="Extensions">
+<img src="_images/diag-efe19991ebfc596351317bf8dfe9b777dbdc2311.svg" alt="Extensions">
 </div>
 </div>
 <table class="tableblock frame-all grid-all stretch">
@@ -4976,7 +4517,7 @@ org.springframework:spring-web:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/cors/impl/IsisModuleExtCorsImpl.html" class="page">IsisModuleExtCorsImpl</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/cors/impl/IsisModuleExtCorsImpl.html" class="page">IsisModuleExtCorsImpl</a></p>
 </div>
 </div>
 </div></div></td>
@@ -5031,7 +4572,7 @@ org.apache.poi:poi-ooxml-schemas:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.html" class="page">IsisModuleExtExcelDownloadUi</a>, <a href="../extensions/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.html" class="page">CollectionContentsAsExcel</a>, <a href="../extensions/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.html" class="page">CollectionContentsAsExcelFactory</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/exceldownload/ui/IsisModuleExtExcelDownloadUi.html" class="page">IsisModuleExtExcelDownloadUi</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcel.html" class="page">CollectionContentsAsExcel</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.html" class="page">Colle [...]
 </div>
 </div>
 </div></div></td>
@@ -5118,7 +4659,7 @@ org.apache.isis.core:isis-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/fullcalendar/applib/CalendarEventable.html" class="page">CalendarEventable</a>, <a href="../extensions/index/fullcalendar/applib/Calendarable.html" class="page">Calendarable</a>, <a href="../extensions/index/fullcalendar/applib/IsisModuleExtFullCalendarApplib.html" class="page">IsisModuleExtFullCalendarApplib</a>, <a href="../extensions/index/fullcalendar/applib/spi/CalendarableDereferencingService.html" class="page">CalendarableDereferencingService</a>, < [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/fullcalendar/applib/CalendarEventable.html" class="page">CalendarEventable</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/fullcalendar/applib/Calendarable.html" class="page">Calendarable</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/fullcalendar/applib/IsisModuleExtFullCalendarApplib.html" class="page">IsisModuleExtFullCalendarApplib</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/fullcalendar/applib [...]
 </div>
 </div>
 </div></div></td>
@@ -5149,7 +4690,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.html" class="page">IsisModuleExtFullCalendarUi</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/fullcalendar/ui/component/IsisModuleExtFullCalendarUi.html" class="page">IsisModuleExtFullCalendarUi</a></p>
 </div>
 </div>
 </div></div></td>
@@ -5195,7 +4736,7 @@ org.apache.isis.core:isis-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.html" class="page">PdfJsViewer</a>, <a href="../extensions/index/viewer/wicket/pdfjs/applib/config/PdfJsConfig.html" class="page">PdfJsConfig</a>, <a href="../extensions/index/viewer/wicket/pdfjs/applib/config/Scale.html" class="page">Scale</a>, <a href="../extensions/index/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.html" class="page">PdfJsViewerAdvisor</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.html" class="page">PdfJsViewer</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/pdfjs/applib/config/PdfJsConfig.html" class="page">PdfJsConfig</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/pdfjs/applib/config/Scale.html" class="page">Scale</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/pdfjs/applib/spi/PdfJsVi [...]
 </div>
 </div>
 </div></div></td>
@@ -5264,7 +4805,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.html" class="page">IsisModuleExtPdfjsUi</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/viewer/wicket/pdfjs/ui/IsisModuleExtPdfjsUi.html" class="page">IsisModuleExtPdfjsUi</a></p>
 </div>
 </div>
 </div></div></td>
@@ -5315,7 +4856,7 @@ Directory: /extensions/security/secman/api</code></pre>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/secman/api/IsisModuleExtSecmanApi.html" class="page">IsisModuleExtSecmanApi</a>, <a href="../extensions/index/secman/api/SecmanConfiguration.html" class="page">SecmanConfiguration</a>, <a href="../extensions/index/secman/api/SecurityRealm.html" class="page">SecurityRealm</a>, <a href="../extensions/index/secman/api/SecurityRealmCharacteristic.html" class="page">SecurityRealmCharacteristic</a>, <a href="../extensions/index/secman/api/SecurityRealmService.ht [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/secman/api/IsisModuleExtSecmanApi.html" class="page">IsisModuleExtSecmanApi</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/api/SecmanConfiguration.html" class="page">SecmanConfiguration</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/api/SecurityRealm.html" class="page">SecurityRealm</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/api/SecurityRealmCharacteristic.html" class="page"> [...]
 </div>
 </div>
 </div></div></td>
@@ -5354,7 +4895,7 @@ org.mindrot:jbcrypt:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.html" class="page">IsisModuleExtSecmanEncryptionJbcrypt</a>, <a href="../extensions/index/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.html" class="page">PasswordEncryptionServiceUsingJBcrypt</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/secman/encryption/jbcrypt/IsisModuleExtSecmanEncryptionJbcrypt.html" class="page">IsisModuleExtSecmanEncryptionJbcrypt</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.html" class="page">PasswordEncryptionServiceUsingJBcrypt</a></p>
 </div>
 </div>
 </div></div></td>
@@ -5392,7 +4933,7 @@ org.apache.isis.extensions:isis-extensions-secman-api:jar:&lt;managed&gt;<br></p
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/secman/model/IsisModuleExtSecmanModel.html" class="page">IsisModuleExtSecmanModel</a>, <a href="../extensions/index/secman/model/dom/user/MeService.html" class="page">MeService</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/secman/model/IsisModuleExtSecmanModel.html" class="page">IsisModuleExtSecmanModel</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/model/dom/user/MeService.html" class="page">MeService</a></p>
 </div>
 </div>
 </div></div></td>
@@ -5438,7 +4979,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/secman/jdo/IsisModuleExtSecmanPersistenceJdo.html" class="page">IsisModuleExtSecmanPersistenceJdo</a>, <a href="../extensions/index/secman/jdo/seed/SeedSecurityModuleService.html" class="page">SeedSecurityModuleService</a>, <a href="../extensions/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.html" class="page">SeedUsersAndRolesFixtureScript</a>, <a href="../extensions/index/secman/jdo/seed/scripts/GlobalTenancy.html" class="page">GlobalTenancy</a>,  [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/secman/jdo/IsisModuleExtSecmanPersistenceJdo.html" class="page">IsisModuleExtSecmanPersistenceJdo</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/jdo/seed/SeedSecurityModuleService.html" class="page">SeedSecurityModuleService</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/jdo/seed/SeedUsersAndRolesFixtureScript.html" class="page">SeedUsersAndRolesFixtureScript</a>, <a href="../../../refguide/2.0.0- [...]
 </div>
 </div>
 </div></div></td>
@@ -5483,7 +5024,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/secman/jpa/IsisModuleExtSecmanPersistenceJpa.html" class="page">IsisModuleExtSecmanPersistenceJpa</a>, <a href="../extensions/index/secman/jpa/seed/SeedSecurityModuleService.html" class="page">SeedSecurityModuleService</a>, <a href="../extensions/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.html" class="page">SeedUsersAndRolesFixtureScript</a>, <a href="../extensions/index/secman/jpa/seed/scripts/GlobalTenancy.html" class="page">GlobalTenancy</a>,  [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/secman/jpa/IsisModuleExtSecmanPersistenceJpa.html" class="page">IsisModuleExtSecmanPersistenceJpa</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/jpa/seed/SeedSecurityModuleService.html" class="page">SeedSecurityModuleService</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/jpa/seed/SeedUsersAndRolesFixtureScript.html" class="page">SeedUsersAndRolesFixtureScript</a>, <a href="../../../refguide/2.0.0- [...]
 </div>
 </div>
 </div></div></td>
@@ -5522,7 +5063,7 @@ org.apache.isis.security:isis-security-shiro:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/secman/shiro/IsisModuleExtSecmanRealmShiro.html" class="page">IsisModuleExtSecmanRealmShiro</a>, <a href="../extensions/index/secman/shiro/IsisModuleExtSecmanShiroRealm.html" class="page">IsisModuleExtSecmanShiroRealm</a>, <a href="../extensions/index/secman/shiro/services/SecurityRealmServiceUsingShiro.html" class="page">SecurityRealmServiceUsingShiro</a>, <a href="../extensions/index/secman/shiro/util/ShiroUtils.html" class="page">ShiroUtils</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/secman/shiro/IsisModuleExtSecmanRealmShiro.html" class="page">IsisModuleExtSecmanRealmShiro</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/shiro/IsisModuleExtSecmanShiroRealm.html" class="page">IsisModuleExtSecmanShiroRealm</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/secman/shiro/services/SecurityRealmServiceUsingShiro.html" class="page">SecurityRealmServiceUsingShiro</a>, <a href="../../../refguide/2 [...]
 </div>
 </div>
 </div></div></td>
@@ -5568,7 +5109,7 @@ org.apache.isis.security:isis-security-shiro:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/shirorealmldap/realm/impl/IsisLdapContextFactory.html" class="page">IsisLdapContextFactory</a>, <a href="../extensions/index/shirorealmldap/realm/impl/IsisLdapRealm.html" class="page">IsisLdapRealm</a>, <a href="../extensions/index/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.html" class="page">IsisModuleExtShiroRealmLdapImpl</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/shirorealmldap/realm/impl/IsisLdapContextFactory.html" class="page">IsisLdapContextFactory</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/shirorealmldap/realm/impl/IsisLdapRealm.html" class="page">IsisLdapRealm</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.html" class="page">IsisModuleExtShiroRealmLdapImpl</a></p>
 </div>
 </div>
 </div></div></td>
@@ -5653,7 +5194,7 @@ org.apache.isis.testing:isis-testing-unittestsupport-applib:jar:&lt;managed&gt;<
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/commandlog/impl/CommandSubscriberForJdo.html" class="page">CommandSubscriberForJdo</a>, <a href="../extensions/index/commandlog/impl/IsisModuleExtCommandLogImpl.html" class="page">IsisModuleExtCommandLogImpl</a>, <a href="../extensions/index/commandlog/impl/mixins/HasInteractionId_command.html" class="page">HasInteractionId_command</a>, <a href="../extensions/index/commandlog/impl/mixins/HasUsername_recentCommandsByUser.html" class="page">HasUsername_recen [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/commandlog/impl/CommandSubscriberForJdo.html" class="page">CommandSubscriberForJdo</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/commandlog/impl/IsisModuleExtCommandLogImpl.html" class="page">IsisModuleExtCommandLogImpl</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/commandlog/impl/mixins/HasInteractionId_command.html" class="page">HasInteractionId_command</a>, <a href="../../../refguide/2.0.0-M5/extensions/in [...]
 </div>
 </div>
 </div></div></td>
@@ -5739,7 +5280,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.html" class="page">IsisModuleExtCommandReplayPrimary</a>, <a href="../extensions/index/commandreplay/primary/config/PrimaryConfig.html" class="page">PrimaryConfig</a>, <a href="../extensions/index/commandreplay/primary/mixins/Object_openOnSecondary.html" class="page">Object_openOnSecondary</a>, <a href="../extensions/index/commandreplay/primary/restapi/CommandRetrievalService.html" class="page">Comman [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/commandreplay/primary/IsisModuleExtCommandReplayPrimary.html" class="page">IsisModuleExtCommandReplayPrimary</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/commandreplay/primary/config/PrimaryConfig.html" class="page">PrimaryConfig</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/commandreplay/primary/mixins/Object_openOnSecondary.html" class="page">Object_openOnSecondary</a>, <a href="../../../refguide/2.0.0-M5/ [...]
 </div>
 </div>
 </div></div></td>
@@ -5793,7 +5334,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.html" class="page">IsisModuleExtCommandReplaySecondary</a>, <a href="../extensions/index/commandreplay/secondary/SecondaryStatus.html" class="page">SecondaryStatus</a>, <a href="../extensions/index/commandreplay/secondary/analyser/CommandReplayAnalyser.html" class="page">CommandReplayAnalyser</a>, <a href="../extensions/index/commandreplay/secondary/analyser/CommandReplayAnalyserException.html" cl [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/commandreplay/secondary/IsisModuleExtCommandReplaySecondary.html" class="page">IsisModuleExtCommandReplaySecondary</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/commandreplay/secondary/SecondaryStatus.html" class="page">SecondaryStatus</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/commandreplay/secondary/analyser/CommandReplayAnalyser.html" class="page">CommandReplayAnalyser</a>, <a href="../../../refguide/2. [...]
 </div>
 </div>
 </div></div></td>
@@ -5858,7 +5399,7 @@ org.apache.isis.viewer:isis-viewer-wicket-ui:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/modelannotation/applib/IsisModuleIncModelApplib.html" class="page">IsisModuleIncModelApplib</a>, <a href="../extensions/index/modelannotation/applib/annotation/Model.html" class="page">Model</a>, <a href="../extensions/index/modelannotation/metamodel/IsisModuleExtModelAnnotation.html" class="page">IsisModuleExtModelAnnotation</a>, <a href="../extensions/index/modelannotation/metamodel/facets/SupportingMethodValidatorRefinerFactory.html" class="page">Suppor [...]
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/modelannotation/applib/IsisModuleIncModelApplib.html" class="page">IsisModuleIncModelApplib</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/modelannotation/applib/annotation/Model.html" class="page">Model</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/modelannotation/metamodel/IsisModuleExtModelAnnotation.html" class="page">IsisModuleExtModelAnnotation</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/mo [...]
 </div>
 </div>
 </div></div></td>
@@ -5929,7 +5470,7 @@ org.springframework.boot:spring-boot-starter-quartz:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../extensions/index/quartz/IsisModuleExtQuartzImpl.html" class="page">IsisModuleExtQuartzImpl</a>, <a href="../extensions/index/quartz/context/JobExecutionData.html" class="page">JobExecutionData</a>, <a href="../extensions/index/quartz/spring/AutowiringSpringBeanJobFactory.html" class="page">AutowiringSpringBeanJobFactory</a></p>
+<p><a href="../../../refguide/2.0.0-M5/extensions/index/quartz/IsisModuleExtQuartzImpl.html" class="page">IsisModuleExtQuartzImpl</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/quartz/context/JobExecutionData.html" class="page">JobExecutionData</a>, <a href="../../../refguide/2.0.0-M5/extensions/index/quartz/spring/AutowiringSpringBeanJobFactory.html" class="page">AutowiringSpringBeanJobFactory</a></p>
 </div>
 </div>
 </div></div></td>
@@ -6281,7 +5822,7 @@ org.datanucleus:javax.jdo:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../subdomains/index/base/applib/Chained.html" class="page">Chained</a>, <a href="../subdomains/index/base/applib/Dflt.html" class="page">Dflt</a>, <a href="../subdomains/index/base/applib/IsisModuleSubdomainsBaseApplib.html" class="page">IsisModuleSubdomainsBaseApplib</a>, <a href="../subdomains/index/base/applib/PowerType.html" class="page">PowerType</a>, <a href="../subdomains/index/base/applib/Titled.html" class="page">Titled</a>, <a href="../subdomains/index/base/applib/T [...]
+<p><a href="../../../refguide/2.0.0-M5/subdomains/index/base/applib/Chained.html" class="page">Chained</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/base/applib/Dflt.html" class="page">Dflt</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/base/applib/IsisModuleSubdomainsBaseApplib.html" class="page">IsisModuleSubdomainsBaseApplib</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/base/applib/PowerType.html" class="page">PowerType</a>, <a href="../../../refguid [...]
 </div>
 </div>
 </div></div></td>
@@ -6365,7 +5906,7 @@ org.apache.poi:poi-ooxml-schemas:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../subdomains/index/excel/applib/IsisModuleSubdomainsExcelApplib.html" class="page">IsisModuleSubdomainsExcelApplib</a>, <a href="../subdomains/index/excel/applib/dom/AggregationType.html" class="page">AggregationType</a>, <a href="../subdomains/index/excel/applib/dom/ExcelMetaDataEnabled.html" class="page">ExcelMetaDataEnabled</a>, <a href="../subdomains/index/excel/applib/dom/ExcelService.html" class="page">ExcelService</a>, <a href="../subdomains/index/excel/applib/dom/Hyp [...]
+<p><a href="../../../refguide/2.0.0-M5/subdomains/index/excel/applib/IsisModuleSubdomainsExcelApplib.html" class="page">IsisModuleSubdomainsExcelApplib</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/excel/applib/dom/AggregationType.html" class="page">AggregationType</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/excel/applib/dom/ExcelMetaDataEnabled.html" class="page">ExcelMetaDataEnabled</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/excel/applib/dom/Exc [...]
 </div>
 </div>
 </div></div></td>
@@ -6447,7 +5988,7 @@ org.projectlombok:lombok:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../subdomains/index/excel/testing/ExcelFixture.html" class="page">ExcelFixture</a>, <a href="../subdomains/index/excel/testing/ExcelFixture2.html" class="page">ExcelFixture2</a>, <a href="../subdomains/index/excel/testing/ExcelFixtureRowHandler.html" class="page">ExcelFixtureRowHandler</a>, <a href="../subdomains/index/excel/testing/ExcelFixtureWorkbookHandler.html" class="page">ExcelFixtureWorkbookHandler</a>, <a href="../subdomains/index/excel/testing/FixtureAwareRowHandler [...]
+<p><a href="../../../refguide/2.0.0-M5/subdomains/index/excel/testing/ExcelFixture.html" class="page">ExcelFixture</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/excel/testing/ExcelFixture2.html" class="page">ExcelFixture2</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/excel/testing/ExcelFixtureRowHandler.html" class="page">ExcelFixtureRowHandler</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/excel/testing/ExcelFixtureWorkbookHandler.html" class="page">Ex [...]
 </div>
 </div>
 </div></div></td>
@@ -6524,7 +6065,7 @@ org.apache.isis.core:isis-core-runtime:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../subdomains/index/spring/applib/IsisModuleSubdomainsSpringApplib.html" class="page">IsisModuleSubdomainsSpringApplib</a>, <a href="../subdomains/index/spring/applib/service/BeanDescriptor.html" class="page">BeanDescriptor</a>, <a href="../subdomains/index/spring/applib/service/ContextBeans.html" class="page">ContextBeans</a>, <a href="../subdomains/index/spring/applib/service/SpringBeansService.html" class="page">SpringBeansService</a></p>
+<p><a href="../../../refguide/2.0.0-M5/subdomains/index/spring/applib/IsisModuleSubdomainsSpringApplib.html" class="page">IsisModuleSubdomainsSpringApplib</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/spring/applib/service/BeanDescriptor.html" class="page">BeanDescriptor</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/spring/applib/service/ContextBeans.html" class="page">ContextBeans</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/spring/applib/service/Spr [...]
 </div>
 </div>
 </div></div></td>
@@ -6607,7 +6148,7 @@ org.projectlombok:lombok:jar:&lt;managed&gt;<br></p>
 <div class="content">
 <div class="title">Document Index Entries</div>
 <div class="paragraph">
-<p><a href="../subdomains/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.html" class="page">IsisModuleSubdomainsXDocReportApplib</a>, <a href="../subdomains/index/xdocreport/applib/service/OutputType.html" class="page">OutputType</a>, <a href="../subdomains/index/xdocreport/applib/service/XDocReportModel.html" class="page">XDocReportModel</a>, <a href="../subdomains/index/xdocreport/applib/service/XDocReportService.html" class="page">XDocReportService</a></p>
+<p><a href="../../../refguide/2.0.0-M5/subdomains/index/xdocreport/applib/IsisModuleSubdomainsXDocReportApplib.html" class="page">IsisModuleSubdomainsXDocReportApplib</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/xdocreport/applib/service/OutputType.html" class="page">OutputType</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/xdocreport/applib/service/XDocReportModel.html" class="page">XDocReportModel</a>, <a href="../../../refguide/2.0.0-M5/subdomains/index/xdocrep [...]
 </div>
 </div>
 </div></div></td>
diff --git a/content/core/2.0.0-M5/about.html b/content/core/2.0.0-M5/about.html
index bbab99d..19c3450 100644
--- a/content/core/2.0.0-M5/about.html
+++ b/content/core/2.0.0-M5/about.html
@@ -310,9 +310,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -408,7 +411,7 @@ page.parent doesn't seem to be set...
 <p><a href="../../refguide/2.0.0-M5/about.html" class="page">reference guide</a></p>
 </li>
 <li>
-<p><a href="../../security/2.0.0-M5/about.html" class="page">security guide</a></p>
+<p><a href="#security:ROOT:about.adoc" class="page unresolved">security guide</a></p>
 </li>
 <li>
 <p><a href="../../testing/2.0.0-M5/about.html" class="page">testing guide</a>.</p>
diff --git a/content/core/2.0.0-M5/archdesign/about.html b/content/core/2.0.0-M5/archdesign/about.html
index 51c6d0d..e69fdbf 100644
--- a/content/core/2.0.0-M5/archdesign/about.html
+++ b/content/core/2.0.0-M5/archdesign/about.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/codegen-bytebuddy/about.html b/content/core/2.0.0-M5/codegen-bytebuddy/about.html
index 9a7ff63..5193dd7 100644
--- a/content/core/2.0.0-M5/codegen-bytebuddy/about.html
+++ b/content/core/2.0.0-M5/codegen-bytebuddy/about.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/commons/about.html b/content/core/2.0.0-M5/commons/about.html
index 285adaa..7f22133 100644
--- a/content/core/2.0.0-M5/commons/about.html
+++ b/content/core/2.0.0-M5/commons/about.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html b/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html
index 57d04c0..866d0aa 100644
--- a/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html
+++ b/content/core/2.0.0-M5/commons/concurrent-task-list-UNUSED.html
@@ -309,9 +309,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/interaction/about.html b/content/core/2.0.0-M5/interaction/about.html
index 6d11b20..c949f15 100644
--- a/content/core/2.0.0-M5/interaction/about.html
+++ b/content/core/2.0.0-M5/interaction/about.html
@@ -309,9 +309,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/internaltestsupport/about.html b/content/core/2.0.0-M5/internaltestsupport/about.html
index 2a27b09..71c1a9d 100644
--- a/content/core/2.0.0-M5/internaltestsupport/about.html
+++ b/content/core/2.0.0-M5/internaltestsupport/about.html
@@ -309,9 +309,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/metamodel/about.html b/content/core/2.0.0-M5/metamodel/about.html
index c2ddf7e..0118588 100644
--- a/content/core/2.0.0-M5/metamodel/about.html
+++ b/content/core/2.0.0-M5/metamodel/about.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/metamodel/class-diagram.html b/content/core/2.0.0-M5/metamodel/class-diagram.html
index b3e12ca..0ca7251 100644
--- a/content/core/2.0.0-M5/metamodel/class-diagram.html
+++ b/content/core/2.0.0-M5/metamodel/class-diagram.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/regressiontests/about.html b/content/core/2.0.0-M5/regressiontests/about.html
index b16f12b..9c8a98b 100644
--- a/content/core/2.0.0-M5/regressiontests/about.html
+++ b/content/core/2.0.0-M5/regressiontests/about.html
@@ -310,9 +310,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/runtime/about.html b/content/core/2.0.0-M5/runtime/about.html
index 85252a0..9b45eb5 100644
--- a/content/core/2.0.0-M5/runtime/about.html
+++ b/content/core/2.0.0-M5/runtime/about.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/runtimeservices/about.html b/content/core/2.0.0-M5/runtimeservices/about.html
index cbf07c2..c95ecac 100644
--- a/content/core/2.0.0-M5/runtimeservices/about.html
+++ b/content/core/2.0.0-M5/runtimeservices/about.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/transaction/about.html b/content/core/2.0.0-M5/transaction/about.html
index 1d370de..621f3c4 100644
--- a/content/core/2.0.0-M5/transaction/about.html
+++ b/content/core/2.0.0-M5/transaction/about.html
@@ -309,9 +309,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/webapp/about.html b/content/core/2.0.0-M5/webapp/about.html
index bc14651..361797f 100644
--- a/content/core/2.0.0-M5/webapp/about.html
+++ b/content/core/2.0.0-M5/webapp/about.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/core/2.0.0-M5/webapp/webmodules.html b/content/core/2.0.0-M5/webapp/webmodules.html
index 6b9740c..fd9d368 100644
--- a/content/core/2.0.0-M5/webapp/webmodules.html
+++ b/content/core/2.0.0-M5/webapp/webmodules.html
@@ -311,9 +311,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/userguide/2.0.0-M5/fun/_attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf b/content/docs/2.0.0-M5/_attachments/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from content/userguide/2.0.0-M5/fun/_attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
rename to content/docs/2.0.0-M5/_attachments/Pawson-Naked-Objects-thesis.pdf
diff --git a/content/docs/2.0.0-M5/about.html b/content/docs/2.0.0-M5/about.html
index aeff237..469c0f5 100644
--- a/content/docs/2.0.0-M5/about.html
+++ b/content/docs/2.0.0-M5/about.html
@@ -313,7 +313,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -334,7 +334,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -548,9 +548,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -790,7 +793,7 @@ page.parent doesn't seem to be set...
 <div class="ulist">
 <ul>
 <li>
-<p><a href="../../security/2.0.0-M5/about.html" class="page">Security Guide</a></p>
+<p><a href="#security:ROOT:about.adoc" class="page unresolved">Security Guide</a></p>
 </li>
 </ul>
 </div>
@@ -895,10 +898,14 @@ page.parent doesn't seem to be set...
 <div class="ulist">
 <ul>
 <li>
-<p><a href="../../refguide/2.0.0-M5/_overview/about.html" class="page">System Overview</a></p>
-</li>
-<li>
 <p><a href="../../core/2.0.0-M5/about.html" class="page">Core Framework</a></p>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="../../core/2.0.0-M5/_overview/about.html" class="page">System Overview</a></p>
+</li>
+</ul>
+</div>
 </li>
 </ul>
 </div>
@@ -945,7 +952,7 @@ page.parent doesn't seem to be set...
 <div class="ulist">
 <ul>
 <li>
-<p><a href="../ug/fun/_attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf">Naked Objects PhD</a> (Pawson)</p>
+<p><a href="_attachments/Pawson-Naked-Objects-thesis.pdf">Naked Objects</a> (PhD thesis, Pawson)</p>
 </li>
 <li>
 <p><a href="https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf">CLIsis: An interface for Visually Impaired Users</a> (Bachelors dissertation, Ginn)</p>
diff --git a/content/docs/2.0.0-M5/archive/1-x.html b/content/docs/2.0.0-M5/archive/1-x.html
index 4bc7709..a98be58 100644
--- a/content/docs/2.0.0-M5/archive/1-x.html
+++ b/content/docs/2.0.0-M5/archive/1-x.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/demo/about.html b/content/docs/2.0.0-M5/demo/about.html
index cf37cc1..2198df7 100644
--- a/content/docs/2.0.0-M5/demo/about.html
+++ b/content/docs/2.0.0-M5/demo/about.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/downloads/how-to.html b/content/docs/2.0.0-M5/downloads/how-to.html
index 6dad842..8fe2ba3 100644
--- a/content/docs/2.0.0-M5/downloads/how-to.html
+++ b/content/docs/2.0.0-M5/downloads/how-to.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html b/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html
index bf5419d..6d69be9 100644
--- a/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html
+++ b/content/docs/2.0.0-M5/going-deeper/articles-and-presentations.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/going-deeper/books.html b/content/docs/2.0.0-M5/going-deeper/books.html
index cc66571..21f7ae7 100644
--- a/content/docs/2.0.0-M5/going-deeper/books.html
+++ b/content/docs/2.0.0-M5/going-deeper/books.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/landing-page/components.html b/content/docs/2.0.0-M5/landing-page/components.html
index ba2ce96..24de482 100644
--- a/content/docs/2.0.0-M5/landing-page/components.html
+++ b/content/docs/2.0.0-M5/landing-page/components.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -641,7 +644,7 @@ page.parent doesn't seem to be set...
 <h2 id="overview"><a class="anchor" href="#overview"></a>Overview</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p><a href="../../../refguide/2.0.0-M5/_overview/about.html" class="page">System Overview</a></p>
+<p><a href="../../../core/2.0.0-M5/_overview/about.html" class="page">System Overview</a></p>
 </div>
 </div>
 </div>
@@ -654,13 +657,13 @@ page.parent doesn't seem to be set...
 <div class="ulist">
 <ul>
 <li>
-<p><a href="../../../vw/2.0.0-M5/about.html" class="page">Wicket</a></p>
+<p><a href="../../../vw/2.0.0-M5/about.html" class="page">Web UI (Wicket)</a></p>
 <div class="paragraph">
-<p>Provides a human-usable UI, styled using Bootstrap.</p>
+<p>Provides a human-usable UI, implemented using <a href="https://wicket.apache.org">Apache Wicket</a>, and styled using Bootstrap.</p>
 </div>
 </li>
 <li>
-<p><a href="../../../vro/2.0.0-M5/about.html" class="page">Restful Objects (REST API)</a></p>
+<p><a href="../../../vro/2.0.0-M5/about.html" class="page">REST API (Restful Objects)</a></p>
 <div class="paragraph">
 <p>Presents your domain objects in JSON representations, compliant either with <a href="http://restfulobjects.org">Restful Objects</a> specification or one of a number of other representations.</p>
 </div>
@@ -673,7 +676,7 @@ page.parent doesn't seem to be set...
 <h2 id="security"><a class="anchor" href="#security"></a>Security</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>The <a href="../../../security/2.0.0-M5/about.html" class="page">Security Guide</a> describes how to configure each of the various security implementations that integrate with Apache Isis.</p>
+<p>The <a href="#security:ROOT:about.adoc" class="page unresolved">Security Guide</a> describes how to configure each of the various security implementations that integrate with Apache Isis.</p>
 </div>
 </div>
 </div>
diff --git a/content/docs/2.0.0-M5/landing-page/guides.html b/content/docs/2.0.0-M5/landing-page/guides.html
index a3789ef..03e36f8 100644
--- a/content/docs/2.0.0-M5/landing-page/guides.html
+++ b/content/docs/2.0.0-M5/landing-page/guides.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/landing-page/internal.html b/content/docs/2.0.0-M5/landing-page/internal.html
index 295daee..3c0a324 100644
--- a/content/docs/2.0.0-M5/landing-page/internal.html
+++ b/content/docs/2.0.0-M5/landing-page/internal.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/landing-page/libraries.html b/content/docs/2.0.0-M5/landing-page/libraries.html
index a118c46..6d9f89f 100644
--- a/content/docs/2.0.0-M5/landing-page/libraries.html
+++ b/content/docs/2.0.0-M5/landing-page/libraries.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/landing-page/releases.html b/content/docs/2.0.0-M5/landing-page/releases.html
index ffd7acb..10924a1 100644
--- a/content/docs/2.0.0-M5/landing-page/releases.html
+++ b/content/docs/2.0.0-M5/landing-page/releases.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/mavendeps/about.html b/content/docs/2.0.0-M5/mavendeps/about.html
index 16a6298..4178d7f 100644
--- a/content/docs/2.0.0-M5/mavendeps/about.html
+++ b/content/docs/2.0.0-M5/mavendeps/about.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -680,7 +683,7 @@ Note however that it does <em>not</em> include the runtime dependencies for eith
 <p>Apache Isis Core - the <a href="../../../refguide/2.0.0-M5/about.html" class="page">Applib</a> and underlying implementation (<a href="#core:runtime-services:about.adoc" class="page unresolved">Runtime Services</a>)</p>
 </li>
 <li>
-<p>All the security implementations (<a href="../../../security/2.0.0-M5/bypass/about.html" class="page">Bypass</a>,<a href="../../../security/2.0.0-M5/shiro/about.html" class="page">Shiro</a> and  <a href="../../../security/2.0.0-M5/keycloak/about.html" class="page">Keycloak</a>)</p>
+<p>All the security implementations (<a href="#security:bypass:about.adoc" class="page unresolved">Bypass</a>,<a href="#security:shiro:about.adoc" class="page unresolved">Shiro</a> and  <a href="#security:keycloak:about.adoc" class="page unresolved">Keycloak</a>)</p>
 </li>
 <li>
 <p>All the viewer implementations (<a href="../../../vw/2.0.0-M5/about.html" class="page">Wicket</a>, <a href="../../../vro/2.0.0-M5/about.html" class="page">Restful Objects</a>)</p>
@@ -870,7 +873,7 @@ integspecs</th>
 <tr>
 <td class="tableblock halign-left valign-top"><div class="content"><div class="paragraph">
 <p>Apache Isis<br>
-<a href="../../../security/2.0.0-M5/bypass/about.html" class="page">Bypass</a> security</p>
+<a href="#security:bypass:about.adoc" class="page unresolved">Bypass</a> security</p>
 </div></div></td>
 <td class="tableblock halign-center valign-top"><div class="content"></div></td>
 <td class="tableblock halign-center valign-top"><div class="content"><div class="paragraph">
diff --git a/content/docs/2.0.0-M5/more-thanks/more-thanks.html b/content/docs/2.0.0-M5/more-thanks/more-thanks.html
index 6b04864..251c315 100644
--- a/content/docs/2.0.0-M5/more-thanks/more-thanks.html
+++ b/content/docs/2.0.0-M5/more-thanks/more-thanks.html
@@ -313,7 +313,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -334,7 +334,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -548,9 +548,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/parent-pom/about.html b/content/docs/2.0.0-M5/parent-pom/about.html
index 88df5ee..9da633f 100644
--- a/content/docs/2.0.0-M5/parent-pom/about.html
+++ b/content/docs/2.0.0-M5/parent-pom/about.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/resources/about.html b/content/docs/2.0.0-M5/resources/about.html
index 23f2cba..3c8af7b 100644
--- a/content/docs/2.0.0-M5/resources/about.html
+++ b/content/docs/2.0.0-M5/resources/about.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/resources/cheatsheet.html b/content/docs/2.0.0-M5/resources/cheatsheet.html
index f11a262..37e2d41 100644
--- a/content/docs/2.0.0-M5/resources/cheatsheet.html
+++ b/content/docs/2.0.0-M5/resources/cheatsheet.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/resources/icons.html b/content/docs/2.0.0-M5/resources/icons.html
index 05421d4..a627d91 100644
--- a/content/docs/2.0.0-M5/resources/icons.html
+++ b/content/docs/2.0.0-M5/resources/icons.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/starters/about.html b/content/docs/2.0.0-M5/starters/about.html
index 3f1ff5a..7e41a40 100644
--- a/content/docs/2.0.0-M5/starters/about.html
+++ b/content/docs/2.0.0-M5/starters/about.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html b/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html
index b326d73..f824098 100644
--- a/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html
+++ b/content/docs/2.0.0-M5/starters/helloworld-script-jdo.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html b/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html
index 9e683a3..f224cb8 100644
--- a/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html
+++ b/content/docs/2.0.0-M5/starters/helloworld-script-jpa.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/starters/helloworld.html b/content/docs/2.0.0-M5/starters/helloworld.html
index 14e85d6..cf05c33 100644
--- a/content/docs/2.0.0-M5/starters/helloworld.html
+++ b/content/docs/2.0.0-M5/starters/helloworld.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -754,7 +757,7 @@ Then browse to <a href="http://localhost:8080" class="bare">http://localhost:808
 </div>
 </div>
 <div class="paragraph">
-<p>The app itself is configured to run using <a href="../../../security/2.0.0-M5/about.html" class="page">shiro security</a>, as configured in the <code>shiro.ini</code> config file.
+<p>The app itself is configured to run using <a href="#security:ROOT:about.adoc" class="page unresolved">shiro security</a>, as configured in the <code>shiro.ini</code> config file.
 You can login with:</p>
 </div>
 <div class="ulist">
@@ -1351,7 +1354,7 @@ Typically this just holds JDBC connection strings, etc.</td>
 </td>
 <td class="content">
 <div class="paragraph">
-<p>The <a href="../../../security/2.0.0-M5/shiro/about.html" class="page">Shiro security</a> integration is much more flexible than simple file-based authentication.</p>
+<p>The <a href="#security:shiro:about.adoc" class="page unresolved">Shiro security</a> integration is much more flexible than simple file-based authentication.</p>
 </div>
 </td>
 </tr>
diff --git a/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html b/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html
index 87e57bb..88de84c 100644
--- a/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html
+++ b/content/docs/2.0.0-M5/starters/simpleapp-script-jdo.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html b/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html
index 3d62e02..a06ea25 100644
--- a/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html
+++ b/content/docs/2.0.0-M5/starters/simpleapp-script-jpa.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/starters/simpleapp.html b/content/docs/2.0.0-M5/starters/simpleapp.html
index a4710ad..010ca76 100644
--- a/content/docs/2.0.0-M5/starters/simpleapp.html
+++ b/content/docs/2.0.0-M5/starters/simpleapp.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -754,7 +757,7 @@ Then browse to <a href="http://localhost:8080" class="bare">http://localhost:808
 </div>
 </div>
 <div class="paragraph">
-<p>The app itself is configured to run using <a href="../../../security/2.0.0-M5/about.html" class="page">shiro security</a>, as configured in the <code>shiro.ini</code> config file.
+<p>The app itself is configured to run using <a href="#security:ROOT:about.adoc" class="page unresolved">shiro security</a>, as configured in the <code>shiro.ini</code> config file.
 You can login with:</p>
 </div>
 <div class="ulist">
@@ -1901,7 +1904,7 @@ This leverages a feature in Spring Boot&#8217;s Flyway integration which allows
 </td>
 <td class="content">
 <div class="paragraph">
-<p>The <a href="../../../security/2.0.0-M5/shiro/about.html" class="page">Shiro security</a> integration is much more flexible than simple file-based authentication.</p>
+<p>The <a href="#security:shiro:about.adoc" class="page unresolved">Shiro security</a> integration is much more flexible than simple file-based authentication.</p>
 </div>
 </td>
 </tr>
diff --git a/content/docs/2.0.0-M5/support/about.html b/content/docs/2.0.0-M5/support/about.html
index 8fb0e38..4495826 100644
--- a/content/docs/2.0.0-M5/support/about.html
+++ b/content/docs/2.0.0-M5/support/about.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/support/mailing-list.html b/content/docs/2.0.0-M5/support/mailing-list.html
index 66d30a1..ce570f1 100644
--- a/content/docs/2.0.0-M5/support/mailing-list.html
+++ b/content/docs/2.0.0-M5/support/mailing-list.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/support/slack-channel.html b/content/docs/2.0.0-M5/support/slack-channel.html
index e8cab41..f89b53d 100644
--- a/content/docs/2.0.0-M5/support/slack-channel.html
+++ b/content/docs/2.0.0-M5/support/slack-channel.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html b/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html
index d9ed846..a2f8b43 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/common-use-cases.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html b/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html
index 3544d45..4c76eb3 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/isis-in-pictures.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -666,7 +669,7 @@ There have been a number of UI improvements since these releases.
 <p>Apache Isis integrates with a variety of authentication mechanisms, including <a href="http://shiro.apache.org">Apache Shiro</a>, <a href="https://spring.io/projects/spring-security">Spring Security</a> and <a href="https://www.keycloak.org/">Keycloak</a>.</p>
 </div>
 <div class="paragraph">
-<p>The <a href="../../../security/2.0.0-M5/about.html" class="page">SecMan extension</a> provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.</p>
+<p>The <a href="#security:ROOT:about.adoc" class="page unresolved">SecMan extension</a> provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.</p>
 </div>
 <div class="imageblock">
 <div class="content">
@@ -841,7 +844,7 @@ This is <em>not</em> a view but instead is a (contributed) action that uses the
 </div>
 </div>
 <div class="paragraph">
-<p>In the security menu is access to the rich set of functionality provided by the <a href="../../../security/2.0.0-M5/about.html" class="page">SecMan extension</a>:</p>
+<p>In the security menu is access to the rich set of functionality provided by the <a href="#security:ROOT:about.adoc" class="page unresolved">SecMan extension</a>:</p>
 </div>
 <div class="imageblock">
 <div class="content">
@@ -869,7 +872,7 @@ Most apps (the todoapp example included) won&#8217;t expose these services direc
 <div class="sect2">
 <h3 id="multi-tenancy-support"><a class="anchor" href="#multi-tenancy-support"></a>Multi-tenancy support</h3>
 <div class="paragraph">
-<p>One significant feature of the <a href="../../../security/2.0.0-M5/about.html" class="page">SecMan extension</a> is the ability to associate users and objects with a "tenancy".
+<p>One significant feature of the <a href="#security:ROOT:about.adoc" class="page unresolved">SecMan extension</a> is the ability to associate users and objects with a "tenancy".
 The todoapp uses this feature so that different users' list of todo items are kept separate from one another.
 A user with administrator is able to switch their own "tenancy" to the tenancy of some other user, in order to access the objects in that tenancy:</p>
 </div>
@@ -879,13 +882,13 @@ A user with administrator is able to switch their own "tenancy" to the tenancy o
 </div>
 </div>
 <div class="paragraph">
-<p>For more details, see the <a href="../../../security/2.0.0-M5/about.html" class="page">SecMan extension</a>.</p>
+<p>For more details, see the <a href="#security:ROOT:about.adoc" class="page unresolved">SecMan extension</a>.</p>
 </div>
 </div>
 <div class="sect2">
 <h3 id="me"><a class="anchor" href="#me"></a>Me</h3>
 <div class="paragraph">
-<p>Most of the <a href="../../../security/2.0.0-M5/about.html" class="page">SecMan extension</a>'s services are on the security menu, which would normally be provided only to administrators.
+<p>Most of the <a href="#security:ROOT:about.adoc" class="page unresolved">SecMan extension</a>'s services are on the security menu, which would normally be provided only to administrators.
 Kept separate is the "me" action:</p>
 </div>
 <div class="imageblock">
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by.html b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by.html
index 12efcce..f60773c 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/commapp.html b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/commapp.html
index 3ed8371..57f673b 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/commapp.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/commapp.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/contactapp.html b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/contactapp.html
index d70fb93..a7d99c4 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/contactapp.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/contactapp.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/cqnz.html b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/cqnz.html
index 5f71f6d..84d3e2e 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/cqnz.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/cqnz.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/estatio.html b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/estatio.html
index f774d65..107fc7f 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/estatio.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/estatio.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/gesconsultor-grc.html b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/gesconsultor-grc.html
index b2ae31f..77e569d 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/gesconsultor-grc.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/gesconsultor-grc.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/transport-planner.html b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/transport-planner.html
index 042ad7e..c16ac5e 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/transport-planner.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/powered-by/transport-planner.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html
index d5132ca..e5c3cfa 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts-older.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html
index 4fbd0c9..be7ad9a 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts.html
@@ -314,7 +314,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -335,7 +335,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -549,9 +549,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html
index e57d7bb..78ca525 100644
--- a/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html
+++ b/content/docs/2.0.0-M5/what-is-apache-isis/screencasts/playlists.html
@@ -312,7 +312,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Overview</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../refguide/2.0.0-M5/_overview/about.html">System Overview</a>
+    <a class="nav-link" href="../../../../core/2.0.0-M5/_overview/about.html">System Overview</a>
   </li>
 </ul>
   </li>
@@ -333,7 +333,7 @@ page.parent doesn't seem to be set...
     <span class="nav-text">Security</span>
 <ul class="nav-list">
   <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../../security/2.0.0-M5/about.html">Security Guide</a>
+    <a class="nav-link" href="#security:ROOT:about.adoc">Security Guide</a>
   </li>
 </ul>
   </li>
@@ -547,9 +547,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/extensions/2.0.0-M5/about.html b/content/extensions/2.0.0-M5/about.html
index 9448223..91628c6 100644
--- a/content/extensions/2.0.0-M5/about.html
+++ b/content/extensions/2.0.0-M5/about.html
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="../../security/2.0.0-M5/session-log/about.html" title="Session Log">
+  <link rel="next" href="command-log/about.html" title="Command Log">
   </head>
   <body class="article">
 <header class="header">
@@ -146,7 +146,7 @@
 <div class="nav-panel-pagination">
   <a class="page-previous disabled" rel="prev" href="" title=""><span></span></a>
   <a class="page-next" rel="next"
-     href="../../security/2.0.0-M5/session-log/about.html" title="Session Log"><span></span></a>
+     href="command-log/about.html" title="Command Log"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
   <a class="page-parent disabled" rel="prev" href="" title=""><span></span></a>
@@ -159,86 +159,59 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
     <span class="nav-text">Core</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../security/2.0.0-M5/session-log/about.html">Session Log</a>
   </li>
-  <li class="nav-item" data-depth="2">
+</ul>
+  </li>
+  <li class="nav-item" data-depth="0">
+<ul class="nav-list">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="command-log/about.html">Command Log</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="command-replay/about.html">Command Replay</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../userguide/2.0.0-M5/flyway/about.html">Flyway</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="model-annotation/about.html">Model Annotation</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Security</span>
+    <a class="nav-link" href="model-annotation/about.html">Model Annotation</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../security/2.0.0-M5/shiro-realm-ldap/about.html">LDAP Realm for Shiro</a>
+    <span class="nav-text">Security
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:secman:partial$module-nav.adoc[]</span>
   </li>
   <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../security/2.0.0-M5/secman/about.html">Secman</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../security/2.0.0-M5/secman/api.html">API</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../security/2.0.0-M5/secman/model.html">Model</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../security/2.0.0-M5/secman/jbcrypt-encryption.html">JBCrypt Encryption</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../security/2.0.0-M5/secman/jdo-persistence.html">JDO Persistence</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../security/2.0.0-M5/secman/shiro-realm.html">Realm (for Shiro)</a>
-  </li>
-</ul>
+    <span class="nav-text">Restful Objects Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Restful Objects Viewer</span>
+    <a class="nav-link" href="../../vro/2.0.0-M5/cors/about.html">CORS</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../vro/2.0.0-M5/cors/about.html">CORS</a>
+    <span class="nav-text">Wicket Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Wicket Viewer</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../../vw/2.0.0-M5/exceldownload/about.html">Excel Download</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../vw/2.0.0-M5/fullcalendar/about.html">fullcalendar</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="#gmap3:about.adoc">GMap3</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../vw/2.0.0-M5/pdfjs/about.html">pdf.js</a>
   </li>
 </ul>
   </li>
 </ul>
-  </li>
-</ul>
   </nav>
 </div>
 <div class="nav-panel-explore" data-panel="explore">
@@ -352,9 +325,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -444,7 +420,7 @@ These typically are for use directly within by the domain application itself.</p
 <div class="ulist">
 <ul>
 <li>
-<p>in the <a href="../../security/2.0.0-M5/about.html" class="page">security</a> guide, and the <a href="../../vw/2.0.0-M5/about.html" class="page">wicket viewer</a> guide).</p>
+<p>in the <a href="#security:ROOT:about.adoc" class="page unresolved">security</a> guide, and the <a href="../../vw/2.0.0-M5/about.html" class="page">wicket viewer</a> guide).</p>
 <div class="paragraph">
 <p>These extensions extend the capability of those components, or provide alternative implementations</p>
 </div>
diff --git a/content/extensions/2.0.0-M5/command-log/about.html b/content/extensions/2.0.0-M5/command-log/about.html
index 232df22..4cd6556 100644
--- a/content/extensions/2.0.0-M5/command-log/about.html
+++ b/content/extensions/2.0.0-M5/command-log/about.html
@@ -12,7 +12,7 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
   <link rel="next" href="../command-replay/about.html" title="Command Replay">
-  <link rel="prev" href="../../../security/2.0.0-M5/session-log/about.html" title="Session Log">
+  <link rel="prev" href="../about.html" title="Extensions Catalog">
   </head>
   <body class="article">
 <header class="header">
@@ -145,12 +145,12 @@
   <aside class="nav">
     <div class="panels">
 <div class="nav-panel-pagination">
-  <a class="page-previous" rel="prev" href="../../../security/2.0.0-M5/session-log/about.html" title="Session Log"><span></span></a>
+  <a class="page-previous" rel="prev" href="../about.html" title="Extensions Catalog"><span></span></a>
   <a class="page-next" rel="next"
      href="../command-replay/about.html" title="Command Replay"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title="Session Log"><span></span></a>
+  <a class="page-parent disabled" rel="prev" href="" title="Extensions Catalog"><span></span></a>
 -->
 </div>
 <div class="nav-panel-menu is-active" data-panel="menu">
@@ -160,86 +160,59 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
     <span class="nav-text">Core</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../security/2.0.0-M5/session-log/about.html">Session Log</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="2">
+</ul>
+  </li>
+  <li class="nav-item" data-depth="0">
+<ul class="nav-list">
+  <li class="nav-item is-current-page" data-depth="1">
     <a class="nav-link" href="about.html">Command Log</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../command-replay/about.html">Command Replay</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../userguide/2.0.0-M5/flyway/about.html">Flyway</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../model-annotation/about.html">Model Annotation</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Security</span>
+    <a class="nav-link" href="../model-annotation/about.html">Model Annotation</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../security/2.0.0-M5/shiro-realm-ldap/about.html">LDAP Realm for Shiro</a>
+    <span class="nav-text">Security
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:secman:partial$module-nav.adoc[]</span>
   </li>
   <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/about.html">Secman</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/api.html">API</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/model.html">Model</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/jbcrypt-encryption.html">JBCrypt Encryption</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/jdo-persistence.html">JDO Persistence</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/shiro-realm.html">Realm (for Shiro)</a>
-  </li>
-</ul>
+    <span class="nav-text">Restful Objects Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Restful Objects Viewer</span>
+    <a class="nav-link" href="../../../vro/2.0.0-M5/cors/about.html">CORS</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../vro/2.0.0-M5/cors/about.html">CORS</a>
+    <span class="nav-text">Wicket Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Wicket Viewer</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../../../vw/2.0.0-M5/exceldownload/about.html">Excel Download</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../vw/2.0.0-M5/fullcalendar/about.html">fullcalendar</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="#gmap3:about.adoc">GMap3</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../vw/2.0.0-M5/pdfjs/about.html">pdf.js</a>
   </li>
 </ul>
   </li>
 </ul>
-  </li>
-</ul>
   </nav>
 </div>
 <div class="nav-panel-explore" data-panel="explore">
@@ -353,9 +326,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -428,7 +404,6 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="../about.html">Extensions Catalog</a></li>
-    <li>Core</li>
     <li><a href="about.html">Command Log</a></li>
   </ul>
 </nav>
diff --git a/content/extensions/2.0.0-M5/command-replay/about.html b/content/extensions/2.0.0-M5/command-replay/about.html
index 1b95c85..deb8dc8 100644
--- a/content/extensions/2.0.0-M5/command-replay/about.html
+++ b/content/extensions/2.0.0-M5/command-replay/about.html
@@ -160,86 +160,59 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
     <span class="nav-text">Core</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../security/2.0.0-M5/session-log/about.html">Session Log</a>
   </li>
-  <li class="nav-item" data-depth="2">
+</ul>
+  </li>
+  <li class="nav-item" data-depth="0">
+<ul class="nav-list">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../command-log/about.html">Command Log</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="2">
+  <li class="nav-item is-current-page" data-depth="1">
     <a class="nav-link" href="about.html">Command Replay</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../userguide/2.0.0-M5/flyway/about.html">Flyway</a>
   </li>
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../model-annotation/about.html">Model Annotation</a>
-  </li>
-</ul>
-  </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Security</span>
+    <a class="nav-link" href="../model-annotation/about.html">Model Annotation</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../security/2.0.0-M5/shiro-realm-ldap/about.html">LDAP Realm for Shiro</a>
+    <span class="nav-text">Security
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:secman:partial$module-nav.adoc[]</span>
   </li>
   <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/about.html">Secman</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/api.html">API</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/model.html">Model</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/jbcrypt-encryption.html">JBCrypt Encryption</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/jdo-persistence.html">JDO Persistence</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/shiro-realm.html">Realm (for Shiro)</a>
-  </li>
-</ul>
+    <span class="nav-text">Restful Objects Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Restful Objects Viewer</span>
+    <a class="nav-link" href="../../../vro/2.0.0-M5/cors/about.html">CORS</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../vro/2.0.0-M5/cors/about.html">CORS</a>
+    <span class="nav-text">Wicket Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Wicket Viewer</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../../../vw/2.0.0-M5/exceldownload/about.html">Excel Download</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../vw/2.0.0-M5/fullcalendar/about.html">fullcalendar</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="#gmap3:about.adoc">GMap3</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../vw/2.0.0-M5/pdfjs/about.html">pdf.js</a>
   </li>
 </ul>
   </li>
 </ul>
-  </li>
-</ul>
   </nav>
 </div>
 <div class="nav-panel-explore" data-panel="explore">
@@ -353,9 +326,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -428,7 +404,6 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="../about.html">Extensions Catalog</a></li>
-    <li>Core</li>
     <li><a href="about.html">Command Replay</a></li>
   </ul>
 </nav>
diff --git a/content/extensions/2.0.0-M5/model-annotation/about.html b/content/extensions/2.0.0-M5/model-annotation/about.html
index b83bb3f..3922c29 100644
--- a/content/extensions/2.0.0-M5/model-annotation/about.html
+++ b/content/extensions/2.0.0-M5/model-annotation/about.html
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="../../../security/2.0.0-M5/shiro-realm-ldap/about.html" title="LDAP Realm for Shiro">
+  <link rel="next" href="../../../vro/2.0.0-M5/cors/about.html" title="CORS">
   <link rel="prev" href="../../../userguide/2.0.0-M5/flyway/about.html" title="Flyway">
   </head>
   <body class="article">
@@ -147,7 +147,7 @@
 <div class="nav-panel-pagination">
   <a class="page-previous" rel="prev" href="../../../userguide/2.0.0-M5/flyway/about.html" title="Flyway"><span></span></a>
   <a class="page-next" rel="next"
-     href="../../../security/2.0.0-M5/shiro-realm-ldap/about.html" title="LDAP Realm for Shiro"><span></span></a>
+     href="../../../vro/2.0.0-M5/cors/about.html" title="CORS"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
   <a class="page-parent disabled" rel="prev" href="" title="Flyway"><span></span></a>
@@ -160,86 +160,59 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
     <span class="nav-text">Core</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../security/2.0.0-M5/session-log/about.html">Session Log</a>
   </li>
-  <li class="nav-item" data-depth="2">
+</ul>
+  </li>
+  <li class="nav-item" data-depth="0">
+<ul class="nav-list">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../command-log/about.html">Command Log</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../command-replay/about.html">Command Replay</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../userguide/2.0.0-M5/flyway/about.html">Flyway</a>
   </li>
-  <li class="nav-item is-current-page" data-depth="2">
-    <a class="nav-link" href="about.html">Model Annotation</a>
-  </li>
-</ul>
-  </li>
-  <li class="nav-item" data-depth="1">
+  <li class="nav-item is-current-page" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Security</span>
+    <a class="nav-link" href="about.html">Model Annotation</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../security/2.0.0-M5/shiro-realm-ldap/about.html">LDAP Realm for Shiro</a>
+    <span class="nav-text">Security
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+Unresolved include directive in modules/ROOT/partials/component-nav.adoc - include::security:secman:partial$module-nav.adoc[]</span>
   </li>
   <li class="nav-item" data-depth="2">
-    <button class="nav-item-toggle"></button>
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/about.html">Secman</a>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/api.html">API</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/model.html">Model</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/jbcrypt-encryption.html">JBCrypt Encryption</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/jdo-persistence.html">JDO Persistence</a>
-  </li>
-  <li class="nav-item" data-depth="3">
-    <a class="nav-link" href="../../../security/2.0.0-M5/secman/shiro-realm.html">Realm (for Shiro)</a>
-  </li>
-</ul>
+    <span class="nav-text">Restful Objects Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Restful Objects Viewer</span>
+    <a class="nav-link" href="../../../vro/2.0.0-M5/cors/about.html">CORS</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../../../vro/2.0.0-M5/cors/about.html">CORS</a>
+    <span class="nav-text">Wicket Viewer</span>
   </li>
 </ul>
   </li>
   <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Wicket Viewer</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
     <a class="nav-link" href="../../../vw/2.0.0-M5/exceldownload/about.html">Excel Download</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../vw/2.0.0-M5/fullcalendar/about.html">fullcalendar</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="#gmap3:about.adoc">GMap3</a>
   </li>
-  <li class="nav-item" data-depth="2">
+  <li class="nav-item" data-depth="1">
     <a class="nav-link" href="../../../vw/2.0.0-M5/pdfjs/about.html">pdf.js</a>
   </li>
 </ul>
   </li>
 </ul>
-  </li>
-</ul>
   </nav>
 </div>
 <div class="nav-panel-explore" data-panel="explore">
@@ -353,9 +326,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -428,7 +404,6 @@ page.parent doesn't seem to be set...
 <nav class="breadcrumbs" aria-label="breadcrumbs">
   <ul>
     <li><a href="../about.html">Extensions Catalog</a></li>
-    <li>Core</li>
     <li><a href="about.html">Model Annotation</a></li>
   </ul>
 </nav>
diff --git a/content/incubator/2.0.0-M5/about.html b/content/incubator/2.0.0-M5/about.html
index f1fddb5..7987ef7 100644
--- a/content/incubator/2.0.0-M5/about.html
+++ b/content/incubator/2.0.0-M5/about.html
@@ -299,9 +299,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html b/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html
index 93e7829..e5cb7c5 100644
--- a/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html
+++ b/content/incubator/2.0.0-M5/kroviz/DevelopmentGuide.html
@@ -300,9 +300,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/incubator/2.0.0-M5/kroviz/UsersGuide.html b/content/incubator/2.0.0-M5/kroviz/UsersGuide.html
index bc56d63..fe89900 100644
--- a/content/incubator/2.0.0-M5/kroviz/UsersGuide.html
+++ b/content/incubator/2.0.0-M5/kroviz/UsersGuide.html
@@ -300,9 +300,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/Extinction_Symbol.svg b/content/incubator/2.0.0-M5/kroviz/_images/Extinction_Symbol.svg
index 49d0392..be57115 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/Extinction_Symbol.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/Extinction_Symbol.svg
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg928"
-   version="1.1"
-   viewBox="0 0 264.58333 264.58334"
-   height="1000"
-   width="1000">
-  <defs
-     id="defs922" />
-  <metadata
-     id="metadata925">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-32.41665)"
-     id="layer1">
-    <path
-       id="path381-2-2-4"
-       d="M 132.29135,37.977412 A 126.73073,126.73073 0 0 0 5.5607842,164.7079 126.73073,126.73073 0 0 0 132.29135,291.43918 126.73073,126.73073 0 0 0 259.02266,164.7079 126.73073,126.73073 0 0 0 132.29135,37.977412 Z m 0,18.438882 A 108.29185,108.29185 0 0 1 240.58378,164.7079 108.29185,108.29185 0 0 1 132.29135,273.00037 108.29185,108.29185 0 0 1 23.999744,164.7079 108.29185,108.29185 0 0 1 132.29135,56.416294 Z"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:0.40507537" />
-    <path
-       id="path398-7-8-5"
-       d="M 215.08784,83.800123 49.495694,84.088222 120.1276,164.70867 49.495694,245.32838 215.08784,245.61659 144.41828,164.70867 Z M 89.706681,102.22067 h 84.730799 l -42.36542,48.73177 z m 42.585459,76.3717 42.36542,48.73177 H 89.925942 Z"
-       style="opacity:1;fill:#000000;stroke:none;stroke-width:0.40975291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg928"
+   version="1.1"
+   viewBox="0 0 264.58333 264.58334"
+   height="1000"
+   width="1000">
+  <defs
+     id="defs922" />
+  <metadata
+     id="metadata925">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-32.41665)"
+     id="layer1">
+    <path
+       id="path381-2-2-4"
+       d="M 132.29135,37.977412 A 126.73073,126.73073 0 0 0 5.5607842,164.7079 126.73073,126.73073 0 0 0 132.29135,291.43918 126.73073,126.73073 0 0 0 259.02266,164.7079 126.73073,126.73073 0 0 0 132.29135,37.977412 Z m 0,18.438882 A 108.29185,108.29185 0 0 1 240.58378,164.7079 108.29185,108.29185 0 0 1 132.29135,273.00037 108.29185,108.29185 0 0 1 23.999744,164.7079 108.29185,108.29185 0 0 1 132.29135,56.416294 Z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:0.40507537" />
+    <path
+       id="path398-7-8-5"
+       d="M 215.08784,83.800123 49.495694,84.088222 120.1276,164.70867 49.495694,245.32838 215.08784,245.61659 144.41828,164.70867 Z M 89.706681,102.22067 h 84.730799 l -42.36542,48.73177 z m 42.585459,76.3717 42.36542,48.73177 H 89.925942 Z"
+       style="opacity:1;fill:#000000;stroke:none;stroke-width:0.40975291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/content/incubator/2.0.0-M5/kroviz/_images/kroviz-logo.svg b/content/incubator/2.0.0-M5/kroviz/_images/kroviz-logo.svg
index 626fd93..0419547 100644
--- a/content/incubator/2.0.0-M5/kroviz/_images/kroviz-logo.svg
+++ b/content/incubator/2.0.0-M5/kroviz/_images/kroviz-logo.svg
@@ -1,56 +1,56 @@
-<svg width="291px" height="128px" viewBox="0 0 1200 512"
-     xmlns="http://www.w3.org/2000/svg">
-    <g id="crow"
-       display="none"
-       visibility="hidden">
-        <path id="body"
-              stroke-width="1"
-              d="M 139.82,5.748
-              C 127.22,5.7199 112.83,9.1168 96.113,16.965
-              l 0.07813,-1.8711
-              c -45.171,3.989 -61.07,7.763 -90.838,22.084 41.832,10.162 66.726,22.386 88.551,32.549
-              l 0.07227,-1.75
-              c 35.55,38.606 -2.2443,166.67 82.191,236.4 51.706,38.794 45.576,17.579 87.166,51.01 3.0634,6.0822 8.6609,19.304 -0.95507,43.926 -25.048,23.028 -47.377,34.83 -90.947,41.639 12.927,5.6856 20.934,6.4479 26.104,6.8125 -3.3241,3.7769 -15.633,13.242 -23.223,20.012 15.566,-1.6538 28.491,-9.674 35.766,-13.814 1.5121,5.5341 0.83389,2.7186 3.6426,14.307 6.8013,-8.6794 4.8301,-6.4799 11.215,-13.213 9.18,7.5624 16.699,8.0813 18.58,8.252 -31.552,-23.2 21.811,-40.693 45.072,-61.4
-              l -3.4121,-0.4043 8.0527,-5.8262
-              c 9.1532,21.392 9.8358,37.669 4.3984,43.252
-              l 33.072,3.8594
-              c -1.7899,-36.62 2.3175,-15.224 4.4492,-24.066 6.5926,-18.591 -2.9389,-19.512 -15.068,-43.473 13.782,9.4747 25.555,3.0872 41.336,10.379
-              l -2.1797,-9.0137
-              c 31.718,-1.2698 24.334,-25.928 74.805,-42.453 24.285,-1.9333 54.355,-3.2125 93.984,0 71.42,13.424 201.48,42.374 186.05,32.805
-              v -9.6484
-              c -25.894,-8.9966 -26.043,-12.223 -28.771,-23.156
-              l -164.95,-57.891 21.1,-1.9297
-              c -27.65,-26.3 -95.62,-55.33 -168.8,-82.98 -62.33,-46.98 -101.69,-60.71 -130.43,-88.77 -29.63,-40.892 -51.44,-96.738 -102.41,-96.852 z
-              m 161,434.44
-              c -25.255,23.335 -47.588,35.237 -91.451,42.092 12.927,5.6856 20.934,6.4479 26.104,6.8125 -3.3241,3.7769 -15.633,13.242 -23.223,20.012 15.566,-1.6538 28.491,-9.674 35.766,-13.814 1.5121,5.5341 0.8339,2.7166 3.6426,14.305 6.8013,-8.6795 4.8301,-6.4778 11.215,-13.211 9.18,7.5625 16.699,8.0812 18.58,8.252 -31.552,-23.2 21.811,-40.693 45.072,-61.4
-              l -25.705,-3.0469 z"/>
-        <circle id="eye"
-                cx="130" cy="40" r="12"
-                fill="white"/>
-    </g>
-    <g>
-        <use href="#body" x="0" fill="#C0504D" stroke="#C0504D" fill-opacity="0.8" stroke-opacity="0.8"/>
-        <use href="#eye" x="0"/>
-    </g>
-    <g>
-        <use href="#body" x="110" fill="#F79646" stroke="#F79646" fill-opacity="0.8" stroke-opacity="0.8"/>
-        <use href="#eye" x="110"/>
-    </g>
-    <g>
-        <use href="#body" x="220" fill="#9BBB59" stroke="#9BBB59" fill-opacity="0.8" stroke-opacity="0.8"/>
-        <use href="#eye" x="220"/>
-    </g>
-    <g>
-        <use href="#body" x="330" fill="#4BACC6" stroke="#4BACC6" fill-opacity="0.8" stroke-opacity="0.8"/>
-        <use href="#eye" x="330"/>
-    </g>
-    <g>
-        <use href="#body" x="440" fill="#4F81BD" stroke="#4F81BD" fill-opacity="0.8" stroke-opacity="0.8"/>
-        <use href="#eye" x="440"/>
-    </g>
-    <g>
-        <use href="#body" x="550" fill="#8064A2" stroke="#8064A2" fill-opacity="0.8" stroke-opacity="0.8"/>
-        <use href="#eye" x="550"/>
-    </g>
-    <!--rect height="512" width="1162" style="stroke-width:10;stroke:rgb(255,0,0);fill:none;"/-->
-</svg>
+<svg width="291px" height="128px" viewBox="0 0 1200 512"
+     xmlns="http://www.w3.org/2000/svg">
+    <g id="crow"
+       display="none"
+       visibility="hidden">
+        <path id="body"
+              stroke-width="1"
+              d="M 139.82,5.748
+              C 127.22,5.7199 112.83,9.1168 96.113,16.965
+              l 0.07813,-1.8711
+              c -45.171,3.989 -61.07,7.763 -90.838,22.084 41.832,10.162 66.726,22.386 88.551,32.549
+              l 0.07227,-1.75
+              c 35.55,38.606 -2.2443,166.67 82.191,236.4 51.706,38.794 45.576,17.579 87.166,51.01 3.0634,6.0822 8.6609,19.304 -0.95507,43.926 -25.048,23.028 -47.377,34.83 -90.947,41.639 12.927,5.6856 20.934,6.4479 26.104,6.8125 -3.3241,3.7769 -15.633,13.242 -23.223,20.012 15.566,-1.6538 28.491,-9.674 35.766,-13.814 1.5121,5.5341 0.83389,2.7186 3.6426,14.307 6.8013,-8.6794 4.8301,-6.4799 11.215,-13.213 9.18,7.5624 16.699,8.0813 18.58,8.252 -31.552,-23.2 21.811,-40.693 45.072,-61.4
+              l -3.4121,-0.4043 8.0527,-5.8262
+              c 9.1532,21.392 9.8358,37.669 4.3984,43.252
+              l 33.072,3.8594
+              c -1.7899,-36.62 2.3175,-15.224 4.4492,-24.066 6.5926,-18.591 -2.9389,-19.512 -15.068,-43.473 13.782,9.4747 25.555,3.0872 41.336,10.379
+              l -2.1797,-9.0137
+              c 31.718,-1.2698 24.334,-25.928 74.805,-42.453 24.285,-1.9333 54.355,-3.2125 93.984,0 71.42,13.424 201.48,42.374 186.05,32.805
+              v -9.6484
+              c -25.894,-8.9966 -26.043,-12.223 -28.771,-23.156
+              l -164.95,-57.891 21.1,-1.9297
+              c -27.65,-26.3 -95.62,-55.33 -168.8,-82.98 -62.33,-46.98 -101.69,-60.71 -130.43,-88.77 -29.63,-40.892 -51.44,-96.738 -102.41,-96.852 z
+              m 161,434.44
+              c -25.255,23.335 -47.588,35.237 -91.451,42.092 12.927,5.6856 20.934,6.4479 26.104,6.8125 -3.3241,3.7769 -15.633,13.242 -23.223,20.012 15.566,-1.6538 28.491,-9.674 35.766,-13.814 1.5121,5.5341 0.8339,2.7166 3.6426,14.305 6.8013,-8.6795 4.8301,-6.4778 11.215,-13.211 9.18,7.5625 16.699,8.0812 18.58,8.252 -31.552,-23.2 21.811,-40.693 45.072,-61.4
+              l -25.705,-3.0469 z"/>
+        <circle id="eye"
+                cx="130" cy="40" r="12"
+                fill="white"/>
+    </g>
+    <g>
+        <use href="#body" x="0" fill="#C0504D" stroke="#C0504D" fill-opacity="0.8" stroke-opacity="0.8"/>
+        <use href="#eye" x="0"/>
+    </g>
+    <g>
+        <use href="#body" x="110" fill="#F79646" stroke="#F79646" fill-opacity="0.8" stroke-opacity="0.8"/>
+        <use href="#eye" x="110"/>
+    </g>
+    <g>
+        <use href="#body" x="220" fill="#9BBB59" stroke="#9BBB59" fill-opacity="0.8" stroke-opacity="0.8"/>
+        <use href="#eye" x="220"/>
+    </g>
+    <g>
+        <use href="#body" x="330" fill="#4BACC6" stroke="#4BACC6" fill-opacity="0.8" stroke-opacity="0.8"/>
+        <use href="#eye" x="330"/>
+    </g>
+    <g>
+        <use href="#body" x="440" fill="#4F81BD" stroke="#4F81BD" fill-opacity="0.8" stroke-opacity="0.8"/>
+        <use href="#eye" x="440"/>
+    </g>
+    <g>
+        <use href="#body" x="550" fill="#8064A2" stroke="#8064A2" fill-opacity="0.8" stroke-opacity="0.8"/>
+        <use href="#eye" x="550"/>
+    </g>
+    <!--rect height="512" width="1162" style="stroke-width:10;stroke:rgb(255,0,0);fill:none;"/-->
+</svg>
diff --git a/content/incubator/2.0.0-M5/kroviz/about.html b/content/incubator/2.0.0-M5/kroviz/about.html
index 1c6d846..286b91f 100644
--- a/content/incubator/2.0.0-M5/kroviz/about.html
+++ b/content/incubator/2.0.0-M5/kroviz/about.html
@@ -300,9 +300,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/incubator/2.0.0-M5/kroviz/credits.html b/content/incubator/2.0.0-M5/kroviz/credits.html
index 3603f4c..e891779 100644
--- a/content/incubator/2.0.0-M5/kroviz/credits.html
+++ b/content/incubator/2.0.0-M5/kroviz/credits.html
@@ -298,9 +298,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/incubator/2.0.0-M5/kroviz/regression-test.html b/content/incubator/2.0.0-M5/kroviz/regression-test.html
index 7a2c86b..7acee44 100644
--- a/content/incubator/2.0.0-M5/kroviz/regression-test.html
+++ b/content/incubator/2.0.0-M5/kroviz/regression-test.html
@@ -300,9 +300,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/incubator/2.0.0-M5/microprofile/about.html b/content/incubator/2.0.0-M5/microprofile/about.html
index 6e36959..23b16df 100644
--- a/content/incubator/2.0.0-M5/microprofile/about.html
+++ b/content/incubator/2.0.0-M5/microprofile/about.html
@@ -300,9 +300,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/incubator/2.0.0-M5/vaadin/about.html b/content/incubator/2.0.0-M5/vaadin/about.html
index b85ea7e..eb545d2 100644
--- a/content/incubator/2.0.0-M5/vaadin/about.html
+++ b/content/incubator/2.0.0-M5/vaadin/about.html
@@ -299,9 +299,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/index.html b/content/index.html
index cacb419..08094f9 100644
--- a/content/index.html
+++ b/content/index.html
@@ -51,7 +51,7 @@
     </div>
     <div class="social-links float-right">
       <a href="https://lists.apache.org/list.html?users@isis.apache.org" class="email"><i class="fa fa-at"></i></a>
-      <a href="docs/2.0.0-M5/support/slack-channel.html" class="slack"><i class="fa fa-slack"></i></a>
+      <a href="docs/latest/support/slack-channel.html" class="slack"><i class="fa fa-slack"></i></a>
       <a href="https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87" class="bug"><i class="fa fa-bug"></i></a>
       <a href="https://stackoverflow.com/questions/tagged/isis" class="stackoverflow"><i class="fa fa-stack-overflow"></i></a>
       <a href="https://twitter.com/ApacheIsis" class="twitter"><i class="fa fa-twitter"></i></a>
@@ -98,15 +98,15 @@
         </li>
         <li><a href="#call-to-action">Quick Start</a></li>
         <li class="menu-has-children">
-          <a href="docs/2.0.0-M5/about.html">Docs</a>
+          <a href="docs/latest/about.html">Docs</a>
           <ul>
-            <li><a href="docs/2.0.0-M5/about.html">Table of Contents</a></li>
+            <li><a href="docs/latest/about.html">Table of Contents</a></li>
             <li><hr/></li>
-            <li><a href="docs/2.0.0-M5/starters/about.html">Starter Apps</a></li>
-            <li><a href="docs/2.0.0-M5/landing-page/guides.html">Guides</a></li>
-            <li><a href="docs/2.0.0-M5/landing-page/libraries.html">Libraries</a></li>
-            <li><a href="docs/2.0.0-M5/landing-page/components.html">Components</a></li>
-            <li><a href="docs/2.0.0-M5/landing-page/releases.html">Releases</a></li>
+            <li><a href="docs/latest/starters/about.html">Starter Apps</a></li>
+            <li><a href="docs/latest/landing-page/guides.html">Guides</a></li>
+            <li><a href="docs/latest/landing-page/libraries.html">Libraries</a></li>
+            <li><a href="docs/latest/landing-page/components.html">Components</a></li>
+            <li><a href="docs/latest/landing-page/releases.html">Releases</a></li>
           </ul>
         </li>
         <li><a href="#contact">Support</a></li>
@@ -612,13 +612,13 @@ Examples
           <div class="row">
             <div class="col-lg-6 text-left text-lg-left">
               <p class="cta-text text-center" style="margin-block-end: 0; ">
-                Learn about Apache Isis™ by running the minimal <a href="docs/2.0.0-M5/starters/helloworld.html">helloworld</a> starter&nbsp;app.
+                Learn about Apache Isis™ by running the minimal <a href="docs/latest/starters/helloworld.html">helloworld</a> starter&nbsp;app.
                 You can see the app running <a href="https://helloworld.jdo.isis.incode.work/" target="_blank">here (jdo)</a> and <a href="https://helloworld.jpa.isis.incode.work/" target="_blank">here (jpa)</a>.
               </p>
             </div>
             <div class="col-lg-6 text-left text-lg-left">
               <p class="cta-text text-center" style="margin-block-end: 0; ">
-                Develop your own Apache Isis™ app with the structured <a href="docs/2.0.0-M5/starters/simpleapp.html">simpleapp</a> starter&nbsp;app.
+                Develop your own Apache Isis™ app with the structured <a href="docs/latest/starters/simpleapp.html">simpleapp</a> starter&nbsp;app.
                 You can see the app running <a href="https://simpleapp.jdo.isis.incode.work/" target="_blank">here (jdo)</a> and <a href="https://simpleapp.jpa.isis.incode.work/" target="_blank">here (jpa)</a>.
               </p>
             </div>
@@ -767,7 +767,7 @@ mvn -pl webapp jetty:run</pre>
           <div class="contact-email">
             <i class="ion-ios-filing-outline"></i>
             <h3>Slack</h3>
-            <p><a href="docs/2.0.0-M5/support/slack-channel.html">Join #apache-isis <br/>(on the ASF slack workspace)</a></p>
+            <p><a href="docs/latest/support/slack-channel.html">Join #apache-isis <br/>(on the ASF slack workspace)</a></p>
           </div>
         </div>
 
diff --git a/content/legacy/2.0.0-M5/about.html b/content/legacy/2.0.0-M5/about.html
index 25c9a75..4ff4af2 100644
--- a/content/legacy/2.0.0-M5/about.html
+++ b/content/legacy/2.0.0-M5/about.html
@@ -289,9 +289,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/legacy/2.0.0-M5/applib/about.html b/content/legacy/2.0.0-M5/applib/about.html
index 06a4101..fe42117 100644
--- a/content/legacy/2.0.0-M5/applib/about.html
+++ b/content/legacy/2.0.0-M5/applib/about.html
@@ -290,9 +290,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/legacy/2.0.0-M5/commons/about.html b/content/legacy/2.0.0-M5/commons/about.html
index 4d27fcd..5290d4d 100644
--- a/content/legacy/2.0.0-M5/commons/about.html
+++ b/content/legacy/2.0.0-M5/commons/about.html
@@ -290,9 +290,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/legacy/2.0.0-M5/metamodel/about.html b/content/legacy/2.0.0-M5/metamodel/about.html
index 62e2fd4..46657a3 100644
--- a/content/legacy/2.0.0-M5/metamodel/about.html
+++ b/content/legacy/2.0.0-M5/metamodel/about.html
@@ -288,9 +288,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/legacy/2.0.0-M5/restclient/about.html b/content/legacy/2.0.0-M5/restclient/about.html
index 97a98ea..0a1362d 100644
--- a/content/legacy/2.0.0-M5/restclient/about.html
+++ b/content/legacy/2.0.0-M5/restclient/about.html
@@ -290,9 +290,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/legacy/2.0.0-M5/runtime/about.html b/content/legacy/2.0.0-M5/runtime/about.html
index 4012dad..c849688 100644
--- a/content/legacy/2.0.0-M5/runtime/about.html
+++ b/content/legacy/2.0.0-M5/runtime/about.html
@@ -290,9 +290,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/legacy/2.0.0-M5/servletapi/about.html b/content/legacy/2.0.0-M5/servletapi/about.html
index a356d28..c25e600 100644
--- a/content/legacy/2.0.0-M5/servletapi/about.html
+++ b/content/legacy/2.0.0-M5/servletapi/about.html
@@ -288,9 +288,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/mappings/2.0.0-M5/about.html b/content/mappings/2.0.0-M5/about.html
index 59cf41c..9fe9450 100644
--- a/content/mappings/2.0.0-M5/about.html
+++ b/content/mappings/2.0.0-M5/about.html
@@ -284,9 +284,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/mappings/2.0.0-M5/jaxrsclient/about.html b/content/mappings/2.0.0-M5/jaxrsclient/about.html
index 112a6fc..e101fbf 100644
--- a/content/mappings/2.0.0-M5/jaxrsclient/about.html
+++ b/content/mappings/2.0.0-M5/jaxrsclient/about.html
@@ -285,9 +285,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/mappings/2.0.0-M5/minio/about.html b/content/mappings/2.0.0-M5/minio/about.html
index 14db10b..a81b1e2 100644
--- a/content/mappings/2.0.0-M5/minio/about.html
+++ b/content/mappings/2.0.0-M5/minio/about.html
@@ -283,9 +283,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/mappings/2.0.0-M5/outbox-publisher/about.html b/content/mappings/2.0.0-M5/outbox-publisher/about.html
index 8232f2f..7a5ad83 100644
--- a/content/mappings/2.0.0-M5/outbox-publisher/about.html
+++ b/content/mappings/2.0.0-M5/outbox-publisher/about.html
@@ -283,9 +283,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/mappings/2.0.0-M5/restclient/about.html b/content/mappings/2.0.0-M5/restclient/about.html
index 07a9338..89ba3ef 100644
--- a/content/mappings/2.0.0-M5/restclient/about.html
+++ b/content/mappings/2.0.0-M5/restclient/about.html
@@ -284,9 +284,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/mappings/2.0.0-M5/slack/about.html b/content/mappings/2.0.0-M5/slack/about.html
index da59e2f..8d3dfd1 100644
--- a/content/mappings/2.0.0-M5/slack/about.html
+++ b/content/mappings/2.0.0-M5/slack/about.html
@@ -283,9 +283,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
diff --git a/content/pjdo/2.0.0-M5/about.html b/content/pjdo/2.0.0-M5/about.html
index 99eed67..4dfed0b 100644
--- a/content/pjdo/2.0.0-M5/about.html
+++ b/content/pjdo/2.0.0-M5/about.html
@@ -11,7 +11,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
 <link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  <link rel="next" href="configuring.html" title="Configuring">
+  <link rel="next" href="setup-and-configuration.html" title="Setup and Configuration">
   </head>
   <body class="article">
 <header class="header">
@@ -146,7 +146,7 @@
 <div class="nav-panel-pagination">
   <a class="page-previous disabled" rel="prev" href="" title=""><span></span></a>
   <a class="page-next" rel="next"
-     href="configuring.html" title="Configuring"><span></span></a>
+     href="setup-and-configuration.html" title="Setup and Configuration"><span></span></a>
 <!--
 page.parent doesn't seem to be set...
   <a class="page-parent disabled" rel="prev" href="" title=""><span></span></a>
@@ -159,26 +159,38 @@ page.parent doesn't seem to be set...
   <li class="nav-item" data-depth="0">
 <ul class="nav-list">
   <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="configuring.html">Configuring</a>
+    <button class="nav-item-toggle"></button>
+    <a class="nav-link" href="setup-and-configuration.html">Setup and Configuration</a>
+<ul class="nav-list">
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="configuring/disabling-persistence-by-reachability.html">Disabling Persistence by Reachability</a>
   </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="jdo-mappings.html">JDO Mappings</a>
+</ul>
   </li>
   <li class="nav-item" data-depth="1">
     <a class="nav-link" href="db-schemas.html">DB Schemas</a>
   </li>
   <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="hints-and-tips.html">Hints-n-Tips</a>
-  </li>
-  <li class="nav-item" data-depth="1">
     <button class="nav-item-toggle"></button>
-    <span class="nav-text">Domain Services</span>
+    <a class="nav-link" href="mapping-guide.html">Mapping Guide</a>
 <ul class="nav-list">
   <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="services/IsisJdoSupport.html">IsisJdoSupport</a>
+    <a class="nav-link" href="mapping-guide/one-to-m-bidirectional-relationships.html">1-m Bidirectional relationships</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="mapping-guide/mandatory-properties-in-subtypes.html">Mandatory Properties in Subtypes</a>
+  </li>
+  <li class="nav-item" data-depth="2">
+    <a class="nav-link" href="mapping-guide/mapping-to-a-view.html">Mapping to a View</a>
   </li>
 </ul>
   </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="dependency-injection.html">Dependency Injection</a>
+  </li>
+  <li class="nav-item" data-depth="1">
+    <a class="nav-link" href="hints-and-tips.html">Hints-n-Tips</a>
+  </li>
 </ul>
   </li>
 </ul>
@@ -295,9 +307,12 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
-      <span class="title">Security Guide</span>
+      <span class="title">security</span>
       <ul class="versions">
         <li class="version is-latest">
+          <a href="../../security/latest/index.html">latest</a>
+        </li>
+        <li class="version">
           <a href="../../security/2.0.0-M5/about.html">2.0.0-M5</a>
         </li>
       </ul>
@@ -377,24 +392,13 @@ page.parent doesn't seem to be set...
 <article class="doc">
     <a name="section-top"></a>
 <h1 class="page">JDO/DataNucleus</h1>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-warning" title="Warning"></i>
-</td>
-<td class="content">
-TODO: this content has not yet been reviewed/updated for v2.0
-</td>
-</tr>
-</table>
-</div>
 <div class="paragraph">
 <p>The JDO/DataNucleus object store enables domain objects to be persisted to relational as well as NoSQL databases.
-The object store is implemented using <a href="http://datanucleus.org">DataNucleus</a>.</p>
+The object store is implemented using <a href="http://datanucleus.org">DataNucleus</a> ORM using the <a href="https://www.jcp.org/en/jsr/detail?id=243">JDO</a> API.
+DataNucleus is the reference implementation for JDO.</p>
 </div>
 <div class="paragraph">
-<p>This user guide discuss end-user features, configuration and customization of the JDO/DataNucleus object store.</p>
+<p>This component guide discuss how to setup the framework to use the JDO/DataNucleus object store, how to configure the ORM, and also provides some examples on common use cases.</p>
 </div>
 </article>
 <aside class="article-aside toc hide-for-print" role="navigation">
diff --git a/content/pjdo/2.0.0-M5/configuring/bulk-load.html b/content/pjdo/2.0.0-M5/configuring/bulk-load.html
deleted file mode 100644
index 2bb9102..0000000
--- a/content/pjdo/2.0.0-M5/configuring/bulk-load.html
+++ /dev/null
@@ -1,497 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Bulk Load of Standalone Collections :: Apache Isis</title>
-    <link rel="canonical" href="https://isis.apache.org/pjdo/2.0.0-M5/configuring/bulk-load.html">
-    <meta name="generator" content="Antora 2.3.4">
-    <link rel="stylesheet" href="../../../_/css/site.css">
-    <link rel="stylesheet" href="../../../_/css/site-custom.css">
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,700,700i|Raleway:300,400,500,700,800|Montserrat:300,400,700" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css"/>
-<link rel="home" href="https://isis.apache.org" title="Apache Isis">
-  </head>
-  <body class="article">
-<header class="header">
-  <nav class="navbar">
-    <div class="navbar-brand">
-      <a class="navbar-item" href="https://isis.apache.org">
-          <span class="icon">
-            <img src="../../../_/img/isis-logo-48x48.png"></img>
-          </span>
-        <span>Apache Isis</span>
-      </a>
-      <button class="navbar-burger" data-target="topbar-nav">
-        <span></span>
-        <span></span>
-        <span></span>
-      </button>
-    </div>
-    <div id="topbar-nav" class="navbar-menu">
-      <a class="navbar-end">
-        <div class="navbar-item hide-for-print">
-          <span>
-            <input id="algolia-search-input" placeholder="Search"></span>
-          </span>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Quick Start</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">Starter Apps</span>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/starters/simpleapp.html">Simple App</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Demos &amp; Tutorials</span>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/demo/about.html">Demo App</a>
-            <a class="navbar-item" href="https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html">Petclinic (tutorial)</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Resources</span>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/resources/icons.html">Icons</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Guides</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">Development</span>
-            <a class="navbar-item" href="../../../setupguide/2.0.0-M5/about.html">Setup Guide</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Core</span>
-            <a class="navbar-item" href="../../../userguide/2.0.0-M5/about.html">User Guide</a>
-            <a class="navbar-item" href="../../../refguide/2.0.0-M5/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../../testing/2.0.0-M5/about.html">Testing Guide</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Libraries</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">For Use in Apps</span>
-            <a class="navbar-item" href="../../../subdomains/2.0.0-M5/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-M5/about.html">Value Types</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../../mappings/2.0.0-M5/about.html">Bounded Context Mapping Libraries</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Other</span>
-            <a class="navbar-item" href="../../../incubator/2.0.0-M5/about.html">Incubator</a>
-            <a class="navbar-item" href="../../../legacy/2.0.0-M5/about.html">Legacy</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Components</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">Viewers</span>
-            <a class="navbar-item" href="../../../vw/2.0.0-M5/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../../vro/2.0.0-M5/about.html">REST API (Restful Objects)</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../../security/2.0.0-M5/about.html">Security Guide</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../../pjpa/2.0.0-M5/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../../pjdo/2.0.0-M5/about.html">JDO (DataNucleus)</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Extensions</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-M5/about.html">Extensions Catalog</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">Support</a>
-          <div class="navbar-dropdown">
-            <span class="navbar-item navbar-heading">Contact</span>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/support/mailing-list.html">Mailing Lists</a>
-            <a class="navbar-item" href="https://issues.apache.org/jira/browse/ISIS">JIRA</a>
-            <a class="navbar-item" href="https://stackoverflow.com/questions/tagged/isis">Stack Overflow</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Releases</span>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../../relnotes/2.0.0-M5/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M5/archive/1-x.html">Archive (1.x)</a>
-            <hr class="navbar-divider"/>
-            <span class="navbar-item navbar-heading">Framework</span>
-            <a class="navbar-item" href="../../../conguide/2.0.0-M5/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../../comguide/2.0.0-M5/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../../core/2.0.0-M5/about.html">Core Design</a>
-          </div>
-        </div>
-        <div class="navbar-item has-dropdown is-hoverable">
-          <a class="navbar-link" href="#">ASF</a>
-          <div class="navbar-dropdown">
-            <a class="navbar-item" href="http://www.apache.org/">Apache Homepage</a>
-            <a class="navbar-item" href="https://www.apache.org/events/current-event">Events</a>
-            <a class="navbar-item" href="https://www.apache.org/licenses/">Licenses</a>
-            <a class="navbar-item" href="https://www.apache.org/security/">Security</a>
-            <a class="navbar-item" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
-            <a class="navbar-item" href="https://www.apache.org/foundation/thanks.html">Thanks</a>
-            <hr class="navbar-divider"/>
-            <a class="navbar-item" href="https://whimsy.apache.org/board/minutes/Isis.html">PMC board minutes</a>
-          </div>
-        </div>
-        <a class="navbar-item" href="../../../docs/2.0.0-M5/about.html">
-          <span class="icon">
-            <img src="../../../_/img/home.png"></img>
-          </span>
-        </a>
-      </div>
-    </div>
-  </nav>
-</header>
-<div class="body ">
-<div class="nav-container" data-component="pjdo" data-version="2.0.0-M5">
-  <aside class="nav">
-    <div class="panels">
-<div class="nav-panel-pagination">
-  <a class="page-previous disabled" rel="prev" href="" title=""><span></span></a>
-  <a class="page-next disabled" rel="next"
-     href="" title=""><span></span></a>
-<!--
-page.parent doesn't seem to be set...
-  <a class="page-parent disabled" rel="prev" href="" title=""><span></span></a>
--->
-</div>
-<div class="nav-panel-menu is-active" data-panel="menu">
-  <nav class="nav-menu">
-    <h3 class="title"><a href="../about.html">JDO/DataNucleus</a></h3>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="0">
-<ul class="nav-list">
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../configuring.html">Configuring</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../jdo-mappings.html">JDO Mappings</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../db-schemas.html">DB Schemas</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <a class="nav-link" href="../hints-and-tips.html">Hints-n-Tips</a>
-  </li>
-  <li class="nav-item" data-depth="1">
-    <button class="nav-item-toggle"></button>
-    <span class="nav-text">Domain Services</span>
-<ul class="nav-list">
-  <li class="nav-item" data-depth="2">
-    <a class="nav-link" href="../services/IsisJdoSupport.html">IsisJdoSupport</a>
-  </li>
-</ul>
-  </li>
-</ul>
-  </li>
-</ul>
-  </nav>
-</div>
-<div class="nav-panel-explore" data-panel="explore">
-  <div class="context">
-    <span class="title">JDO/DataNucleus</span>
-    <span class="version">2.0.0-M5</span>
-  </div>
-  <ul class="components">
-    <li class="component">
-      <span class="title"> </span>
-      <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../docs/2.0.0-M5/about.html">2.0.0-M5</a>
-        </li>
-      </ul>
-    </li>
-    <li class="component">
-      <span class="title">BC Mappings Catalog</span>
-      <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../mappings/2.0.0-M5/about.html">2.0.0-M5</a>
-        </li>
-      </ul>
-    </li>
-    <li class="component">
-      <span class="title">Committers' Guide</span>
-      <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../comguide/2.0.0-M5/about.html">2.0.0-M5</a>
-        </li>
-      </ul>
-    </li>
-    <li class="component">
-      <span class="title">Contributors' Guide</span>
-      <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../conguide/2.0.0-M5/about.html">2.0.0-M5</a>
-        </li>
-      </ul>
-    </li>
-    <li class="component">
-      <span class="title">Design Docs</span>
-      <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../core/2.0.0-M5/about.html">2.0.0-M5</a>
-        </li>
-      </ul>
-    </li>
-    <li class="component">
-      <span class="title">Extensions Catalog</span>
-      <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../extensions/2.0.0-M5/about.html">2.0.0-M5</a>
-        </li>
-      </ul>
-    </li>
-    <li class="component">
-      <span class="title">Incubator Catalog</span>
-      <ul class="versions">
-        <li class="version is-latest">
-          <a href="../../../incubator/2.0.0-M5/about.html">2.0.0-M5</a>
-        </li>
-      </ul>
-    </li>
-    <li class="component is-current">
-      <span class="title">JDO/DataNucleus</span>
-      <ul class="versions">
-        <li class="version is-current is-latest">
-          <a href="../about.html">2.0.0-M5</a>
-        </li>
-      </ul>
... 58001 lines suppressed ...