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 2022/02/13 13:43:38 UTC

[isis-site] 01/02: ISIS-2859 : staging changes to website

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

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

commit 098baa383ac0622473e73da78f4ee4c4a73e6548
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 13 13:38:28 2022 +0000

    ISIS-2859 : staging changes to website
---
 content/404.html                                   |   10 +-
 content/_/img/home/favicon.png                     |  Bin 1597 -> 1741 bytes
 content/comguide/latest/about.html                 |   66 +-
 content/comguide/latest/algolia-search.html        |   66 +-
 .../comguide/latest/antora-publish-procedure.html  |   66 +-
 content/comguide/latest/applying-patches.html      |   66 +-
 content/comguide/latest/cutting-a-release.html     |  324 +-
 content/comguide/latest/key-generation.html        |   66 +-
 .../comguide/latest/merging-a-pull-request.html    |   66 +-
 content/comguide/latest/pmc-notes.html             |   66 +-
 content/comguide/latest/policies.html              |   66 +-
 content/comguide/latest/policies/git-policy.html   |   66 +-
 .../latest/policies/versioning-policy.html         |   66 +-
 .../comguide/latest/post-release-successful.html   |  120 +-
 .../comguide/latest/post-release-unsuccessful.html |   80 +-
 .../comguide/latest/release-process-prereqs.html   |   66 +-
 content/comguide/latest/starter-apps.html          |   66 +-
 content/comguide/latest/updating-the-website.html  |  103 +-
 content/comguide/latest/verifying-releases.html    |   68 +-
 content/conguide/latest/about.html                 |   66 +-
 content/conguide/latest/agilej/about.html          |   66 +-
 content/conguide/latest/building-apache-isis.html  |  111 +-
 content/conguide/latest/contributing.html          |   66 +-
 ...ag-6583b9501f99503130bf355e5911a608e0345f19.svg | 1420 -------
 ...ag-754aa464614732e6d3716ee22fa558d5867965d3.svg |    4 +-
 ...ag-eb272571d12d000c815df853605c5e9285cfb779.svg | 4252 ++++++++++++++++++++
 content/conguide/latest/documentation/about.html   |   66 +-
 .../latest/documentation/asciidoc-syntax.html      |   72 +-
 .../documentation/building-docs-and-website.html   |  116 +-
 content/conguide/latest/documentation/tooling.html |   66 +-
 content/conguide/latest/eclipse/about.html         |   66 +-
 content/conguide/latest/git/about.html             |   66 +-
 content/conguide/latest/intellij/about.html        |   66 +-
 ...ag-01ccbbe656bce7788fa0dc69df5a77ddcd7c6a3c.svg |   34 -
 ...ag-07cbbf66c489b6e2f6a95fa7c6b5447ea5bd8c6d.svg |   61 -
 ...ag-0eaf04267d83aeed886d81cf48fd55858822f283.svg |   61 +
 ...ag-116aaa4184fc00ad2cd49d093b8b6bfd2349f970.svg |   95 +
 ...ag-145f8dc1c184b3894ecfe4fdc80de82751c470c5.svg |   43 +
 ...ag-14772700eda20fa11b253c46866367e33f4a263b.svg |   70 -
 ...ag-1c51d8bc052cc37eab98b19f4aeeeff5bd49f59a.svg |   34 +
 ...ag-1c674cd6b06afbd3fab7acd6b1abb9aba0becc80.svg |   43 +
 ...ag-1e52d9d7b94d11ce8f6eaa7b9e99515609fa98e2.svg |   34 +
 ...ag-1fb81c474ef4fd30e6606f0115c16866645898c9.svg |  104 +
 ...ag-26c3b66c7f250937086074ddc51c9be6230a82d5.svg |   34 -
 ...ag-29a50fd5695611ad291b1776079929ab0a3db820.svg |   61 +
 ...ag-29d1c8b85567006f086c9eb23b0b65f3f836c88a.svg |   97 +
 ...ag-31c4c9e76fcc71835ff8ceb97bcc15b140283911.svg |  196 -
 ...ag-357b6a0df4a9a312e8d40b1391381e5c2c5e5796.svg |  104 -
 ...ag-3bbe5ab738857a04bb6395a2c91416cd9bb02e15.svg |   70 -
 ...ag-412761b61755a662695ad967fe8bff44034633b1.svg |  124 -
 ...ag-41b22186973cf3f40c8b4564fbc9dd3ecf4f19f6.svg |   34 +
 ...ag-447eb0953da30c8147319256f70ac492db4262f8.svg |  151 +
 ...ag-44b09fdff34c7c96918f5ccb522d5fb75c9be2dc.svg |  196 +
 ...ag-46bc99bd7a38ffa144cd6afdafda68e21be4da61.svg |   52 +
 ...ag-4dc0854a6c2721827f6899d8d4a5c0bc5bbfea2d.svg |   52 -
 ...ag-5021369906a74a9e2b10c5d89c502870cda87ab0.svg |   61 -
 ...ag-532fe4767052fb76c331b06c6dc6a7d124dba78d.svg |   43 -
 ...ag-554316578275dcb4d41aaedd4632770983eb5bb3.svg |   52 +
 ...ag-58a76d8b0735f377ccad57c137c8bd381b1b1ad7.svg |   59 -
 ...ag-5bdb2a60f97d799088f2b91f4cdcb826604b8de7.svg |   34 -
 ...ag-5fa4eb676a245ad26eb8835612ec9af1556edd41.svg |   88 +
 ...ag-6565d29ab4667fbe6ce356386c50d93b7db381ee.svg |   88 -
 ...ag-68200370f7f5ed0f5504b9a21b5671ad21309264.svg |  160 -
 ...ag-743e10c0a07ec0b46b0dc8de1ab5ade5ecec1340.svg |   61 -
 ...ag-75421f3a936864bde9340a33108560bc8280a240.svg |   70 +
 ...ag-7803829942f9e3e9e97bd191b50f53bbaa8578ac.svg |  250 ++
 ...ag-7bfe778995b9a07eda6c2680e9550d6934ca53b0.svg |   97 -
 ...ag-83cdfc63b47241db894cf20f457c4f686c3e4ce6.svg |   34 +
 ...ag-8414526961173c7544fb1cd428be58cb7d649d23.svg |   34 -
 ...ag-849b28ef35bf10381b8f49d082147bf6c8ec5c10.svg |   70 -
 ...ag-8a288fd8eedc679ad2aa62073bd3eadbdf2c8af8.svg |   34 -
 ...ag-8b3681c3e5da13a975a61fb3f6fd51475ef6fcab.svg |  178 +
 ...ag-8ea725a5301358ba1f9dec7b8f6d90996d929549.svg |   34 -
 ...ag-93d3859b8fd4341c0cc55fa6ad17146f27487871.svg |  133 +
 ...ag-94ee19a12d8165e393663e6885c7e374bdda8d3f.svg |   43 -
 ...ag-9aa91da074ee14a0e1a64cbef418bf2289fdf16d.svg |  241 --
 ...ag-9e148ffea0c2df8f37f3cee5115bb5fe748426d8.svg |   97 -
 ...ag-a1eef212f9499278372b4df33828b0639e41657b.svg |   34 -
 ...ag-a21497e378c6efdb6feacdf67551ce14d0c977a3.svg |   43 -
 ...ag-a3951147e465387ad4dd884733d68fe997a9b734.svg |   34 -
 ...ag-a6212c2156353e59054411fb11928912d5a1419d.svg |   97 +
 ...ag-a6ccc65c8a7390b7426b873783155fab823db12d.svg |   61 -
 ...ag-a9ab1d66ee39d0080983bda74717487ac3ab435d.svg |   43 +
 ...ag-aab059026e9b558be848147df595e55a9d222fcd.svg |   70 +
 ...ag-aaef9f8b04e8fd7f3eb000c6e51b4bb98d53b207.svg |   43 -
 ...ag-ab86c665feda9b5613afe8780ab54c05e8310a4f.svg |   88 -
 ...ag-ae3722b501f1043b08171d1b3d4865a53f61ee03.svg |   34 -
 ...ag-b8905a6f3ff363861ab2faf675e4c965527fe2c7.svg |   34 +
 ...ag-badcbdb768e4f05223e21846fd46bfcaaeb5484d.svg |   70 +
 ...ag-bda02cbb40d528ab77126f98429744bd4caa29f4.svg |   43 -
 ...ag-bf7958d2e28349f2e9a62a8aec31701faee79ab5.svg |   43 +
 ...ag-bfe803db56754abd62ba65fd137463d2e8d4e553.svg |   43 +
 ...ag-c005a5f48aaec78ab5e278c20037b11bdb4540a4.svg |   52 -
 ...ag-c0aac5999837e5c1d1ce4e0ef7b197f8dac01598.svg |   61 -
 ...ag-c5cf6d69d5a8bba3e1df554c7c76023c6142ef75.svg |   61 +
 ...ag-c7c7e84e83b7ade060d94ec620379d5f34f73119.svg |   61 +
 ...ag-d55406b3bfff64a32f2431160025a6dcfd213bfa.svg |   34 +
 ...ag-d5ba7572b9c8de4871e08b5df7e9070e690fea01.svg |   79 +
 ...ag-d994b913bfe14ee06a5377f01876f0276aa90380.svg |   34 +
 ...ag-db27f1a82c2bef37626bd5098dba5a107b5dae99.svg |   61 +
 ...ag-db8cd83a7b96fb4a681d6bf2eb5d61a98a2c87cd.svg |  151 -
 ...ag-db9b7b17d329a155448795b62697be464079d947.svg |   97 +
 ...ag-def728b8ef6cb64ec6f5c26752652e3ac2c355a4.svg |   34 +
 ...ag-deff142248f95cbaedc833cdec12233043f07c48.svg |   34 +
 ...ag-e9ecd4aba232eb81bc4f8aadff4c4f1d12a4755c.svg |   79 -
 ...ag-f25f92dfbae167afbb6c42ac2cb10f90554066a1.svg |   34 -
 ...ag-f9646bb3e2d4164e01ff98c2a0a52a6a31223e74.svg |   59 +
 ...ag-fb49f91488424e3d99c79d5e7b6f30c6f35e71a1.svg |   34 -
 ...ag-fc51c94605293ad3a27b7628f59fba24d3ea0796.svg |   34 +
 content/core/latest/_overview/about.html           |  775 +++-
 content/core/latest/about.html                     |   66 +-
 content/core/latest/archdesign/about.html          |   66 +-
 content/core/latest/codegen-bytebuddy/about.html   |   66 +-
 content/core/latest/commons/about.html             |   66 +-
 .../commons/concurrent-task-list-UNUSED.html       |   66 +-
 content/core/latest/interaction/about.html         |   66 +-
 content/core/latest/internaltestsupport/about.html |   66 +-
 ...ag-7970de82f6aafe36a3bb869359f7e05e01e6a375.svg |    4 +-
 content/core/latest/metamodel/about.html           |   66 +-
 content/core/latest/metamodel/class-diagram.html   |   68 +-
 content/core/latest/regressiontests/about.html     |   66 +-
 content/core/latest/runtime/about.html             |   66 +-
 content/core/latest/runtimeservices/about.html     |   66 +-
 content/core/latest/transaction/about.html         |   66 +-
 content/core/latest/webapp/about.html              |   66 +-
 content/core/latest/webapp/webmodules.html         |   66 +-
 content/doap_isis.rdf                              |    8 +
 content/docs/latest/about.html                     |   72 +-
 content/docs/latest/archive/1-x.html               |   68 +-
 content/docs/latest/demo/about.html                |   72 +-
 content/docs/latest/downloads/how-to.html          |   76 +-
 .../going-deeper/articles-and-presentations.html   |   68 +-
 content/docs/latest/going-deeper/books.html        |   68 +-
 content/docs/latest/landing-page/components.html   |   68 +-
 content/docs/latest/landing-page/guides.html       |   68 +-
 content/docs/latest/landing-page/internal.html     |   68 +-
 content/docs/latest/landing-page/libraries.html    |   68 +-
 content/docs/latest/landing-page/releases.html     |   68 +-
 content/docs/latest/mavendeps/about.html           |   68 +-
 content/docs/latest/more-thanks/more-thanks.html   |   68 +-
 content/docs/latest/parent-pom/about.html          |   70 +-
 .../resources/_attachments/IsisCheatSheet.docx     |  Bin 25748 -> 0 bytes
 .../resources/_attachments/IsisCheatSheet.odt      |  Bin 0 -> 40083 bytes
 .../resources/_attachments/IsisCheatSheet.pdf      |  Bin 194943 -> 121229 bytes
 .../latest/resources/_images/IsisCheatSheet.png    |  Bin 384831 -> 712251 bytes
 content/docs/latest/resources/about.html           |   68 +-
 content/docs/latest/resources/cheatsheet.html      |   78 +-
 content/docs/latest/resources/icons.html           |   68 +-
 ...ag-5936d1561be55d4f98b2c97cf62e09251ce1dabf.svg |    4 +-
 ...ag-8ab7baff76ffc186da54f47082e4791d011a387e.svg |    4 +-
 content/docs/latest/starters/about.html            |   68 +-
 .../latest/starters/helloworld-script-jdo.html     |   68 +-
 .../latest/starters/helloworld-script-jpa.html     |   68 +-
 content/docs/latest/starters/helloworld.html       |   72 +-
 .../docs/latest/starters/simpleapp-script-jdo.html |   68 +-
 .../docs/latest/starters/simpleapp-script-jpa.html |   68 +-
 content/docs/latest/starters/simpleapp.html        |   89 +-
 content/docs/latest/support/about.html             |   68 +-
 content/docs/latest/support/mailing-list.html      |   68 +-
 content/docs/latest/support/slack-channel.html     |   68 +-
 .../what-is-apache-isis/common-use-cases.html      |   68 +-
 .../what-is-apache-isis/isis-in-pictures.html      |   68 +-
 .../what-is-apache-isis/screencasts-older.html     |   68 +-
 .../latest/what-is-apache-isis/screencasts.html    |   68 +-
 .../what-is-apache-isis/screencasts/playlists.html |   68 +-
 content/extensions/latest/about.html               |   66 +-
 content/incubator/latest/about.html                |   66 +-
 .../incubator/latest/kroviz/DevelopmentGuide.html  |  112 +-
 content/incubator/latest/kroviz/UsersGuide.html    |   72 +-
 ...ag-053c2134a0cff194a273e2e9a62a728c693f2757.svg |    4 +-
 ...ag-1c53604bbc852e90e9e3e12ab9b2e69989d8e5dc.svg |   81 +
 ...ag-21002c3b24ff3586c7f6c1c97b8a50e9527e7d0c.svg |    4 +-
 ...ag-328cea0587916b9d66e4f95fc3432200f8204eff.svg |   98 -
 ...ag-5bf6bf68821ab63f5dab24a8c1501b9c142f855d.svg |  125 +
 ...ag-67c1337ba6694d85f5e2efc4c190ef4153f7ecb7.svg |  102 +
 ...ag-7376da00ced52b367868d37e0ad4a4fb2558c43c.svg |  179 -
 ...ag-73fd787032f3e51ea8488f6ac0c31604b524e04b.svg |   83 -
 ...ag-81b5d3637453cef2ff9ae918cd96aac2aa6bfe60.svg |   96 +
 ...ag-b52fd329edcfa9a0c71a50c9cb17944631c8b1c2.svg |   64 +
 ...ag-c35f3de4f309ea9d094fc134d2c5eb95e4443958.svg |  103 -
 ...ag-eb46aa0d63d22439ebb0df90dbdd47e71ba435c4.svg |   66 -
 content/incubator/latest/kroviz/about.html         |   66 +-
 content/incubator/latest/kroviz/credits.html       |   66 +-
 .../incubator/latest/kroviz/regression-test.html   |   68 +-
 content/incubator/latest/vaadin/about.html         |   66 +-
 content/mappings/latest/about.html                 |   66 +-
 content/mappings/latest/jaxrsclient/about.html     |   66 +-
 content/mappings/latest/minio/about.html           |   66 +-
 .../mappings/latest/outbox-publisher/about.html    |   66 +-
 content/mappings/latest/restclient/about.html      |   66 +-
 content/mappings/latest/slack/about.html           |   66 +-
 content/pjdo/latest/about.html                     |   66 +-
 .../disabling-persistence-by-reachability.html     |   66 +-
 content/pjdo/latest/db-schemas.html                |   66 +-
 content/pjdo/latest/dependency-injection.html      |   66 +-
 content/pjdo/latest/enhancer.html                  |   66 +-
 content/pjdo/latest/hints-and-tips.html            |   66 +-
 .../latest/hints-and-tips/diagnosing-n-plus-1.html |   66 +-
 content/pjdo/latest/hints-and-tips/java8.html      |   66 +-
 .../hints-and-tips/jdoql-and-timestamps.html       |   66 +-
 .../hints-and-tips/overriding-jdo-annotations.html |   66 +-
 .../subtype-entity-not-fully-populated.html        |   66 +-
 .../typesafe-queries-and-fetchgroups.html          |   66 +-
 content/pjdo/latest/mapping-guide.html             |   66 +-
 .../mandatory-properties-in-subtypes.html          |   66 +-
 .../latest/mapping-guide/mapping-to-a-view.html    |   66 +-
 .../one-to-m-bidirectional-relationships.html      |   66 +-
 content/pjdo/latest/setup-and-configuration.html   |   70 +-
 content/pjpa/latest/about.html                     |   66 +-
 content/pjpa/latest/caching.html                   |   66 +-
 content/pjpa/latest/db-schemas.html                |   66 +-
 content/pjpa/latest/dependency-injection.html      |   66 +-
 content/pjpa/latest/domain-services.html           |   66 +-
 content/pjpa/latest/mapping-guide.html             |   66 +-
 content/pjpa/latest/setup-and-configuration.html   |   70 +-
 content/pjpa/latest/weaving.html                   |   66 +-
 content/refguide/latest/about.html                 |   76 +-
 content/refguide/latest/applib-ant/Column.html     |   76 +-
 content/refguide/latest/applib-ant/Digits.html     |   76 +-
 .../refguide/latest/applib-ant/Discriminator.html  |   76 +-
 .../refguide/latest/applib-ant/NotPersistent.html  |   76 +-
 content/refguide/latest/applib-ant/Nullable.html   |   76 +-
 content/refguide/latest/applib-ant/Pattern.html    |   76 +-
 .../latest/applib-ant/PersistenceCapable.html      |   76 +-
 content/refguide/latest/applib-ant/PrimaryKey.html |   76 +-
 .../latest/applib-ant/XmlJavaTypeAdapter.html      |   76 +-
 .../refguide/latest/applib-ant/XmlRootElement.html |   76 +-
 content/refguide/latest/applib-ant/about.html      |   78 +-
 .../latest/applib-ant/about/hooks/examples.html    |   76 +-
 content/refguide/latest/applib-ant/about/jdo.html  |   76 +-
 content/refguide/latest/applib-ant/about/jee.html  |   76 +-
 content/refguide/latest/applib-ant/about/jpa.html  |   76 +-
 content/refguide/latest/applib-ant/about/main.html |   76 +-
 .../refguide/latest/applib-ant/about/other.html    |   78 +-
 .../refguide/latest/applib-ant/about/partial.html  |   76 +-
 content/refguide/latest/applib-classes/about.html  |   76 +-
 content/refguide/latest/applib-classes/events.html |   76 +-
 .../latest/applib-classes/events/domainevent.html  |   76 +-
 .../applib-classes/events/lifecycleevent.html      |   76 +-
 .../latest/applib-classes/events/uievent.html      |   76 +-
 content/refguide/latest/applib-classes/layout.html |   76 +-
 .../latest/applib-classes/layout/column-order.html |   76 +-
 .../latest/applib-classes/layout/menubars.html     |   76 +-
 .../applib-classes/layout/object-layout.html       |   76 +-
 .../latest/applib-classes/mixees-and-mixins.html   |   76 +-
 .../applib-classes/non-persisted-objects.html      |   76 +-
 .../roles-mixins-contributees/contributee.html     |   76 +-
 .../roles-mixins-contributees/mixins.html          |   76 +-
 content/refguide/latest/applib-classes/spec.html   |   76 +-
 .../refguide/latest/applib-classes/utility.html    |   76 +-
 .../latest/applib-classes/value-types.html         |   76 +-
 content/refguide/latest/applib-methods/about.html  |   76 +-
 .../refguide/latest/applib-methods/lifecycle.html  |   76 +-
 .../latest/applib-methods/lifecycle/created.html   |   76 +-
 .../latest/applib-methods/lifecycle/loaded.html    |   76 +-
 .../latest/applib-methods/lifecycle/persisted.html |   76 +-
 .../applib-methods/lifecycle/persisting.html       |   76 +-
 .../latest/applib-methods/lifecycle/removing.html  |   76 +-
 .../latest/applib-methods/lifecycle/updated.html   |   76 +-
 .../latest/applib-methods/lifecycle/updating.html  |   76 +-
 .../refguide/latest/applib-methods/prefixes.html   |   76 +-
 .../applib-methods/prefixes/autoComplete.html      |   76 +-
 .../latest/applib-methods/prefixes/choices.html    |   76 +-
 .../latest/applib-methods/prefixes/default.html    |   76 +-
 .../latest/applib-methods/prefixes/disable.html    |   76 +-
 .../latest/applib-methods/prefixes/get.html        |   76 +-
 .../latest/applib-methods/prefixes/hide.html       |   76 +-
 .../latest/applib-methods/prefixes/set.html        |   76 +-
 .../latest/applib-methods/prefixes/validate.html   |   76 +-
 .../refguide/latest/applib-methods/ui-hints.html   |   76 +-
 .../latest/applib-methods/ui-hints/cssClass.html   |   76 +-
 .../latest/applib-methods/ui-hints/iconName.html   |   76 +-
 .../latest/applib-methods/ui-hints/layout.html     |   76 +-
 .../latest/applib-methods/ui-hints/title.html      |   76 +-
 content/refguide/latest/applib-svc/about.html      |   82 +-
 ...ag-e4f2a8e33daa6ba98231aa4424332bd7dcbfdbdb.svg |    4 +-
 .../latest/applib/index/AbstractViewModel.html     |   76 +-
 .../refguide/latest/applib/index/Identifier.html   |  121 +-
 .../latest/applib/index/IsisModuleApplib.html      |   76 +-
 .../applib/index/RecreatableDomainObject.html      |   76 +-
 .../refguide/latest/applib/index/ViewModel.html    |   76 +-
 .../adapters/AbstractValueSemanticsProvider.html   |  979 -----
 .../applib/index/adapters/DefaultsProvider.html    | 1023 -----
 .../applib/index/adapters/EncoderDecoder.html      | 1047 -----
 .../applib/index/adapters/EncodingException.html   |  987 -----
 .../latest/applib/index/adapters/Parser.html       | 1141 ------
 .../applib/index/adapters/ParsingException.html    |  987 -----
 .../index/adapters/ValueSemanticsProvider.html     | 1055 -----
 .../latest/applib/index/annotation/Action.html     |  176 +-
 .../applib/index/annotation/ActionLayout.html      |   88 +-
 .../applib/index/annotation/BookmarkPolicy.html    |   76 +-
 .../latest/applib/index/annotation/Bounding.html   |   76 +-
 .../latest/applib/index/annotation/Collection.html |   79 +-
 .../applib/index/annotation/CollectionLayout.html  |  105 +-
 .../latest/applib/index/annotation/Defaulted.html  | 1040 -----
 .../applib/index/annotation/DomainObject.html      |  141 +-
 .../index/annotation/DomainObjectLayout.html       |   76 +-
 .../applib/index/annotation/DomainService.html     |  131 +-
 .../index/annotation/DomainServiceLayout.html      |   80 +-
 .../annotation/DomainServiceLayout~MenuBar.html    |   76 +-
 .../applib/index/annotation/Domain~Exclude.html    |  988 +++++
 .../applib/index/annotation/Domain~Include.html    |  994 +++++
 .../latest/applib/index/annotation/Editing.html    |   76 +-
 .../applib/index/annotation/EntityChangeKind.html  |   76 +-
 .../applib/index/annotation/EqualByContent.html    |  992 -----
 .../latest/applib/index/annotation/Facets.html     | 1057 -----
 .../latest/applib/index/annotation/HomePage.html   |   80 +-
 .../applib/index/annotation/InteractionScope.html  |   76 +-
 .../applib/index/annotation/Introspection.html     | 1107 +++++
 .../applib/index/annotation/LabelPosition.html     |   76 +-
 .../applib/index/annotation/LogicalTypeName.html   | 1012 +++++
 .../applib/index/annotation/MemberSupport.html     |   78 +-
 .../latest/applib/index/annotation/MinLength.html  |   78 +-
 .../latest/applib/index/annotation/Module.html     |   76 +-
 .../latest/applib/index/annotation/Nature.html     |   76 +-
 .../applib/index/annotation/NatureOfService.html   |   76 +-
 .../latest/applib/index/annotation/Navigable.html  |   76 +-
 .../applib/index/annotation/ObjectLifecycle.html   |  994 +++++
 .../applib/index/annotation/ObjectSupport.html     |  994 +++++
 .../applib/index/annotation/Optionality.html       |   77 +-
 .../latest/applib/index/annotation/Parameter.html  |   76 +-
 .../applib/index/annotation/ParameterLayout.html   |  136 +-
 .../index/annotation/PriorityPrecedence.html       |   76 +-
 .../applib/index/annotation/Programmatic.html      |   76 +-
 .../latest/applib/index/annotation/Projecting.html |   80 +-
 .../applib/index/annotation/PromptStyle.html       |   76 +-
 .../latest/applib/index/annotation/Property.html   |   76 +-
 .../applib/index/annotation/PropertyLayout.html    |  113 +-
 .../latest/applib/index/annotation/Publishing.html |   76 +-
 .../latest/applib/index/annotation/Redirect.html   |   76 +-
 .../latest/applib/index/annotation/RenderDay.html  |   88 +-
 .../latest/applib/index/annotation/Repainting.html |   76 +-
 .../latest/applib/index/annotation/RestrictTo.html |   76 +-
 .../applib/index/annotation/SemanticsOf.html       |  131 +-
 .../latest/applib/index/annotation/Snapshot.html   |   76 +-
 .../applib/index/annotation/TimePrecision.html     | 1115 +++++
 .../latest/applib/index/annotation/Title.html      |   76 +-
 .../latest/applib/index/annotation/Value.html      |  150 +-
 .../applib/index/annotation/ValueSemantics.html    | 1191 ++++++
 .../latest/applib/index/annotation/Where.html      |   76 +-
 ...PropertyLayout-FieldSet-examples-and-usage.html |   76 +-
 .../hooks/ActionLayout_010-examples-and-usage.html |   76 +-
 .../hooks/ActionLayout_021-promptStyle.html        |   76 +-
 .../hooks/ActionLayout_022-position.html           |   76 +-
 .../hooks/ActionLayout_023-describedAs.html        |   76 +-
 .../hooks/ActionLayout_024-cssClass.html           |   76 +-
 .../hooks/ActionLayout_025-cssClassFa.html         |   76 +-
 .../hooks/ActionLayout_026-bookmarking.html        |   76 +-
 .../annotation/hooks/ActionLayout_027-hidden.html  |   76 +-
 .../annotation/hooks/ActionLayout_028-named.html   |   76 +-
 .../hooks/ActionLayout_029-redirect.html           |   76 +-
 .../hooks/Action_010-examples-and-usage.html       |   76 +-
 .../annotation/hooks/Action_021-associating.html   |   76 +-
 .../hooks/Action_022-action-semantics.html         |   76 +-
 .../hooks/Action_023-deployment-modes.html         |   76 +-
 .../annotation/hooks/Action_024-domain-events.html |   76 +-
 .../hooks/Action_025-execution-publishing.html     |   76 +-
 .../hooks/Action_026-command-processing.html       |   76 +-
 .../hooks/Action_027-collection-types.html         |   76 +-
 .../annotation/hooks/Action_030-see-also.html      |   76 +-
 .../CollectionLayout_010-examples-and-usage.html   |   76 +-
 .../hooks/CollectionLayout_021-defaultView.html    |   76 +-
 .../hooks/CollectionLayout_022-paged.html          |   76 +-
 .../hooks/CollectionLayout_023-describedAs.html    |   76 +-
 .../hooks/CollectionLayout_024-sortedBy.html       |   76 +-
 .../hooks/CollectionLayout_025-cssClass.html       |   76 +-
 .../hooks/CollectionLayout_026-named.html          |   76 +-
 .../hooks/CollectionLayout_027-hidden.html         |   76 +-
 .../hooks/Collection_010-examples-and-usage.html   |   76 +-
 .../hooks/Collection_021_domainEvent.html          |   76 +-
 .../annotation/hooks/Collection_022_hidden.html    |   76 +-
 .../annotation/hooks/Collection_023_typeOf.html    |   76 +-
 .../DomainObjectLayout_010-examples-and-usage.html |   76 +-
 .../hooks/DomainObjectLayout_021-describedAs.html  |   76 +-
 .../hooks/DomainObjectLayout_022-cssClass.html     |   76 +-
 .../hooks/DomainObjectLayout_023-cssClassFa.html   |   76 +-
 .../hooks/DomainObjectLayout_024-named.html        |   76 +-
 .../hooks/DomainObjectLayout_025-bookmarking.html  |   76 +-
 .../hooks/DomainObjectLayout_026-paged.html        |   76 +-
 .../hooks/DomainObjectLayout_027-ui-events.html    |   76 +-
 .../hooks/DomainObject_010-examples-and-usage.html |   76 +-
 .../hooks/DomainObject_021-logicalTypeName.html    |   76 +-
 .../annotation/hooks/DomainObject_022-nature.html  |   76 +-
 .../annotation/hooks/DomainObject_023-editing.html |   76 +-
 .../hooks/DomainObject_024-domain-events.html      |   76 +-
 .../hooks/DomainObject_025-lifecycle-events.html   |   76 +-
 .../DomainObject_026-entityChangePublishing.html   |   76 +-
 .../hooks/DomainObject_027-bounding.html           |   76 +-
 .../DomainObject_028-autoCompleteRepository.html   |   76 +-
 .../hooks/DomainObject_029-mixinMethod.html        |   76 +-
 .../hooks/DomainObject_040-see-also.html           |   76 +-
 ...DomainServiceLayout_010-examples-and-usage.html |   76 +-
 .../hooks/DomainServiceLayout_021-menuBar.html     |   76 +-
 .../hooks/DomainServiceLayout_022-named.html       |   76 +-
 .../DomainService_010-examples-and-usage.html      |   76 +-
 .../hooks/DomainService_021-objectType.html        |   76 +-
 .../annotation/hooks/DomainService_022-nature.html |   76 +-
 .../hooks/Facets_010-examples-and-usage.html       |   76 +-
 .../hooks/HomePage_010-examples-and-usage.html     |   76 +-
 .../InteractionScope_010-examples-and-usage.html   |   76 +-
 .../hooks/MinLength_010-examples-and-usage.html    |   76 +-
 .../ParameterLayout_010-examples-and-usage.html    |   76 +-
 .../hooks/ParameterLayout_021-labelPosition.html   |   76 +-
 .../hooks/ParameterLayout_022-multiLine.html       |   76 +-
 .../hooks/ParameterLayout_023-describedAs.html     |   76 +-
 .../hooks/ParameterLayout_024-cssClass.html        |   76 +-
 .../hooks/ParameterLayout_025-renderDay.html       |   76 +-
 .../hooks/ParameterLayout_026-named.html           |   76 +-
 .../hooks/ParameterLayout_027-typicalLength.html   |   76 +-
 .../hooks/Parameter_010-examples-and-usage.html    |   76 +-
 .../hooks/Parameter_021-optionality.html           |   76 +-
 .../annotation/hooks/Parameter_022-maxLength.html  |   76 +-
 .../hooks/Parameter_023-mustSatisfy.html           |   76 +-
 .../hooks/Parameter_024-regexPattern.html          |   76 +-
 .../annotation/hooks/Parameter_025-fileAccept.html |   76 +-
 .../hooks/Programmatic_010-examples-and-usage.html |   76 +-
 .../PropertyLayout_010-examples-and-usage.html     |   76 +-
 .../hooks/PropertyLayout_021_labelPosition.html    |   76 +-
 .../hooks/PropertyLayout_022_promptStyle.html      |   76 +-
 .../hooks/PropertyLayout_023_multiLine.html        |   76 +-
 .../hooks/PropertyLayout_024_navigable.html        |   76 +-
 .../hooks/PropertyLayout_025_describedAs.html      |   76 +-
 .../hooks/PropertyLayout_026_cssClass.html         |   76 +-
 .../hooks/PropertyLayout_027_renderDay.html        |   76 +-
 .../hooks/PropertyLayout_028_repainting.html       |   76 +-
 .../annotation/hooks/PropertyLayout_029_named.html |   76 +-
 .../hooks/PropertyLayout_030_hidden.html           |   76 +-
 .../hooks/PropertyLayout_31_typicalLength.html     |   76 +-
 .../hooks/Property_010-examples-and-usage.html     |   76 +-
 .../annotation/hooks/Property_021-optionality.html |   76 +-
 .../annotation/hooks/Property_022-editing.html     |   76 +-
 .../annotation/hooks/Property_023-maxLength.html   |   76 +-
 .../annotation/hooks/Property_024-mustSatisfy.html |   76 +-
 .../annotation/hooks/Property_025-projecting.html  |   76 +-
 .../hooks/Property_026-domain-events.html          |   76 +-
 .../hooks/Property_027-execution-publishing.html   |   76 +-
 .../hooks/Property_028-command-processing.html     |   76 +-
 .../hooks/Property_029-regexPattern.html           |   76 +-
 .../annotation/hooks/Property_030-snapshot.html    |   76 +-
 .../annotation/hooks/Property_031-fileAccept.html  |   76 +-
 .../annotation/hooks/Property_033-hidden.html      |   76 +-
 .../hooks/Title_010-examples-and-usage.html        |   76 +-
 .../client/RepresentationTypeSimplifiedV2.html     |   82 +-
 .../applib/index/client/SuppressionType.html       |   76 +-
 .../latest/applib/index/clock/VirtualClock.html    |  630 ++-
 .../applib/index/domain/DomainObjectList.html      |   80 +-
 .../applib/index/events/EventObjectBase.html       |   78 +-
 .../index/events/domain/AbstractDomainEvent.html   |  114 +-
 .../index/events/domain/ActionDomainEvent.html     |   86 +-
 .../index/events/domain/CollectionDomainEvent.html |   78 +-
 .../index/events/domain/PropertyDomainEvent.html   |   78 +-
 .../events/lifecycle/AbstractLifecycleEvent.html   |   78 +-
 .../index/events/lifecycle/ObjectCreatedEvent.html |   78 +-
 .../index/events/lifecycle/ObjectLoadedEvent.html  |   78 +-
 .../events/lifecycle/ObjectPersistedEvent.html     |   78 +-
 .../events/lifecycle/ObjectPersistingEvent.html    |   78 +-
 .../events/lifecycle/ObjectRemovingEvent.html      |   78 +-
 .../index/events/lifecycle/ObjectUpdatedEvent.html |   78 +-
 .../events/lifecycle/ObjectUpdatingEvent.html      |   78 +-
 .../applib/index/events/ui/AbstractUiEvent.html    |   78 +-
 .../applib/index/events/ui/CssClassUiEvent.html    |   80 +-
 .../latest/applib/index/events/ui/IconUiEvent.html |   80 +-
 .../applib/index/events/ui/LayoutUiEvent.html      |   80 +-
 .../applib/index/events/ui/TitleUiEvent.html       |   82 +-
 .../index/exceptions/RecoverableException.html     |   86 +-
 .../index/exceptions/TranslatableException.html    |   76 +-
 .../index/exceptions/UnrecoverableException.html   |   86 +-
 .../unrecoverable/DomainModelException.html        |   82 +-
 .../unrecoverable/MetaModelException.html          |   82 +-
 .../unrecoverable/NoAuthenticatorException.html    |   82 +-
 .../unrecoverable/ObjectNotFoundException.html     |   80 +-
 .../unrecoverable/ObjectPersistenceException.html  |   82 +-
 .../unrecoverable/PersistFailedException.html      |   82 +-
 .../unrecoverable/ReflectiveActionException.html   |   82 +-
 .../unrecoverable/RepositoryException.html         |   82 +-
 .../unrecoverable/UnexpectedCallException.html     |   76 +-
 .../unrecoverable/UnknownTypeException.html        |   80 +-
 .../refguide/latest/applib/index/graph/Edge.html   |   76 +-
 .../latest/applib/index/graph/SimpleEdge.html      |   76 +-
 .../refguide/latest/applib/index/graph/Vertex.html |   76 +-
 .../applib/index/graph/tree/TreeAdapter.html       |   76 +-
 .../latest/applib/index/graph/tree/TreeNode.html   |   86 +-
 .../latest/applib/index/graph/tree/TreePath.html   |   78 +-
 .../latest/applib/index/graph/tree/TreeState.html  |   76 +-
 .../latest/applib/index/id/HasLogicalType.html     |   76 +-
 .../latest/applib/index/id/LogicalType.html        |   90 +-
 .../latest/applib/index/jaxb/DataTypeFactory.html  |   76 +-
 .../applib/index/jaxb/JavaSqlJaxbAdapters.html     |   76 +-
 .../JavaSqlXMLGregorianCalendarMarshalling.html    |   80 +-
 .../applib/index/jaxb/JavaTimeJaxbAdapters.html    |   76 +-
 .../JavaTimeXMLGregorianCalendarMarshalling.html   |   88 +-
 .../applib/index/jaxb/JavaUtilJaxbAdapters.html    |   76 +-
 .../applib/index/jaxb/JodaTimeJaxbAdapters.html    |  976 -----
 .../JodaTimeXMLGregorianCalendarMarshalling.html   |  984 -----
 .../index/jaxb/PersistentEntitiesAdapter.html      |   80 +-
 .../applib/index/jaxb/PersistentEntityAdapter.html |   80 +-
 .../applib/index/jaxb/PrimitiveJaxbAdapters.html   |   76 +-
 .../index/layout/component/ActionLayoutData.html   |  106 +-
 .../layout/component/ActionLayoutDataOwner.html    |   76 +-
 .../layout/component/CollectionLayoutData.html     |  106 +-
 .../component/CollectionLayoutDataOwner.html       |   76 +-
 .../index/layout/component/CssClassFaPosition.html |   78 +-
 .../layout/component/DomainObjectLayoutData.html   |   96 +-
 .../component/DomainObjectLayoutDataOwner.html     |   76 +-
 .../applib/index/layout/component/FieldSet.html    |   88 +-
 .../index/layout/component/FieldSetOwner.html      |   76 +-
 .../index/layout/component/HasBookmarking.html     |   76 +-
 .../applib/index/layout/component/HasCssClass.html |   76 +-
 .../index/layout/component/HasCssClassFa.html      |   76 +-
 .../index/layout/component/HasDescribedAs.html     |   76 +-
 .../applib/index/layout/component/HasHidden.html   |   76 +-
 .../applib/index/layout/component/HasNamed.html    |   76 +-
 .../index/layout/component/MemberRegion.html       |   76 +-
 .../index/layout/component/MemberRegionOwner.html  |   76 +-
 .../applib/index/layout/component/Owned.html       |   76 +-
 .../applib/index/layout/component/Owner.html       |   76 +-
 .../index/layout/component/PropertyLayoutData.html |  114 +-
 .../layout/component/ServiceActionLayoutData.html  |   86 +-
 .../component/ServiceActionLayoutDataOwner.html    |   76 +-
 .../latest/applib/index/layout/grid/Grid.html      |   84 +-
 .../applib/index/layout/grid/GridAbstract.html     |   82 +-
 .../index/layout/grid/bootstrap3/BS3ClearFix.html  |   76 +-
 .../layout/grid/bootstrap3/BS3ClearFixHidden.html  |   76 +-
 .../layout/grid/bootstrap3/BS3ClearFixVisible.html |   78 +-
 .../index/layout/grid/bootstrap3/BS3Col.html       |  100 +-
 .../index/layout/grid/bootstrap3/BS3Element.html   |   78 +-
 .../layout/grid/bootstrap3/BS3ElementAbstract.html |   78 +-
 .../index/layout/grid/bootstrap3/BS3Grid.html      |   84 +-
 .../index/layout/grid/bootstrap3/BS3Row.html       |   84 +-
 .../layout/grid/bootstrap3/BS3RowContent.html      |   80 +-
 .../layout/grid/bootstrap3/BS3RowContentOwner.html |   76 +-
 .../index/layout/grid/bootstrap3/BS3RowOwner.html  |   76 +-
 .../index/layout/grid/bootstrap3/BS3Tab.html       |   82 +-
 .../index/layout/grid/bootstrap3/BS3TabGroup.html  |   86 +-
 .../layout/grid/bootstrap3/BS3TabGroupOwner.html   |   76 +-
 .../index/layout/grid/bootstrap3/BS3TabOwner.html  |   76 +-
 .../index/layout/grid/bootstrap3/HasCssId.html     |   76 +-
 .../applib/index/layout/grid/bootstrap3/Size.html  |   76 +-
 .../index/layout/grid/bootstrap3/SizeSpan.html     |   88 +-
 .../index/layout/grid/bootstrap3/WithinGrid.html   |   76 +-
 .../latest/applib/index/layout/links/Link.html     |   78 +-
 .../applib/index/layout/menubars/HasNamed.html     |   76 +-
 .../latest/applib/index/layout/menubars/Menu.html  |   76 +-
 .../applib/index/layout/menubars/MenuBar.html      |   76 +-
 .../applib/index/layout/menubars/MenuBars.html     |   78 +-
 .../index/layout/menubars/MenuBarsAbstract.html    |   78 +-
 .../applib/index/layout/menubars/MenuSection.html  |   76 +-
 .../index/layout/menubars/bootstrap3/BS3Menu.html  |   80 +-
 .../layout/menubars/bootstrap3/BS3MenuBar.html     |   76 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.html    |   88 +-
 .../layout/menubars/bootstrap3/BS3MenuSection.html |   76 +-
 .../latest/applib/index/locale/UserLocale.html     |  988 +++++
 .../latest/applib/index/mixins/dto/Dto.html        |   76 +-
 .../applib/index/mixins/dto/DtoMixinConstants.html |   76 +-
 .../applib/index/mixins/dto/Dto_downloadXml.html   |   78 +-
 .../applib/index/mixins/dto/Dto_downloadXsd.html   |   78 +-
 .../index/mixins/dto/hooks/Dto_see-also.html       |   76 +-
 .../index/mixins/layout/LayoutMixinConstants.html  |   76 +-
 .../mixins/layout/Object_downloadLayoutXml.html    |   78 +-
 .../hooks/Object_downloadLayoutXml_see-also.html   |   76 +-
 .../metamodel/Object_downloadMetamodelXml.html     |   78 +-
 .../mixins/metamodel/Object_logicalTypeName.html   |   76 +-
 .../mixins/metamodel/Object_objectIdentifier.html  |   76 +-
 .../mixins/metamodel/Object_rebuildMetamodel.html  |   76 +-
 .../hooks/Object_rebuildMetamodel_see-also.html    |   76 +-
 .../index/mixins/rest/Object_openRestApi.html      |   76 +-
 .../rest/hooks/Object_openRestApi_see-also.html    |   76 +-
 .../applib/index/mixins/security/HasUsername.html  |   76 +-
 .../index/mixins/system/DomainChangeRecord.html    |   76 +-
 .../DomainChangeRecord_openTargetObject.html       |   76 +-
 .../system/DomainChangeRecord~ChangeType.html      |   76 +-
 .../index/mixins/system/HasInteractionId.html      |   76 +-
 .../index/mixins/system/HasTransactionId.html      |   76 +-
 .../system/hooks/HasInteractionId_see-also.html    |   76 +-
 .../applib/index/mixins/updates/OnUpdatedAt.html   |   76 +-
 .../applib/index/mixins/updates/OnUpdatedBy.html   |   76 +-
 .../index/mixins/updates/OnUpdatedByAndAt.html     |   76 +-
 .../updates/hooks/WithUpdatedAt_usage-notes.html   |   76 +-
 .../hooks/WithUpdatedByAndAt_usage-notes.html      |   76 +-
 .../updates/hooks/WithUpdatedBy_usage-notes.html   |   76 +-
 .../applib/index/query/AllInstancesQuery.html      |   76 +-
 .../latest/applib/index/query/NamedQuery.html      |   76 +-
 .../refguide/latest/applib/index/query/Query.html  |   80 +-
 .../latest/applib/index/query/QueryRange.html      |   76 +-
 .../services/acceptheader/AcceptHeaderService.html |   76 +-
 .../AcceptHeaderService_010-implementation.html    |   76 +-
 ...AcceptHeaderService_020-examples-and-usage.html |   76 +-
 .../index/services/appfeat/ApplicationFeature.html |   78 +-
 .../services/appfeat/ApplicationFeatureId.html     |  106 +-
 .../appfeat/ApplicationFeatureRepository.html      |   76 +-
 .../services/appfeat/ApplicationFeatureSort.html   |   76 +-
 .../services/appfeat/ApplicationMemberSort.html    |   76 +-
 ...cationFeatureRepository_010-implementation.html |   76 +-
 ...onFeatureRepository_020-examples-and-usage.html |   76 +-
 .../services/appfeatui/ApplicationFeatureMenu.html |   76 +-
 .../appfeatui/ApplicationFeatureViewModel.html     |   86 +-
 .../services/appfeatui/ApplicationNamespace.html   |   78 +-
 .../index/services/appfeatui/ApplicationType.html  |   78 +-
 .../services/appfeatui/ApplicationTypeAction.html  |   78 +-
 .../appfeatui/ApplicationTypeCollection.html       |   78 +-
 .../services/appfeatui/ApplicationTypeMember.html  |   78 +-
 .../appfeatui/ApplicationTypeProperty.html         |   78 +-
 .../applib/index/services/bookmark/Bookmark.html   |   89 +-
 .../index/services/bookmark/BookmarkHolder.html    |   76 +-
 .../services/bookmark/BookmarkHolder_lookup.html   |   76 +-
 .../services/bookmark/BookmarkHolder_object.html   |   76 +-
 .../index/services/bookmark/BookmarkService.html   |   76 +-
 .../latest/applib/index/services/bookmark/Oid.html |  130 +-
 .../hooks/BookmarkService_010-implementation.html  |   76 +-
 .../BookmarkService_020-examples-and-usage.html    |   76 +-
 .../services/bookmarkui/BookmarkUiService.html     |   76 +-
 .../BookmarkUiService_010-implementation.html      |   76 +-
 .../BookmarkUiService_020-examples-and-usage.html  |   76 +-
 .../applib/index/services/clock/ClockService.html  |   76 +-
 .../hooks/ClockService_010-implementation.html     |   76 +-
 .../hooks/ClockService_020-examples-and-usage.html |   76 +-
 .../applib/index/services/command/Command.html     |   76 +-
 .../services/command/CommandExecutorService.html   |   76 +-
 ...ndExecutorService~InteractionContextPolicy.html |   76 +-
 .../services/command/CommandOutcomeHandler.html    |   76 +-
 .../CommandExecutorService_010-implementation.html |   76 +-
 ...mandExecutorService_020-examples-and-usage.html |   76 +-
 .../index/services/commanddto/HasCommandDto.html   |   76 +-
 .../conmap/ContentMappingServiceForCommandDto.html |   80 +-
 .../ContentMappingServiceForCommandsDto.html       |   80 +-
 .../services/commanddto/conmap/UserDataKeys.html   |   76 +-
 .../commanddto/processor/CommandDtoProcessor.html  |   76 +-
 .../CommandDtoProcessorForActionAbstract.html      |   76 +-
 .../CommandDtoProcessorForPropertyAbstract.html    |   76 +-
 ...mandDtoProcessorService_010-implementation.html |   76 +-
 ...DtoProcessorService_020-examples-and-usage.html |   76 +-
 .../processor/spi/CommandDtoProcessorService.html  |   78 +-
 .../spi/CommandDtoProcessorServiceIdentity.html    |   78 +-
 .../index/services/confview/ConfigurationMenu.html |   77 +-
 .../services/confview/ConfigurationProperty.html   |   80 +-
 .../confview/ConfigurationViewService.html         |   76 +-
 .../ConfigurationMenu_010-implementation.html      |   76 +-
 .../ConfigurationMenu_020-examples-and-usage.html  |   76 +-
 ...onfigurationViewService_010-implementation.html |   76 +-
 ...gurationViewService_020-examples-and-usage.html |   76 +-
 .../services/conmap/ContentMappingService.html     |   78 +-
 .../ContentMappingService_010-implementation.html  |   76 +-
 ...ntentMappingService_020-examples-and-usage.html |   76 +-
 .../applib/index/services/email/EmailService.html  |   76 +-
 .../hooks/EmailService_010-implementation.html     |   76 +-
 .../hooks/EmailService_020-examples-and-usage.html |   76 +-
 .../applib/index/services/error/ErrorDetails.html  |   76 +-
 .../services/error/ErrorReportingService.html      |   78 +-
 .../applib/index/services/error/SimpleTicket.html  |   84 +-
 .../latest/applib/index/services/error/Ticket.html |   76 +-
 .../ErrorReportingService_010-implementation.html  |   76 +-
 ...rorReportingService_020-examples-and-usage.html |   76 +-
 .../index/services/eventbus/EventBusService.html   |   76 +-
 .../hooks/EventBusService_010-implementation.html  |   76 +-
 .../EventBusService_020-examples-and-usage.html    |   76 +-
 .../applib/index/services/exceprecog/Category.html |   76 +-
 .../services/exceprecog/ExceptionRecognizer.html   |   76 +-
 .../exceprecog/ExceptionRecognizerAbstract.html    |   84 +-
 .../exceprecog/ExceptionRecognizerForType.html     |   86 +-
 .../exceprecog/ExceptionRecognizerService.html     |   76 +-
 .../index/services/exceprecog/Recognition.html     |   78 +-
 ...eptionRecognizerService_010-implementation.html |   76 +-
 ...onRecognizerService_020-examples-and-usage.html |   76 +-
 .../ExceptionRecognizer_010-implementation.html    |   76 +-
 ...ExceptionRecognizer_020-examples-and-usage.html |   76 +-
 .../index/services/factory/FactoryService.html     |  157 +-
 .../hooks/FactoryService_010-implementation.html   |   76 +-
 .../FactoryService_020-examples-and-usage.html     |   76 +-
 .../index/services/grid/GridLoaderService.html     |   76 +-
 .../applib/index/services/grid/GridService.html    |   80 +-
 .../index/services/grid/GridSystemService.html     |   76 +-
 .../GridLoaderService_010-implementation.html      |   76 +-
 .../GridLoaderService_020-examples-and-usage.html  |   76 +-
 .../grid/hooks/GridService_010-implementation.html |   76 +-
 .../hooks/GridService_020-examples-and-usage.html  |   76 +-
 .../GridSystemService_010-implementation.html      |   76 +-
 .../GridSystemService_020-examples-and-usage.html  |   76 +-
 .../applib/index/services/health/Health.html       |   78 +-
 .../index/services/health/HealthCheckService.html  |   76 +-
 .../HealthCheckService_010-implementation.html     |   76 +-
 .../HealthCheckService_020-examples-and-usage.html |   76 +-
 .../applib/index/services/hint/HintIdProvider.html |   76 +-
 .../applib/index/services/hint/HintStore.html      |   82 +-
 .../hooks/HintIdProvider_010-implementation.html   |   76 +-
 .../HintIdProvider_020-examples-and-usage.html     |   76 +-
 .../hint/hooks/HintStore_010-implementation.html   |   76 +-
 .../hooks/HintStore_020-examples-and-usage.html    |   76 +-
 .../services/homepage/HomePageResolverService.html |   76 +-
 ...HomePageResolverService_010-implementation.html |   76 +-
 ...PageResolverService_020-examples-and-usage.html |   76 +-
 .../index/services/i18n/HasTranslationContext.html |   76 +-
 .../index/services/i18n/LanguageProvider.html      | 1015 +++++
 .../applib/index/services/i18n/LocaleProvider.html | 1050 -----
 .../latest/applib/index/services/i18n/Mode.html    |   76 +-
 .../index/services/i18n/TranslatableString.html    |   86 +-
 .../index/services/i18n/TranslationContext.html    |   87 +-
 .../index/services/i18n/TranslationService.html    |   82 +-
 .../index/services/i18n/TranslationsResolver.html  |   80 +-
 .../hooks/LocaleProvider_010-implementation.html   |   76 +-
 .../LocaleProvider_020-examples-and-usage.html     |   76 +-
 .../TranslationService_010-implementation.html     |   76 +-
 .../TranslationService_020-examples-and-usage.html |   78 +-
 .../TranslationsResolver_010-implementation.html   |   76 +-
 ...ranslationsResolver_020-examples-and-usage.html |   78 +-
 .../index/services/iactn/ActionInvocation.html     |   78 +-
 .../applib/index/services/iactn/Execution.html     |   86 +-
 .../applib/index/services/iactn/Interaction.html   |   76 +-
 .../index/services/iactn/InteractionProvider.html  |   76 +-
 .../applib/index/services/iactn/PropertyEdit.html  |   78 +-
 .../iactn/hooks/Execution_010-implementation.html  |   76 +-
 .../hooks/Execution_020-examples-and-usage.html    |   76 +-
 .../InteractionContext_010-implementation.html     |   76 +-
 .../InteractionContext_020-examples-and-usage.html |   76 +-
 .../hooks/Interaction_010-implementation.html      |   76 +-
 .../hooks/Interaction_020-examples-and-usage.html  |   76 +-
 .../services/iactnlayer/InteractionContext.html    |  132 +-
 .../services/iactnlayer/InteractionLayer.html      |   76 +-
 .../iactnlayer/InteractionLayerTracker.html        |   76 +-
 .../services/iactnlayer/InteractionService.html    |   84 +-
 .../index/services/inject/ServiceInjector.html     |   78 +-
 .../hooks/ServiceInjector_010-implementation.html  |   76 +-
 .../ServiceInjector_020-examples-and-usage.html    |   76 +-
 .../applib/index/services/jaxb/JaxbService.html    |   76 +-
 .../jaxb/hooks/JaxbService_010-implementation.html |   76 +-
 .../hooks/JaxbService_020-examples-and-usage.html  |   76 +-
 .../index/services/layout/LayoutService.html       |   80 +-
 .../index/services/layout/LayoutServiceMenu.html   |   87 +-
 .../latest/applib/index/services/layout/Style.html |   76 +-
 .../LayoutServiceMenu_010-implementation.html      |   76 +-
 .../LayoutServiceMenu_020-examples-and-usage.html  |   76 +-
 .../hooks/LayoutService_010-implementation.html    |   76 +-
 .../LayoutService_020-examples-and-usage.html      |   76 +-
 .../index/services/linking/DeepLinkService.html    |   76 +-
 .../hooks/DeepLinkService_010-implementation.html  |   76 +-
 .../DeepLinkService_020-examples-and-usage.html    |   76 +-
 .../services/locale/LocaleChoiceProvider.html      |  986 +++++
 .../index/services/menu/MenuBarsLoaderService.html |   80 +-
 .../index/services/menu/MenuBarsService.html       |   78 +-
 .../MenuBarsLoaderService_010-implementation.html  |   76 +-
 ...nuBarsLoaderService_020-examples-and-usage.html |   76 +-
 .../hooks/MenuBarsService_010-implementation.html  |   76 +-
 .../MenuBarsService_020-examples-and-usage.html    |   76 +-
 .../index/services/message/MessageService.html     |   96 +-
 .../hooks/MessageService_010-implementation.html   |   76 +-
 .../MessageService_020-examples-and-usage.html     |   78 +-
 .../applib/index/services/metamodel/BeanSort.html  |   77 +-
 .../applib/index/services/metamodel/Config.html    |   78 +-
 .../index/services/metamodel/DomainMember.html     |   76 +-
 .../index/services/metamodel/DomainModel.html      |   76 +-
 .../index/services/metamodel/MetaModelService.html |   84 +-
 .../services/metamodel/MetaModelServiceMenu.html   |   93 +-
 .../MetaModelServiceMenu_010-implementation.html   |   76 +-
 ...etaModelServiceMenu_020-examples-and-usage.html |   76 +-
 .../hooks/MetaModelService_010-implementation.html |   76 +-
 .../MetaModelService_020-examples-and-usage.html   |   76 +-
 .../index/services/metrics/MetricsService.html     |   76 +-
 .../hooks/MetricsService_010-implementation.html   |   76 +-
 .../MetricsService_020-examples-and-usage.html     |   76 +-
 .../services/publishing/log/CommandLogger.html     |   76 +-
 .../publishing/log/EntityChangesLogger.html        |   78 +-
 .../publishing/log/EntityPropertyChangeLogger.html |   78 +-
 .../services/publishing/log/ExecutionLogger.html   |   78 +-
 .../services/publishing/spi/CommandSubscriber.html |   76 +-
 .../services/publishing/spi/EntityChanges.html     |   76 +-
 .../publishing/spi/EntityChangesSubscriber.html    |   76 +-
 .../publishing/spi/EntityPropertyChange.html       |   76 +-
 .../spi/EntityPropertyChangeSubscriber.html        |   76 +-
 .../publishing/spi/ExecutionSubscriber.html        |   76 +-
 .../CommandSubscriber_010-implementation.html      |   76 +-
 .../CommandSubscriber_020-examples-and-usage.html  |   76 +-
 ...EntityChangesSubscriber_010-implementation.html |   76 +-
 ...tyChangesSubscriber_020-examples-and-usage.html |   76 +-
 ...ropertyChangeSubscriber_010-implementation.html |   76 +-
 ...rtyChangeSubscriber_020-examples-and-usage.html |   76 +-
 .../ExecutionSubscriber_010-implementation.html    |   76 +-
 ...ExecutionSubscriber_020-examples-and-usage.html |   76 +-
 .../queryresultscache/MethodReferences.html        |   76 +-
 .../queryresultscache/QueryResultsCache.html       |   78 +-
 .../QueryResultsCacheControl.html                  |   76 +-
 ...ueryResultsCacheControl_010-implementation.html |   76 +-
 ...ResultsCacheControl_020-examples-and-usage.html |   76 +-
 .../QueryResultsCache_010-implementation.html      |   76 +-
 .../QueryResultsCache_020-examples-and-usage.html  |   76 +-
 .../registry/InstanceByPriorityComparator.html     |   76 +-
 .../index/services/registry/ServiceRegistry.html   |   84 +-
 .../hooks/ServiceRegistry_010-implementation.html  |   76 +-
 .../ServiceRegistry_020-examples-and-usage.html    |   76 +-
 .../index/services/repository/EntityState.html     |   76 +-
 .../services/repository/RepositoryService.html     |  180 +-
 .../RepositoryService_010-implementation.html      |   76 +-
 .../RepositoryService_020-examples-and-usage.html  |   76 +-
 .../index/services/routing/RoutingService.html     |   76 +-
 .../hooks/RoutingService_010-implementation.html   |   76 +-
 .../RoutingService_020-examples-and-usage.html     |   76 +-
 .../index/services/scratchpad/Scratchpad.html      |   76 +-
 .../hooks/Scratchpad_010-implementation.html       |   76 +-
 .../hooks/Scratchpad_020-examples-and-usage.html   |   76 +-
 .../services/session/SessionLoggingService.html    |   76 +-
 .../session/SessionLoggingServiceLogging.html      |   78 +-
 .../SessionLoggingService_010-implementation.html  |   76 +-
 ...ssionLoggingService_020-examples-and-usage.html |   76 +-
 .../index/services/sitemap/SitemapService.html     |  986 +++++
 .../index/services/sitemap/SitemapServiceMenu.html |  987 +++++
 .../applib/index/services/sudo/SudoService.html    |   80 +-
 .../SudoServiceListener_010-implementation.html    |   76 +-
 ...SudoServiceListener_020-examples-and-usage.html |   76 +-
 .../sudo/hooks/SudoService_010-implementation.html |   76 +-
 .../hooks/SudoService_020-examples-and-usage.html  |   76 +-
 .../applib/index/services/swagger/Format.html      |   76 +-
 .../index/services/swagger/SwaggerService.html     |   78 +-
 .../applib/index/services/swagger/Visibility.html  |   76 +-
 .../hooks/SwaggerService_010-implementation.html   |   76 +-
 .../SwaggerService_020-examples-and-usage.html     |   76 +-
 .../TableColumnOrderForCollectionTypeAbstract.html |   80 +-
 .../services/tablecol/TableColumnOrderService.html |   80 +-
 .../tablecol/TableColumnVisibilityService.html     |   78 +-
 ...TableColumnOrderService_010-implementation.html |   76 +-
 ...eColumnOrderService_020-examples-and-usage.html |   76 +-
 .../applib/index/services/title/TitleService.html  |   80 +-
 .../hooks/TitleService_010-implementation.html     |   76 +-
 .../hooks/TitleService_020-examples-and-usage.html |   76 +-
 .../services/urlencoding/UrlEncodingService.html   |   82 +-
 ...rlEncodingServiceUsingBaseEncodingAbstract.html |   80 +-
 .../UrlEncodingService_010-implementation.html     |   76 +-
 .../UrlEncodingService_020-examples-and-usage.html |   76 +-
 .../index/services/user/ImpersonateMenu.html       |  132 +-
 .../services/user/ImpersonateMenuAdvisor.html      |   92 +-
 .../index/services/user/ImpersonateStopMenu.html   |   78 +-
 .../services/user/ImpersonatedUserHolder.html      |   78 +-
 .../applib/index/services/user/RoleMemento.html    |   80 +-
 .../applib/index/services/user/UserMemento.html    |  145 +-
 .../applib/index/services/user/UserService.html    |  124 +-
 .../user/hooks/UserService_010-implementation.html |   76 +-
 .../hooks/UserService_020-examples-and-usage.html  |   76 +-
 .../services/userreg/EmailNotificationService.html |   76 +-
 .../applib/index/services/userreg/UserDetails.html |   76 +-
 .../services/userreg/UserRegistrationService.html  |   76 +-
 .../userreg/events/EmailEventAbstract.html         |   78 +-
 .../userreg/events/EmailRegistrationEvent.html     |   78 +-
 .../userreg/events/PasswordResetEvent.html         |   78 +-
 ...mailNotificationService_010-implementation.html |   76 +-
 ...NotificationService_020-examples-and-usage.html |   76 +-
 ...UserRegistrationService_010-implementation.html |   76 +-
 ...RegistrationService_020-examples-and-usage.html |   76 +-
 .../applib/index/services/userui/UserMenu.html     |   78 +-
 .../index/services/wrapper/DisabledException.html  |   78 +-
 .../index/services/wrapper/HiddenException.html    |   78 +-
 .../index/services/wrapper/InvalidException.html   |   78 +-
 .../index/services/wrapper/WrapperFactory.html     |   82 +-
 .../index/services/wrapper/WrappingObject.html     |   76 +-
 .../services/wrapper/control/AsyncControl.html     |   86 +-
 .../services/wrapper/control/ControlAbstract.html  |   76 +-
 .../services/wrapper/control/ExceptionHandler.html |   76 +-
 .../wrapper/control/ExceptionHandlerAbstract.html  |   76 +-
 .../services/wrapper/control/ExecutionMode.html    |   76 +-
 .../services/wrapper/control/SyncControl.html      |   76 +-
 .../index/services/wrapper/events/AccessEvent.html |   78 +-
 .../wrapper/events/ActionArgumentEvent.html        |   78 +-
 .../wrapper/events/ActionInvocationEvent.html      |   80 +-
 .../wrapper/events/ActionUsabilityEvent.html       |   78 +-
 .../wrapper/events/ActionVisibilityEvent.html      |   78 +-
 .../wrapper/events/CollectionAccessEvent.html      |   78 +-
 .../wrapper/events/CollectionAddToEvent.html       |   78 +-
 .../wrapper/events/CollectionMethodEvent.html      |   78 +-
 .../wrapper/events/CollectionRemoveFromEvent.html  |   78 +-
 .../wrapper/events/CollectionUsabilityEvent.html   |   78 +-
 .../services/wrapper/events/InteractionEvent.html  |   80 +-
 .../services/wrapper/events/ObjectTitleEvent.html  |   78 +-
 .../wrapper/events/ObjectValidityEvent.html        |   78 +-
 .../wrapper/events/ObjectVisibilityEvent.html      |   78 +-
 .../services/wrapper/events/ParseValueEvent.html   |   78 +-
 .../wrapper/events/PropertyAccessEvent.html        |   78 +-
 .../wrapper/events/PropertyModifyEvent.html        |   78 +-
 .../wrapper/events/PropertyUsabilityEvent.html     |   78 +-
 .../wrapper/events/PropertyVisibilityEvent.html    |   78 +-
 .../wrapper/events/ProposedHolderEvent.html        |   76 +-
 .../services/wrapper/events/UsabilityEvent.html    |   78 +-
 .../services/wrapper/events/ValidityEvent.html     |   78 +-
 .../services/wrapper/events/VisibilityEvent.html   |   78 +-
 .../hooks/WrapperFactory_010-implementation.html   |   76 +-
 .../WrapperFactory_020-examples-and-usage.html     |   76 +-
 .../wrapper/listeners/InteractionAdapter.html      |  108 +-
 .../wrapper/listeners/InteractionListener.html     |   76 +-
 .../applib/index/services/xactn/TransactionId.html |   76 +-
 .../index/services/xactn/TransactionService.html   |   76 +-
 .../index/services/xactn/TransactionState.html     |   76 +-
 .../services/xactn/TransactionalProcessor.html     |   86 +-
 .../TransactionService_010-implementation.html     |   76 +-
 .../TransactionService_020-examples-and-usage.html |   76 +-
 .../TransactionalProcessor_010-implementation.html |   76 +-
 ...nsactionalProcessor_020-examples-and-usage.html |   76 +-
 .../applib/index/services/xml/XmlService.html      |   82 +-
 .../xml/hooks/XmlService_010-implementation.html   |   76 +-
 .../hooks/XmlService_020-examples-and-usage.html   |   76 +-
 .../services/xmlsnapshot/XmlSnapshotService.html   |   82 +-
 .../xmlsnapshot/XmlSnapshotService~Snapshot.html   |   76 +-
 .../XmlSnapshotService~Snapshot~Builder.html       |   80 +-
 .../XmlSnapshotService_010-implementation.html     |   76 +-
 .../XmlSnapshotService_020-examples-and-usage.html |   76 +-
 .../snapshot/SnapshottableWithInclusions.html      |   76 +-
 .../applib/index/spec/AbstractSpecification.html   |   78 +-
 .../applib/index/spec/AbstractSpecification2.html  |   80 +-
 .../latest/applib/index/spec/Specification.html    |   76 +-
 .../latest/applib/index/spec/Specification2.html   |   76 +-
 .../latest/applib/index/spec/SpecificationAnd.html |   80 +-
 .../latest/applib/index/spec/SpecificationNot.html |   80 +-
 .../latest/applib/index/spec/SpecificationOr.html  |   80 +-
 .../latest/applib/index/types/DescriptionType.html |   76 +-
 .../applib/index/types/MemberIdentifierType.html   |   76 +-
 .../applib/index/types/TargetActionType.html       |   76 +-
 .../latest/applib/index/types/TargetClassType.html |   76 +-
 .../refguide/latest/applib/index/util/Enums.html   |   83 +-
 .../latest/applib/index/util/Equality.html         |   76 +-
 .../refguide/latest/applib/index/util/Hashing.html |   76 +-
 .../latest/applib/index/util/JaxbUtil.html         |   86 +-
 .../latest/applib/index/util/ObjectContracts.html  |   78 +-
 .../latest/applib/index/util/ReasonBuffer.html     |   80 +-
 .../latest/applib/index/util/ReasonBuffer2.html    |   94 +-
 .../refguide/latest/applib/index/util/Reasons.html |   78 +-
 .../latest/applib/index/util/TitleBuffer.html      |  114 +-
 .../applib/index/util/TitleBufferException.html    |   82 +-
 .../latest/applib/index/util/ToString.html         |   76 +-
 .../latest/applib/index/util/ZipReader.html        |   80 +-
 .../latest/applib/index/util/ZipWriter.html        |   76 +-
 .../applib/index/util/hooks/Enums_examples.html    |   76 +-
 .../hooks/ObjectContracts_examples-and-usage.html  |   78 +-
 .../applib/index/util/schema/ChangesDtoUtils.html  |   88 +-
 .../applib/index/util/schema/CommandDtoUtils.html  |  102 +-
 .../applib/index/util/schema/CommonDtoUtils.html   |  108 +-
 .../index/util/schema/InteractionDtoUtils.html     |  125 +-
 .../index/util/schema/MemberExecutionDtoUtils.html |   92 +-
 .../refguide/latest/applib/index/value/Blob.html   |   96 +-
 .../refguide/latest/applib/index/value/Clob.html   |   82 +-
 .../latest/applib/index/value/HasHtml.html         |  977 -----
 .../applib/index/value/LocalResourcePath.html      |   84 +-
 .../refguide/latest/applib/index/value/Markup.html |  110 +-
 .../applib/index/value/NamedWithMimeType.html      |   76 +-
 .../latest/applib/index/value/OpenUrlStrategy.html |   76 +-
 .../latest/applib/index/value/Password.html        |   80 +-
 .../applib/index/value/hooks/Blob_usage-notes.html |   76 +-
 .../applib/index/value/hooks/Clob_usage-notes.html |   76 +-
 .../applib/index/value/semantics/Converter.html    |  987 +++++
 .../index/value/semantics/DefaultsProvider.html    | 1025 +++++
 .../index/value/semantics/OrderRelation.html       | 1048 +++++
 .../applib/index/value/semantics/Parser.html       | 1105 +++++
 .../index/value/semantics/ParsingException.html    |  989 +++++
 .../applib/index/value/semantics/Renderer.html     | 1005 +++++
 .../value/semantics/ValueSemanticsAbstract.html    | 1011 +++++
 .../value/semantics/ValueSemanticsProvider.html    | 1151 ++++++
 .../value/semantics/ValueSemanticsResolver.html    |  982 +++++
 .../latest/commons/index/btree/Compound.html       | 1012 +++++
 .../latest/commons/index/btree/FunCompound.html    | 1014 +++++
 .../latest/commons/index/collections/Can.html      |  239 +-
 .../commons/index/collections/Cardinality.html     |   76 +-
 .../latest/commons/index/functional/Result.html    |  108 +-
 .../index/resource/ResourceCoordinates.html        |   80 +-
 content/refguide/latest/config/about.html          |   76 +-
 .../application-specific/application-css.html      |   76 +-
 .../latest/config/section-hooks/Other~post.html    |   76 +-
 .../latest/config/section-hooks/Other~pre.html     |   76 +-
 .../config/section-hooks/datanucleus~post.html     |   76 +-
 .../config/section-hooks/datanucleus~pre.html      |   76 +-
 .../config/section-hooks/eclipselink~post.html     |   76 +-
 .../config/section-hooks/eclipselink~pre.html      |   76 +-
 .../config/section-hooks/isis.applib~post.html     |   76 +-
 .../config/section-hooks/isis.applib~pre.html      |   76 +-
 .../section-hooks/isis.core.config~post.html       |   76 +-
 .../config/section-hooks/isis.core.config~pre.html |   76 +-
 .../isis.core.meta-model.introspector~post.html    |   76 +-
 .../isis.core.meta-model.introspector~pre.html     |   76 +-
 .../isis.core.meta-model.validator~post.html       |   76 +-
 .../isis.core.meta-model.validator~pre.html        |   76 +-
 .../section-hooks/isis.core.meta-model~post.html   |   76 +-
 .../section-hooks/isis.core.meta-model~pre.html    |   76 +-
 .../isis.core.runtime-services~post.html           |   76 +-
 .../isis.core.runtime-services~pre.html            |   76 +-
 .../section-hooks/isis.core.runtime~post.html      |   76 +-
 .../section-hooks/isis.core.runtime~pre.html       |   76 +-
 .../config/section-hooks/isis.extensions~post.html |   76 +-
 .../config/section-hooks/isis.extensions~pre.html  |   76 +-
 .../config/section-hooks/isis.incubator~post.html  |   76 +-
 .../config/section-hooks/isis.incubator~pre.html   |   76 +-
 .../config/section-hooks/isis.legacy~post.html     |   76 +-
 .../config/section-hooks/isis.legacy~pre.html      |   76 +-
 .../config/section-hooks/isis.mappings~post.html   |   76 +-
 .../config/section-hooks/isis.mappings~pre.html    |   76 +-
 .../isis.persistence.schema~post.html              |   76 +-
 .../section-hooks/isis.persistence.schema~pre.html |   76 +-
 .../section-hooks/isis.security.keycloak~post.html |   76 +-
 .../section-hooks/isis.security.keycloak~pre.html  |   76 +-
 .../section-hooks/isis.security.shiro~post.html    |   76 +-
 .../section-hooks/isis.security.shiro~pre.html     |   76 +-
 .../section-hooks/isis.security.spring~post.html   |   76 +-
 .../section-hooks/isis.security.spring~pre.html    |   76 +-
 .../config/section-hooks/isis.subdomains~post.html |   76 +-
 .../config/section-hooks/isis.subdomains~pre.html  |   76 +-
 .../config/section-hooks/isis.testing~post.html    |   76 +-
 .../config/section-hooks/isis.testing~pre.html     |   76 +-
 .../section-hooks/isis.value-types~post.html       |   76 +-
 .../config/section-hooks/isis.value-types~pre.html |   76 +-
 .../isis.viewer.restfulobjects~post.html           |   76 +-
 .../isis.viewer.restfulobjects~pre.html            |   76 +-
 .../section-hooks/isis.viewer.wicket~post.html     |   76 +-
 .../section-hooks/isis.viewer.wicket~pre.html      |   76 +-
 .../latest/config/section-hooks/resteasy~post.html |   76 +-
 .../latest/config/section-hooks/resteasy~pre.html  |   76 +-
 .../latest/config/section-hooks/spring~post.html   |   76 +-
 .../latest/config/section-hooks/spring~pre.html    |   76 +-
 content/refguide/latest/config/sections/Other.html |   82 +-
 .../latest/config/sections/datanucleus.html        |   76 +-
 .../latest/config/sections/eclipselink.html        |   76 +-
 .../latest/config/sections/isis.applib.html        |   86 +-
 .../latest/config/sections/isis.core.config.html   |   76 +-
 .../config/sections/isis.core.meta-model.html      |   76 +-
 .../isis.core.meta-model.introspector.html         |   89 +-
 .../sections/isis.core.meta-model.validator.html   |  107 +-
 .../sections/isis.core.runtime-services.html       |   76 +-
 .../latest/config/sections/isis.core.runtime.html  |   76 +-
 .../latest/config/sections/isis.extensions.html    |   80 +-
 .../latest/config/sections/isis.legacy.html        |   87 +-
 .../config/sections/isis.persistence.schema.html   |   76 +-
 .../config/sections/isis.security.keycloak.html    |   76 +-
 .../config/sections/isis.security.shiro.html       |   76 +-
 .../config/sections/isis.security.spring.html      |   76 +-
 .../latest/config/sections/isis.testing.html       |   86 +-
 .../latest/config/sections/isis.value-types.html   |   87 +-
 .../sections/isis.viewer.restfulobjects.html       |   76 +-
 .../latest/config/sections/isis.viewer.wicket.html |  132 +-
 .../refguide/latest/config/sections/resteasy.html  |   76 +-
 .../DataSourceIntrospectionService.html            |   76 +-
 .../services/command/CommandDtoFactory.html        |   84 +-
 .../services/ixn/InteractionDtoFactory.html        |   82 +-
 .../services/publishing/CommandPublisher.html      |   76 +-
 .../services/publishing/ExecutionPublisher.html    |   76 +-
 .../services/schema/SchemaValueMarshaller.html     | 1178 ++++++
 .../tablecol/TableColumnOrderServiceDefault.html   |   80 +-
 .../TableColumnOrderServiceUsingTxtFile.html       |   80 +-
 .../publish/ObjectLifecyclePublisherDefault.html   |   92 +-
 .../transaction/TransactionServiceSpring.html      |   86 +-
 .../runtimeservices/xml/XmlServiceDefault.html     |   82 +-
 .../authentication/AuthenticationRequest.html      |   76 +-
 .../security/authentication/Authenticator.html     |   76 +-
 .../index/security/authorization/Authorizor.html   |   76 +-
 .../manager/AuthorizationManager.html              |   82 +-
 .../authorization/manager/AuthorizorChooser.html   |   78 +-
 .../changetracking/EntityChangeTracker.html        |   76 +-
 .../changetracking/EntityChangesPublisher.html     |   76 +-
 .../EntityPropertyChangePublisher.html             |   76 +-
 .../events/TransactionAfterCompletionEvent.html    |   76 +-
 .../ImpersonatedUserHolderUsingHttpSession.html    |   78 +-
 .../commandlog/jdo/CommandSubscriberForJdo.html    |   76 +-
 .../commandlog/jdo/IsisModuleExtCommandLogJdo.html |   76 +-
 .../jdo/mixins/HasInteractionId_command.html       |   76 +-
 .../mixins/HasUsername_recentCommandsByUser.html   |   78 +-
 .../jdo/mixins/Object_recentCommands.html          |   76 +-
 .../commandlog/jdo/ui/CommandServiceMenu.html      |   80 +-
 .../commandlog/jpa/IsisModuleExtCommandLogJpa.html |   76 +-
 .../primary/IsisModuleExtCommandReplayPrimary.html |   76 +-
 .../primary/config/PrimaryConfig.html              |   78 +-
 .../primary/mixins/Object_openOnSecondary.html     |   76 +-
 .../primary/restapi/CommandRetrievalService.html   |   78 +-
 .../primary/ui/CommandReplayOnPrimaryService.html  |  143 +-
 .../IsisModuleExtCommandReplaySecondary.html       |   80 +-
 .../commandreplay/secondary/SecondaryStatus.html   |   76 +-
 .../secondary/analyser/CommandReplayAnalyser.html  |   78 +-
 .../analyser/CommandReplayAnalyserException.html   |   78 +-
 .../analyser/CommandReplayAnalyserResult.html      |   78 +-
 .../analysis/CommandReplayAnalysisService.html     |   78 +-
 .../secondary/config/SecondaryConfig.html          |   78 +-
 .../secondary/fetch/CommandFetcher.html            |   78 +-
 .../secondary/job/ReplicateAndReplayJob.html       |   78 +-
 .../secondary/job/SecondaryStatusData.html         |   82 +-
 .../jobcallables/ReplicateAndRunCommands.html      |   76 +-
 .../secondary/mixins/CommandJdo_replayQueue.html   |   76 +-
 .../secondary/mixins/CommandModel_exclude.html     |   76 +-
 .../secondary/mixins/Object_openOnPrimary.html     |   76 +-
 .../spi/ReplayCommandExecutionController.html      |   76 +-
 .../ui/CommandReplayOnSecondaryService.html        |   78 +-
 .../index/cors/impl/IsisModuleExtCors.html         |   78 +-
 .../fullcalendar/applib/CalendarEventable.html     |   78 +-
 .../index/fullcalendar/applib/Calendarable.html    |   82 +-
 .../applib/IsisModuleExtFullCalendarApplib.html    |   76 +-
 .../spi/CalendarableDereferencingService.html      |   78 +-
 .../fullcalendar/applib/value/CalendarEvent.html   |   96 +-
 .../ui/component/IsisModuleExtFullCalendarUi.html  |   76 +-
 .../hsqldbmgr/dom/IsisModuleExtHsqldbMgr.html      |   76 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.html  |   76 +-
 .../applib/IsisModuleExtJaxRsClientApplib.html     |   76 +-
 .../jaxrsclient/applib/client/JaxRsClient.html     |   76 +-
 .../jaxrsclient/applib/client/JaxRsResponse.html   |   78 +-
 .../index/quartz/IsisModuleExtQuartzImpl.html      |   76 +-
 .../index/quartz/context/JobExecutionData.html     |   78 +-
 .../spring/AutowiringSpringBeanJobFactory.html     |   78 +-
 .../restclient/ActionParameterListBuilder.html     |   76 +-
 .../index/restclient/IsisModuleExtRestClient.html  |   76 +-
 .../index/restclient/ResponseDigest.html           |   82 +-
 .../extensions/index/restclient/RestfulClient.html |   80 +-
 .../index/restclient/RestfulClientConfig.html      |   76 +-
 .../index/restclient/RestfulClientException.html   |   82 +-
 .../index/restclient/auth/BasicAuthFilter.html     |   76 +-
 .../restclient/log/ClientConversationFilter.html   |   76 +-
 .../restclient/log/ClientConversationLogger.html   |   76 +-
 .../secman/applib/IsisModuleExtSecmanApplib.html   |   76 +-
 .../index/secman/applib/SecmanConfiguration.html   | 1040 -----
 .../permission/dom/ApplicationPermission.html      |   80 +-
 .../permission/dom/ApplicationPermissionMode.html  |   76 +-
 .../dom/ApplicationPermissionRepository.html       |   78 +-
 .../permission/dom/ApplicationPermissionRule.html  |   76 +-
 .../permission/dom/ApplicationPermissionValue.html |   86 +-
 .../dom/ApplicationPermissionValueSet.html         |   84 +-
 .../spi/PermissionsEvaluationService.html          |   78 +-
 .../spi/PermissionsEvaluationServiceAbstract.html  |  977 -----
 ...PermissionsEvaluationServiceAllowBeatsVeto.html | 1004 -----
 ...PermissionsEvaluationServiceVetoBeatsAllow.html | 1004 -----
 .../secman/applib/role/dom/ApplicationRole.html    |   80 +-
 .../applib/role/dom/ApplicationRoleRepository.html |   78 +-
 .../AbstractRoleAndPermissionsFixtureScript.html   |   76 +-
 .../seed/IsisAppFeatureRoleAndPermissions.html     |   76 +-
 .../seed/IsisConfigurationRoleAndPermissions.html  |   76 +-
 ...sExtCommandReplayPrimaryRoleAndPermissions.html |   76 +-
 ...xtCommandReplaySecondaryRoleAndPermissions.html |   76 +-
 .../seed/IsisExtH2ConsoleRoleAndPermissions.html   |   76 +-
 .../seed/IsisExtSecmanAdminRoleAndPermissions.html |   80 +-
 ...IsisExtSecmanRegularUserRoleAndPermissions.html |   78 +-
 ...sPersistenceJdoMetaModelRoleAndPermissions.html |   76 +-
 .../IsisSudoImpersonateRoleAndPermissions.html     |   76 +-
 ...werRestfulObjectsSwaggerRoleAndPermissions.html |   76 +-
 .../applib/seed/SeedSecurityModuleService.html     |   78 +-
 .../scripts/SeedUsersAndRolesFixtureScript.html    |   76 +-
 .../applib/tenancy/dom/ApplicationTenancy.html     |   81 +-
 .../tenancy/dom/ApplicationTenancyRepository.html  |   96 +-
 .../index/secman/applib/tenancy/dom/HasAtPath.html |   76 +-
 .../secman/applib/tenancy/seed/GlobalTenancy.html  |   76 +-
 .../tenancy/spi/ApplicationTenancyEvaluator.html   |   76 +-
 .../index/secman/applib/user/dom/AccountType.html  |   76 +-
 .../secman/applib/user/dom/ApplicationUser.html    |   80 +-
 .../applib/user/dom/ApplicationUserRepository.html |   76 +-
 .../applib/user/dom/ApplicationUserStatus.html     |   78 +-
 .../applib/user/events/UserCreatedEvent.html       |   76 +-
 .../AbstractUserAndRolesFixtureScript.html         |   84 +-
 .../index/secman/applib/user/menu/MeService.html   |   77 +-
 .../applib/user/seed/IsisExtSecmanAdminUser.html   |   78 +-
 .../applib/user/spi/PasswordEncryptionService.html |  978 -----
 .../IsisModuleExtSecmanEncryptionJbcrypt.html      |   76 +-
 .../services/PasswordEncoderUsingJBcrypt.html      |  980 +++++
 .../PasswordEncryptionServiceUsingJBcrypt.html     |  978 -----
 .../IsisModuleExtSecmanEncryptionSpring.html       |  996 +++++
 .../IsisModuleExtSecmanIntegration.html            |   76 +-
 .../authenticator/AuthenticatorSecman.html         |   83 +-
 .../AuthenticatorSecmanAutoConfiguration.html      |   78 +-
 .../integration/authorizor/AuthorizorSecman.html   |   80 +-
 .../PermissionsEvaluationServiceForSecman.html     |  980 +++++
 .../userreg/UserRegistrationServiceForSecman.html  |   84 +-
 .../jdo/IsisModuleExtSecmanPersistenceJdo.html     |   76 +-
 .../jpa/IsisModuleExtSecmanPersistenceJpa.html     |   76 +-
 .../shiro/IsisModuleExtSecmanRealmShiro.html       |   76 +-
 .../shiro/IsisModuleExtSecmanShiroRealm.html       |   80 +-
 .../index/secman/shiro/util/ShiroUtils.html        |   76 +-
 .../realm/impl/IsisLdapContextFactory.html         |   76 +-
 .../shirorealmldap/realm/impl/IsisLdapRealm.html   |  115 +-
 .../impl/IsisModuleExtShiroRealmLdapImpl.html      |   76 +-
 .../oauth2/IsisModuleExtSpringSecurityOAuth2.html  |   76 +-
 .../ui/IsisModuleExtExcelDownloadUi.html           |   76 +-
 .../ui/components/CollectionContentsAsExcel.html   |  985 -----
 .../CollectionContentsAsExcelFactory.html          |   82 +-
 .../pdfjs/applib/annotations/PdfJsViewer.html      |   76 +-
 .../wicket/pdfjs/applib/config/PdfJsConfig.html    |   88 +-
 .../viewer/wicket/pdfjs/applib/config/Scale.html   |   80 +-
 .../pdfjs/applib/spi/PdfJsViewerAdvisor.html       |   84 +-
 .../wicket/pdfjs/ui/IsisModuleExtPdfjsUi.html      |   76 +-
 .../jdo/applib/IsisModulePersistenceJdoApplib.html |   76 +-
 .../jdo/applib/services/JdoSupportService.html     |   84 +-
 .../JdoSupportService_010-examples-and-usage.html  |   76 +-
 .../index/jdo/applib/types/AddressLine.html        |   76 +-
 .../index/jdo/applib/types/Description.html        |   76 +-
 .../persistence/index/jdo/applib/types/Email.html  |   76 +-
 .../persistence/index/jdo/applib/types/Fqcn.html   |   76 +-
 .../index/jdo/applib/types/LogicalTypeName.html    |   76 +-
 .../persistence/index/jdo/applib/types/Money.html  |   76 +-
 .../persistence/index/jdo/applib/types/Name.html   |   76 +-
 .../persistence/index/jdo/applib/types/Notes.html  |   76 +-
 .../index/jdo/applib/types/ObjectIdentifier.html   |   76 +-
 .../index/jdo/applib/types/Percentage.html         |   76 +-
 .../index/jdo/applib/types/PhoneNumber.html        |   76 +-
 .../index/jdo/applib/types/PostalCode.html         |   76 +-
 .../index/jdo/applib/types/ProperName.html         |   76 +-
 .../index/jdo/applib/types/Reference.html          |   76 +-
 .../persistence/index/jdo/applib/types/Title.html  |   76 +-
 .../index/jdo/applib/types/UrlTemplate.html        |   76 +-
 .../index/jdo/applib/types/Username.html           |   76 +-
 .../IsisModulePersistenceJdoDatanucleus.html       |   84 +-
 .../changetracking/JdoLifecycleListener.html       |   84 +-
 .../jdo/datanucleus/dialect/DnJdoDialect.html      |   76 +-
 .../mixins/Persistable_datanucleusVersionLong.html |   76 +-
 .../Persistable_datanucleusVersionTimestamp.html   |   76 +-
 .../mixins/Persistable_downloadJdoMetadata.html    |   78 +-
 .../applib/IsisBookmarkConverter.html              |   80 +-
 .../applib/IsisLocalResourcePathConverter.html     |   80 +-
 .../typeconverters/applib/IsisMarkupConverter.html |   80 +-
 .../applib/IsisPasswordConverter.html              |   80 +-
 .../JavaAwtBufferedImageByteArrayConverter.html    |   76 +-
 .../schema/v2/IsisChangesDtoConverter.html         |   80 +-
 .../schema/v2/IsisCommandDtoConverter.html         |   80 +-
 .../schema/v2/IsisInteractionDtoConverter.html     |   80 +-
 .../schema/v2/IsisOidDtoConverter.html             |   80 +-
 .../time/IsoOffsetTimeConverter.html               |   80 +-
 .../time/IsoZonedDateTimeConverter.html            |   80 +-
 .../applib/ByteArrayBlobRdbmsMapping.html          |   76 +-
 .../valuetypes/applib/IsisBlobMapping.html         |   76 +-
 .../valuetypes/applib/IsisClobMapping.html         |   76 +-
 .../changetracking/EntityChangeTrackerJdo.html     |   96 +-
 .../jpa/applib/integration/IsisEntityListener.html |   90 +-
 .../jpa/applib/services/JpaSupportService.html     |   78 +-
 .../index/jpa/applib/types/BlobJpaEmbeddable.html  |   80 +-
 .../index/jpa/applib/types/ClobJpaEmbeddable.html  |   80 +-
 .../IsisModulePersistenceJpaEclipselink.html       |   76 +-
 .../PersistenceMetricsServiceJpa.html              |   76 +-
 .../JavaAwtBufferedImageByteArrayConverter.html    |   76 +-
 content/refguide/latest/schema/about.html          |   76 +-
 content/refguide/latest/schema/aim.html            |   76 +-
 content/refguide/latest/schema/chg.html            |   76 +-
 content/refguide/latest/schema/cmd.html            |   76 +-
 content/refguide/latest/schema/common.html         |   76 +-
 .../latest/schema/index/IsisModuleSchema.html      |   76 +-
 content/refguide/latest/schema/ixn.html            |   76 +-
 content/refguide/latest/schema/mml.html            |   76 +-
 .../index/bypass/IsisModuleSecurityBypass.html     |   76 +-
 .../bypass/authentication/AuthenticatorBypass.html |   80 +-
 .../bypass/authorization/AuthorizorBypass.html     |   80 +-
 .../index/keycloak/IsisModuleSecurityKeycloak.html |   78 +-
 .../index/shiro/IsisModuleSecurityShiro.html       |   76 +-
 .../shiro/authentication/AuthenticatorShiro.html   |   82 +-
 .../index/shiro/authorization/AuthorizorShiro.html |   80 +-
 .../index/shiro/authorization/IsisPermission.html  |   76 +-
 .../authorization/IsisPermissionResolver.html      |   76 +-
 .../index/shiro/webmodule/WebModuleShiro.html      |   80 +-
 .../index/spring/IsisModuleSecuritySpring.html     |   76 +-
 .../authconverters/AuthenticationConverter.html    |   78 +-
 .../spring/authentication/AuthenticatorSpring.html |   82 +-
 .../spring/webmodule/SpringSecurityFilter.html     |   78 +-
 .../spring/webmodule/WebModuleSpringSecurity.html  |   76 +-
 .../subdomains/index/base/applib/Chained.html      |   76 +-
 .../latest/subdomains/index/base/applib/Dflt.html  |   78 +-
 .../applib/IsisModuleSubdomainsBaseApplib.html     |   76 +-
 .../subdomains/index/base/applib/PowerType.html    |   76 +-
 .../subdomains/index/base/applib/Titled.html       |   76 +-
 .../subdomains/index/base/applib/TitledEnum.html   |   76 +-
 .../base/applib/services/BaseServicesModule.html   |   76 +-
 .../applib/services/calendar/CalendarService.html  |   88 +-
 .../index/base/applib/types/AddressLine.html       |   76 +-
 .../index/base/applib/types/Description.html       |   76 +-
 .../subdomains/index/base/applib/types/Email.html  |   76 +-
 .../subdomains/index/base/applib/types/Fqcn.html   |   76 +-
 .../index/base/applib/types/LogicalTypeName.html   |   76 +-
 .../subdomains/index/base/applib/types/Money.html  |   76 +-
 .../subdomains/index/base/applib/types/Name.html   |   76 +-
 .../subdomains/index/base/applib/types/Notes.html  |   76 +-
 .../index/base/applib/types/ObjectIdentifier.html  |   76 +-
 .../index/base/applib/types/Percentage.html        |   76 +-
 .../index/base/applib/types/PhoneNumber.html       |   76 +-
 .../index/base/applib/types/PostalCode.html        |   76 +-
 .../index/base/applib/types/ProperName.html        |   76 +-
 .../index/base/applib/types/Reference.html         |   76 +-
 .../subdomains/index/base/applib/types/Title.html  |   76 +-
 .../index/base/applib/types/UrlTemplate.html       |   76 +-
 .../index/base/applib/types/Username.html          |   76 +-
 .../index/base/applib/utils/ClassUtils.html        |   78 +-
 .../index/base/applib/utils/JodaPeriodUtils.html   |   82 +-
 .../index/base/applib/utils/MathUtils.html         |   86 +-
 .../index/base/applib/utils/MessageUtils.html      |   78 +-
 .../index/base/applib/utils/StringUtils.html       |   86 +-
 .../index/base/applib/utils/TitleBuilder.html      |  147 +-
 .../base/applib/valuetypes/AbstractInterval.html   |   94 +-
 .../base/applib/valuetypes/LocalDateInterval.html  |   90 +-
 .../index/base/applib/valuetypes/VT.html           |   76 +-
 .../index/base/applib/with/WithCodeComparable.html |   76 +-
 .../index/base/applib/with/WithCodeGetter.html     |   76 +-
 .../index/base/applib/with/WithCodeUnique.html     |   76 +-
 .../applib/with/WithDescriptionComparable.html     |   76 +-
 .../base/applib/with/WithDescriptionGetter.html    |   76 +-
 .../base/applib/with/WithDescriptionUnique.html    |   76 +-
 .../index/base/applib/with/WithInterval.html       |   76 +-
 .../base/applib/with/WithIntervalContiguous.html   |   76 +-
 .../base/applib/with/WithIntervalMutable.html      |   80 +-
 .../index/base/applib/with/WithNameComparable.html |   76 +-
 .../index/base/applib/with/WithNameGetter.html     |   76 +-
 .../index/base/applib/with/WithNameUnique.html     |   76 +-
 .../base/applib/with/WithReferenceComparable.html  |   76 +-
 .../base/applib/with/WithReferenceGetter.html      |   76 +-
 .../base/applib/with/WithReferenceUnique.html      |   76 +-
 .../index/base/applib/with/WithSequence.html       |   76 +-
 .../index/base/applib/with/WithStartDate.html      |   76 +-
 .../base/applib/with/WithTitleComparable.html      |   76 +-
 .../index/base/applib/with/WithTitleGetter.html    |   76 +-
 .../index/base/applib/with/WithTitleUnique.html    |   76 +-
 .../subdomains/index/docx/applib/DocxService.html  |   90 +-
 .../index/docx/applib/DocxService~MergeParams.html |   76 +-
 .../applib/IsisModuleSubdomainsExcelApplib.html    |   76 +-
 .../index/excel/applib/dom/AggregationType.html    |   76 +-
 .../excel/applib/dom/ExcelMetaDataEnabled.html     |   80 +-
 .../index/excel/applib/dom/ExcelService.html       |  120 +-
 .../index/excel/applib/dom/HyperLink.html          |   76 +-
 .../index/excel/applib/dom/PivotColumn.html        |   76 +-
 .../index/excel/applib/dom/PivotDecoration.html    |   76 +-
 .../index/excel/applib/dom/PivotRow.html           |   76 +-
 .../index/excel/applib/dom/PivotValue.html         |   76 +-
 .../index/excel/applib/dom/RowHandler.html         |   76 +-
 .../index/excel/applib/dom/WorksheetContent.html   |   78 +-
 .../index/excel/applib/dom/WorksheetSpec.html      |   90 +-
 .../excel/applib/dom/util/AnnotationList.html      |  978 -----
 .../excel/applib/dom/util/AnnotationTriplet.html   |  980 -----
 .../applib/dom/util/ExcelFileBlobConverter.html    |  978 -----
 .../excel/applib/dom/util/ExcelServiceImpl.html    | 1190 ------
 .../index/excel/applib/dom/util/Mode.html          | 1021 -----
 .../index/excel/applib/dom/util/PivotUtils.html    |  982 -----
 .../index/excel/applib/dom/util/SheetPivoter.html  | 1035 -----
 .../index/excel/applib/util/AnnotationList.html    |  980 +++++
 .../index/excel/applib/util/AnnotationTriplet.html |  982 +++++
 .../excel/applib/util/ExcelFileBlobConverter.html  |  980 +++++
 .../subdomains/index/excel/applib/util/Mode.html   | 1023 +++++
 .../index/excel/applib/util/PivotUtils.html        |  984 +++++
 .../index/excel/applib/util/SheetPivoter.html      | 1037 +++++
 .../index/excel/testing/ExcelFixture.html          |   86 +-
 .../index/excel/testing/ExcelFixture2.html         |   78 +-
 .../excel/testing/ExcelFixtureRowHandler.html      |   78 +-
 .../excel/testing/ExcelFixtureWorkbookHandler.html |   78 +-
 .../excel/testing/FixtureAwareRowHandler.html      |   76 +-
 .../testing/IsisModuleSubdomainsExcelTesting.html  |   76 +-
 .../applib/IsisModuleSubdomainsSpringApplib.html   |   76 +-
 .../spring/applib/service/BeanDescriptor.html      |   78 +-
 .../index/spring/applib/service/ContextBeans.html  |   78 +-
 .../spring/applib/service/SpringBeansService.html  |   78 +-
 .../IsisModuleSubdomainsXDocReportApplib.html      |   76 +-
 .../index/xdocreport/applib/XDocReportService.html |  979 +++++
 .../applib/XDocReportService~XDocReportModel.html  |  979 +++++
 .../xdocreport/applib/service/OutputType.html      |  978 -----
 .../xdocreport/applib/service/XDocReportModel.html |  977 -----
 .../applib/service/XDocReportService.html          |  978 -----
 .../IsisModuleTestingArchTestSupportApplib.html    |   76 +-
 .../applib/classrules/ArchitectureDomainRules.html |  171 +-
 .../applib/classrules/ArchitectureJdoRules.html    |   80 +-
 .../applib/classrules/ArchitectureJpaRules.html    |   78 +-
 .../modulerules/ArchitectureModuleRules.html       |   80 +-
 .../applib/modulerules/Subpackage.html             |   76 +-
 .../applib/modulerules/SubpackageEnum.html         |   76 +-
 .../applib/IsisModuleTestingFakeDataApplib.html    |   76 +-
 .../services/AbstractRandomValueGenerator.html     |   78 +-
 .../index/fakedata/applib/services/Addresses.html  |   78 +-
 .../fakedata/applib/services/BigDecimals.html      |   80 +-
 .../fakedata/applib/services/BigIntegers.html      |   78 +-
 .../index/fakedata/applib/services/Books.html      |   78 +-
 .../index/fakedata/applib/services/Booleans.html   |   78 +-
 .../index/fakedata/applib/services/Bytes.html      |   82 +-
 .../index/fakedata/applib/services/Chars.html      |   80 +-
 .../fakedata/applib/services/Collections.html      |  132 +-
 .../index/fakedata/applib/services/Comms.html      |   78 +-
 .../fakedata/applib/services/CreditCards.html      |   78 +-
 .../index/fakedata/applib/services/Doubles.html    |   80 +-
 .../index/fakedata/applib/services/Enums.html      |   78 +-
 .../fakedata/applib/services/FakeDataService.html  |   78 +-
 .../index/fakedata/applib/services/Floats.html     |   80 +-
 .../index/fakedata/applib/services/Integers.html   |   82 +-
 .../index/fakedata/applib/services/IsisBlobs.html  |   78 +-
 .../index/fakedata/applib/services/IsisClobs.html  |   78 +-
 .../fakedata/applib/services/IsisPasswords.html    |   80 +-
 .../fakedata/applib/services/JavaSqlDates.html     |   84 +-
 .../applib/services/JavaSqlTimestamps.html         |   84 +-
 .../applib/services/JavaTimeDateTimes.html         |   84 +-
 .../applib/services/JavaTimeLocalDates.html        |   84 +-
 .../fakedata/applib/services/JavaTimePeriods.html  |   90 +-
 .../fakedata/applib/services/JavaUtilDates.html    |   84 +-
 .../fakedata/applib/services/JodaDateTimes.html    |   84 +-
 .../fakedata/applib/services/JodaLocalDates.html   |   84 +-
 .../fakedata/applib/services/JodaPeriods.html      |   90 +-
 .../index/fakedata/applib/services/Longs.html      |   82 +-
 .../index/fakedata/applib/services/Lorem.html      |   78 +-
 .../index/fakedata/applib/services/Names.html      |   78 +-
 .../index/fakedata/applib/services/Shorts.html     |   82 +-
 .../index/fakedata/applib/services/Strings.html    |   84 +-
 .../index/fakedata/applib/services/Urls.html       |   78 +-
 .../index/fakedata/applib/services/Uuids.html      |   78 +-
 .../IsisIntegrationTestAbstractWithFixtures.html   |   76 +-
 .../applib/IsisModuleTestingFixturesApplib.html    |   76 +-
 .../applib/events/FixturesInstalledEvent.html      |   78 +-
 .../applib/events/FixturesInstallingEvent.html     |   78 +-
 .../applib/fixturescripts/ExecutionParameters.html |   76 +-
 .../fixturescripts/ExecutionParametersDefault.html |  146 +-
 .../fixturescripts/ExecutionParametersService.html |   78 +-
 .../applib/fixturescripts/FixtureResult.html       |   76 +-
 .../applib/fixturescripts/FixtureResultList.html   |   86 +-
 .../applib/fixturescripts/FixtureScript.html       |   82 +-
 .../FixtureScriptWithExecutionStrategy.html        |   76 +-
 .../applib/fixturescripts/FixtureScripts.html      |  242 +-
 .../FixtureScriptsSpecification.html               |   82 +-
 ...iptsSpecificationProviderAutoConfiguration.html |   78 +-
 .../FixtureScripts~MultipleExecutionStrategy.html  |   76 +-
 ...FixtureScripts~NonPersistedObjectsStrategy.html |   76 +-
 .../FixtureScript~ExecutionContext.html            |  178 +-
 ...ixtureScripts_020-configuration-properties.html |   76 +-
 .../applib/modules/ModuleWithFixtures.html         |   76 +-
 .../applib/modules/ModuleWithFixturesService.html  |   88 +-
 .../applib/personas/BuilderScriptAbstract.html     |   82 +-
 .../applib/personas/BuilderScriptWithResult.html   |   76 +-
 .../personas/BuilderScriptWithoutResult.html       |   76 +-
 .../applib/personas/PersonaWithBuilderScript.html  |   76 +-
 .../applib/personas/PersonaWithFinder.html         |   78 +-
 .../services/InitialFixtureScriptsInstaller.html   |   80 +-
 .../applib/setup/PersonaEnumPersistAll.html        |   80 +-
 .../teardown/jdo/TeardownFixtureJdoAbstract.html   |   76 +-
 .../h2console/ui/IsisModuleTestingH2ConsoleUi.html |   76 +-
 .../index/h2console/ui/services/H2ManagerMenu.html |   78 +-
 .../h2console/ui/webmodule/WebModuleH2Console.html |   80 +-
 .../applib/ExceptionRecognizerTranslate.html       |   78 +-
 .../applib/IsisIntegrationTestAbstract.html        |   76 +-
 .../applib/IsisInteractionHandler.html             |   76 +-
 .../IsisModuleTestingIntegTestSupportApplib.html   |   76 +-
 .../applib/annotation/InteractAs.html              | 1082 +++++
 .../applib/swagger/SwaggerExporter.html            |   80 +-
 .../applib/validate/DomainModelValidator.html      |  108 +-
 .../applib/IsisModuleTestingSpecSupportApplib.html |   76 +-
 .../integration/ObjectFactoryForIntegration.html   |   76 +-
 .../testing/index/specsupport/applib/specs/V.html  |  983 -----
 .../IsisModuleTestingUnitTestSupportApplib.html    |   76 +-
 .../applib/assertions/Asserting.html               |   76 +-
 .../applib/dom/AbstractApplyToAllContractTest.html |   76 +-
 .../ComparableContractTest_compareTo.html          |   76 +-
 .../dom/comparable/ComparableContractTester.html   |   76 +-
 .../applib/dom/pojo/PojoTester.html                |   82 +-
 .../sortedsets/SortedSetsContractTestAbstract.html |   76 +-
 .../dom/value/ValueTypeContractTestAbstract.html   |   76 +-
 .../unittestsupport/applib/io/IndentPrinter.html   |   76 +-
 .../unittestsupport/applib/io/NullPrintStream.html |   76 +-
 .../applib/jmocking/Imposterisers.html             |   76 +-
 .../applib/jmocking/InjectIntoJMockAction.html     |   80 +-
 .../applib/jmocking/IsisActions.html               |   80 +-
 .../applib/jmocking/JMockActions.html              |   80 +-
 .../applib/jmocking/JUnitRuleMockery2.html         |   88 +-
 .../applib/jmocking/PostponedAction.html           |   76 +-
 .../applib/matchers/ClassMatchers.html             |   82 +-
 .../applib/matchers/ComparableMatchers.html        |   78 +-
 .../applib/matchers/FileMatchers.html              |   78 +-
 .../applib/matchers/JaxbMatchers.html              |   78 +-
 .../applib/matchers/ListMatchers.html              |   86 +-
 .../applib/matchers/StringMatchers.html            |   82 +-
 .../applib/matchers/ThrowableMatchers.html         |   80 +-
 .../unittestsupport/applib/util/CollectUtils.html  |   78 +-
 .../unittestsupport/applib/util/FileUtils.html     |   94 +-
 .../unittestsupport/applib/util/InjectUtils.html   |   82 +-
 .../unittestsupport/applib/util/ReflectUtils.html  |   80 +-
 .../unittestsupport/applib/util/StringUtils.html   |   80 +-
 .../applib/IsisModuleValAsciidocApplib.html        |   76 +-
 .../asciidoc/applib/jaxb/AsciiDocJaxbAdapter.html  |   76 +-
 .../index/asciidoc/applib/value/AsciiDoc.html      |  110 +-
 .../metamodel/IsisModuleValAsciidocMetaModel.html  |   76 +-
 .../IsisModuleValAsciidocPersistenceJdoDn5.html    |   76 +-
 .../jdo/dn5/converters/IsisAsciiDocConverter.html  |   80 +-
 .../jpa/IsisModuleValAsciidocPersistenceJpa.html   |   76 +-
 .../jpa/converters/IsisAsciiDocConverter.html      |   80 +-
 .../ui/wkt/IsisModuleValAsciidocUiWkt.html         |   76 +-
 .../applib/IsisModuleValJodatimeApplib.html        |  978 +++++
 .../jodatime/applib/jaxb/JodaTimeJaxbAdapters.html |  978 +++++
 .../JodaTimeXMLGregorianCalendarMarshalling.html   |  986 +++++
 .../jodatime/applib/value/JodaTimeConverters.html  |  990 +++++
 .../IsisModuleValJodatimeIntegration.html          |  978 +++++
 .../applib/IsisModuleValMarkdownApplib.html        |   76 +-
 .../markdown/applib/jaxb/MarkdownJaxbAdapter.html  |   76 +-
 .../index/markdown/applib/value/Converter.html     |   76 +-
 .../index/markdown/applib/value/Markdown.html      |  991 +++++
 .../metamodel/IsisModuleValMarkdownMetaModel.html  |   76 +-
 .../IsisModuleValMarkdownPersistenceJdoDn5.html    |   76 +-
 .../jdo/dn5/converters/IsisMarkdownConverter.html  |   80 +-
 .../jpa/IsisModuleValMarkdownPersistenceJpa.html   |   76 +-
 .../jpa/converters/IsisMarkdownConverter.html      |   80 +-
 .../ui/wkt/IsisModuleValMarkdownUiWkt.html         |   76 +-
 .../index/sse/applib/IsisModuleValSseApplib.html   |   76 +-
 .../sse/applib/annotations/ServerSentEvents.html   |   76 +-
 .../index/sse/applib/annotations/SseSource.html    |   76 +-
 .../index/sse/applib/service/SseChannel.html       |   76 +-
 .../index/sse/applib/service/SseService.html       |   76 +-
 .../index/sse/ui/wkt/IsisModuleValSseUiWkt.html    |   76 +-
 .../sse/ui/wkt/services/SseServiceDefault.html     |   76 +-
 .../wkt/webmodule/WebModuleServerSentEvents.html   |   76 +-
 .../common/applib/mixins/Object_impersonate.html   |   80 +-
 .../applib/mixins/Object_impersonateWithRoles.html |   86 +-
 .../services/userprof/UserProfileUiModel.html      |   76 +-
 .../userprof/UserProfileUiModelProvider.html       |   76 +-
 ...rProfileUiModelProvider_010-implementation.html |   76 +-
 ...fileUiModelProvider_020-examples-and-usage.html |   76 +-
 .../IsisModuleViewerRestfulObjectsApplib.html      |   76 +-
 .../restfulobjects/applib/JsonRepresentation.html  |  400 +-
 .../restfulobjects/applib/LinkRepresentation.html  |   88 +-
 .../viewer/index/restfulobjects/applib/Rel.html    |  119 +-
 .../index/restfulobjects/applib/RelDefinition.html |   76 +-
 .../restfulobjects/applib/RepresentationType.html  |  160 +-
 .../restfulobjects/applib/RestfulHttpMethod.html   |   76 +-
 .../restfulobjects/applib/RestfulMediaType.html    |   76 +-
 .../restfulobjects/applib/RestfulRequest.html      |   80 +-
 .../restfulobjects/applib/RestfulResponse.html     |   82 +-
 .../applib/boot/BootstrapResource.html             |   76 +-
 .../AbstractObjectMemberRepresentation.html        |   78 +-
 .../domainobjects/ActionResultRepresentation.html  |   78 +-
 .../DomainObjectMemberRepresentation.html          |   78 +-
 .../domainobjects/DomainObjectRepresentation.html  |   84 +-
 .../applib/domainobjects/DomainObjectResource.html |  122 +-
 .../applib/domainobjects/DomainRepresentation.html |   82 +-
 .../domainobjects/DomainServiceResource.html       |  100 +-
 .../applib/domainobjects/ListRepresentation.html   |   78 +-
 .../domainobjects/ObjectActionRepresentation.html  |   78 +-
 .../ObjectCollectionRepresentation.html            |   78 +-
 .../ObjectPropertyRepresentation.html              |   78 +-
 .../domainobjects/ScalarValueRepresentation.html   |   78 +-
 .../AbstractTypeMemberRepresentation.html          |   78 +-
 .../ActionDescriptionRepresentation.html           |   78 +-
 .../ActionParameterDescriptionRepresentation.html  |   78 +-
 .../CollectionDescriptionRepresentation.html       |   78 +-
 .../domaintypes/DomainTypeRepresentation.html      |   78 +-
 .../applib/domaintypes/DomainTypeResource.html     |   92 +-
 .../PropertyDescriptionRepresentation.html         |   78 +-
 .../TypeActionResultRepresentation.html            |   78 +-
 .../applib/domaintypes/TypeListRepresentation.html |   78 +-
 .../applib/dtos/ScalarValueDtoV2.html              |   76 +-
 .../applib/errors/ErrorRepresentation.html         |   78 +-
 .../applib/health/HealthRepresentation.html        |   78 +-
 .../applib/health/HealthResource.html              |   76 +-
 .../applib/homepage/HomePageRepresentation.html    |   78 +-
 .../applib/homepage/HomePageResource.html          |   76 +-
 .../applib/menubars/MenuBarsResource.html          |   76 +-
 .../applib/user/UserRepresentation.html            |   78 +-
 .../restfulobjects/applib/user/UserResource.html   |   76 +-
 .../restfulobjects/applib/util/JsonMapper.html     |   86 +-
 .../restfulobjects/applib/util/JsonNodeUtils.html  |   82 +-
 .../restfulobjects/applib/util/MediaTypes.html     |   76 +-
 .../index/restfulobjects/applib/util/Parser.html   |   84 +-
 .../index/restfulobjects/applib/util/PathNode.html |   80 +-
 .../applib/util/UrlEncodingUtils.html              |   88 +-
 .../applib/version/VersionRepresentation.html      |   78 +-
 .../applib/version/VersionResource.html            |   76 +-
 ...isModuleViewerRestfulObjectsJaxrsResteasy4.html |   76 +-
 .../conneg/RestfulObjectsJaxbWriterForXml.html     |   76 +-
 .../webmodule/WebModuleJaxrsResteasy4.html         |   78 +-
 .../restfulobjects/rendering/IResourceContext.html |  120 +-
 .../IsisModuleRestfulObjectsRendering.html         |   76 +-
 .../rendering/service/RepresentationService.html   |   88 +-
 .../acceptheader/AcceptHeaderServiceForRest.html   |   76 +-
 .../service/conneg/ContentNegotiationService.html  |   76 +-
 .../conneg/ContentNegotiationServiceAbstract.html  |   86 +-
 ...entNegotiationServiceForRestfulObjectsV1_0.html |   94 +-
 .../ContentNegotiationServiceOrgApacheIsisV1.html  |   86 +-
 .../ContentNegotiationServiceOrgApacheIsisV2.html  |   90 +-
 .../ContentNegotiationServiceXRoDomainType.html    |   80 +-
 ...onServiceForRestfulObjectsV1_0_usage-notes.html |   76 +-
 ...otiationServiceOrgApacheIsisV1_usage-notes.html |   76 +-
 ...otiationServiceOrgApacheIsisV2_usage-notes.html |   76 +-
 ...egotiationServiceXRoDomainType_usage-notes.html |   76 +-
 .../service/swagger/SwaggerServiceMenu.html        |   87 +-
 .../IsisModuleViewerRestfulObjectsViewer.html      |   76 +-
 .../webmodule/auth/AuthenticationStrategy.html     |   76 +-
 .../auth/AuthenticationStrategyAbstract.html       |   78 +-
 .../auth/AuthenticationStrategyBasicAuth.html      |   78 +-
 .../auth/AuthenticationStrategyDefault.html        |   80 +-
 .../wicket/model/IsisModuleViewerWicketModel.html  |   76 +-
 .../index/wicket/ui/IsisModuleViewerWicketUi.html  |   76 +-
 .../viewer/IsisModuleViewerWicketViewer.html       |   76 +-
 .../wicket/viewer/mixins/Object_clearHints.html    |   76 +-
 .../relnotes/latest/2018/2.0.0-M1/mignotes.html    |   66 +-
 .../2018/2.0.0-M1/mignotes/legacy-modules.html     |   66 +-
 .../2018/2.0.0-M1/mignotes/meta-annotations.html   |   66 +-
 .../latest/2018/2.0.0-M1/mignotes/moved-types.html |   66 +-
 .../2018/2.0.0-M1/mignotes/other-changes.html      |   66 +-
 .../2.0.0-M1/mignotes/removed-annotations.html     |   66 +-
 .../mignotes/removed-configuration-properties.html |   66 +-
 .../2018/2.0.0-M1/mignotes/removed-types.html      |   66 +-
 .../2.0.0-M1/mignotes/updated-annotations.html     |   66 +-
 .../2018/2.0.0-M1/mignotes/updated-classes.html    |   66 +-
 .../relnotes/latest/2018/2.0.0-M1/relnotes.html    |   66 +-
 .../relnotes/latest/2019/2.0.0-M2/relnotes.html    |   66 +-
 .../relnotes/latest/2020/2.0.0-M3/mignotes.html    |   66 +-
 .../relnotes/latest/2020/2.0.0-M3/relnotes.html    |  476 ++-
 .../relnotes/latest/2020/2.0.0-M4/mignotes.html    |   66 +-
 .../relnotes/latest/2020/2.0.0-M4/relnotes.html    |  103 +-
 .../relnotes/latest/2021/2.0.0-M5/mignotes.html    |   66 +-
 .../relnotes/latest/2021/2.0.0-M5/relnotes.html    |  133 +-
 .../relnotes/latest/2021/2.0.0-M6/mignotes.html    |   73 +-
 .../relnotes/latest/2021/2.0.0-M6/relnotes.html    |  883 +++-
 .../relnotes/latest/2021/2.0.0-M7/mignotes.html    |  981 +++++
 .../relnotes/latest/2021/2.0.0-M7/relnotes.html    |  468 +++
 content/relnotes/latest/about.html                 |   96 +-
 content/security/latest/about.html                 |   66 +-
 content/security/latest/audit-trail/about.html     |   66 +-
 content/security/latest/bypass/about.html          |   70 +-
 content/security/latest/core/about.html            |   66 +-
 content/security/latest/keycloak/about.html        |   66 +-
 content/security/latest/secman/about.html          |   70 +-
 .../latest/secman/setting-up-with-shiro.html       |   66 +-
 content/security/latest/secman/setting-up.html     |   72 +-
 content/security/latest/session-log/about.html     |   66 +-
 .../security/latest/shiro-realm-ldap/about.html    |   66 +-
 .../latest/shiro-realm-ldap/ldap-realm.html        |   66 +-
 content/security/latest/shiro/about.html           |   70 +-
 content/security/latest/spring-oauth2/about.html   |   70 +-
 content/security/latest/spring/about.html          |   70 +-
 content/security/latest/usage-by-isis-viewers.html |   66 +-
 content/setupguide/latest/about.html               |   66 +-
 content/setupguide/latest/eclipse/about.html       |   66 +-
 content/setupguide/latest/intellij/about.html      |   66 +-
 .../setupguide/latest/intellij/hints-and-tips.html |   66 +-
 content/sitemap-comguide.xml                       |   34 +-
 content/sitemap-conguide.xml                       |   22 +-
 content/sitemap-core.xml                           |   32 +-
 content/sitemap-docs.xml                           |   64 +-
 content/sitemap-extensions.xml                     |    2 +-
 content/sitemap-incubator.xml                      |   14 +-
 content/sitemap-mappings.xml                       |   12 +-
 content/sitemap-pjdo.xml                           |   34 +-
 content/sitemap-pjpa.xml                           |   16 +-
 content/sitemap-refguide.xml                       | 2804 ++++++-------
 content/sitemap-relnotes.xml                       |   50 +-
 content/sitemap-security.xml                       |   30 +-
 content/sitemap-setupguide.xml                     |    8 +-
 content/sitemap-subdomains.xml                     |   22 +-
 content/sitemap-testing.xml                        |   30 +-
 content/sitemap-tooling.xml                        |    4 +-
 content/sitemap-tutorials.xml                      |   67 +
 content/sitemap-userguide.xml                      |  136 +-
 content/sitemap-valuetypes.xml                     |    8 +-
 content/sitemap-vro.xml                            |   40 +-
 content/sitemap-vw.xml                             |   62 +-
 content/sitemap.xml                                |    3 +
 content/subdomains/latest/about.html               |   66 +-
 content/subdomains/latest/base/about.html          |   72 +-
 content/subdomains/latest/docx/about.html          |   72 +-
 content/subdomains/latest/excel/about.html         |   66 +-
 content/subdomains/latest/freemarker/about.html    |   66 +-
 content/subdomains/latest/ognl/about.html          |   66 +-
 content/subdomains/latest/pdfbox/about.html        |   66 +-
 content/subdomains/latest/settings/about.html      |   66 +-
 content/subdomains/latest/spring/about.html        |   66 +-
 content/subdomains/latest/xdocreport/about.html    |   66 +-
 content/subdomains/latest/zip/about.html           |   66 +-
 content/testing/latest/about.html                  |   66 +-
 content/testing/latest/archtestsupport/about.html  |   94 +-
 content/testing/latest/fakedata/about.html         |   72 +-
 content/testing/latest/fixtures/about.html         |   72 +-
 .../fixtures/fixture-scripts/api-and-usage.html    |   66 +-
 .../fixture-scripts/maven-configuration.html       |   72 +-
 .../fixture-scripts/mocking-the-clock-or-user.html |   66 +-
 .../fixture-scripts/using-with-secman.html         |   66 +-
 content/testing/latest/h2console/about.html        |   72 +-
 content/testing/latest/hsqldbmgr/about.html        |   72 +-
 content/testing/latest/integtestsupport/about.html |   72 +-
 .../integtestsupport/domain-model-validator.html   |   66 +-
 .../latest/integtestsupport/swagger-exporter.html  |   66 +-
 content/testing/latest/specsupport/about.html      |   72 +-
 content/testing/latest/unittestsupport/about.html  |   72 +-
 content/tooling/latest/about.html                  |   66 +-
 content/tooling/latest/tooling-cli/about.html      |   66 +-
 content/tutorials/latest/about.html                |  601 +++
 content/tutorials/latest/index.html                |    9 +
 .../latest/petclinic/010-getting-started.html      |  949 +++++
 .../latest/petclinic/020-the-petclinic-domain.html |  709 ++++
 .../latest/petclinic/030-petowner-entity.html      | 1855 +++++++++
 .../tutorials/latest/petclinic/040-pet-entity.html | 1786 ++++++++
 .../latest/petclinic/050-visit-entity.html         |  977 +++++
 .../latest/petclinic/060-unit-testing.html         |  759 ++++
 .../tutorials/latest/petclinic/070-modularity.html |  793 ++++
 .../latest/petclinic/080-view-models.html          |  986 +++++
 .../latest/petclinic/090-integration-testing.html  |  838 ++++
 .../_images/03-03/refactor-updateName.png          |  Bin 0 -> 41437 bytes
 .../latest/petclinic/_images/03-10/fieldsets.png   |  Bin 0 -> 27298 bytes
 .../_images/04-07/download-layout-xml.png          |  Bin 0 -> 17163 bytes
 .../_images/Dashboard-overdue-ui-hints.png         |  Bin 0 -> 42774 bytes
 .../latest/petclinic/_images/Dashboard-overdue.png |  Bin 0 -> 49707 bytes
 .../latest/petclinic/_images/HelloWorldObject.png  |  Bin 0 -> 44720 bytes
 .../latest/petclinic/_images/HelloWorldObjects.png |  Bin 0 -> 20802 bytes
 .../petclinic/_images/Owner-name-updated.png       |  Bin 0 -> 5008 bytes
 .../latest/petclinic/_images/Owner-name.png        |  Bin 0 -> 3766 bytes
 .../latest/petclinic/_images/Owner-pets.png        |  Bin 0 -> 25561 bytes
 .../petclinic/_images/Owner-updateName-prompt.png  |  Bin 0 -> 6542 bytes
 .../_images/Owner-with-contact-details.png         |  Bin 0 -> 8719 bytes
 .../_images/Owners-create-with-phoneNumber.png     |  Bin 0 -> 15426 bytes
 .../_images/Pet-bookVisit-prompt-with-default.png  |  Bin 0 -> 45252 bytes
 .../_images/Pet-bookVisit-prompt-with-validate.png |  Bin 0 -> 39819 bytes
 .../petclinic/_images/Pet-bookVisit-prompt.png     |  Bin 0 -> 37767 bytes
 .../latest/petclinic/_images/Pet-icons.png         |  Bin 0 -> 31150 bytes
 .../petclinic/_images/Pet-visits-collection.png    |  Bin 0 -> 34249 bytes
 content/tutorials/latest/petclinic/_images/Pet.png |  Bin 0 -> 25482 bytes
 .../petclinic/_images/Visit-enterOutcome.png       |  Bin 0 -> 39463 bytes
 .../tutorials/latest/petclinic/_images/Visit.png   |  Bin 0 -> 26923 bytes
 .../_images/Visits-paid-strikethrough.png          |  Bin 0 -> 52925 bytes
 .../latest/petclinic/_images/dashboard.png         |  Bin 0 -> 19084 bytes
 ...ag-1083d8aaada0e637a3f1882a9e3121b9befe9abd.svg |   51 +
 ...ag-895851d16595df754f9ae531975067e40bc3f6cf.svg |   25 +
 ...ag-eaa9d52f1ae08b5e73724e105ad23df2795cf652.svg |   51 +
 ...ag-f2272669c17041f382689c565faa92a2c6ee5472.svg |   86 +
 .../extended-manifest-run-configuration.png        |  Bin 0 -> 47592 bytes
 .../tutorials/latest/petclinic/_images/hand.png    |  Bin 0 -> 326 bytes
 .../petclinic/_images/hello-world-objects-menu.png |  Bin 0 -> 7578 bytes
 .../latest/petclinic/_images/home-page.png         |  Bin 0 -> 43943 bytes
 .../tutorials/latest/petclinic/_images/index.png   |  Bin 0 -> 73486 bytes
 .../_images/intellij-java-compiler-parameters.png  |  Bin 0 -> 52596 bytes
 ...iguration-before-launch-datanucleus-enhance.png |  Bin 0 -> 7541 bytes
 .../intellij-run-configuration-before-launch.png   |  Bin 0 -> 7276 bytes
 .../_images/intellij-run-configuration.png         |  Bin 0 -> 46429 bytes
 .../tutorials/latest/petclinic/_images/login.png   |  Bin 0 -> 19956 bytes
 .../latest/petclinic/_images/object-a.png          |  Bin 0 -> 25310 bytes
 .../petclinic/_images/owner-newPet-prompt.png      |  Bin 0 -> 7634 bytes
 .../latest/petclinic/_images/owner-newPet.png      |  Bin 0 -> 9643 bytes
 .../_images/project-loaded-into-intellij.png       |  Bin 0 -> 31799 bytes
 .../latest/petclinic/_images/prototyping-menu.png  |  Bin 0 -> 14260 bytes
 .../_images/run-fixture-script-menu-item.png       |  Bin 0 -> 15882 bytes
 .../_images/run-fixture-script-prompt.png          |  Bin 0 -> 10836 bytes
 .../_images/run-fixture-script-result.png          |  Bin 0 -> 16521 bytes
 .../latest/petclinic/_images/swagger-ui.png        |  Bin 0 -> 59554 bytes
 .../latest/petclinic/_images/tertiary-menu.png     |  Bin 0 -> 4687 bytes
 content/tutorials/latest/petclinic/about.html      |  594 +++
 .../latest/petclinic/architecture-rules.html       |  600 +++
 .../latest/petclinic/commands-and-auditing.html    |  600 +++
 .../further-business-logic-worked-examples.html    |  600 +++
 content/tutorials/latest/petclinic/i18n.html       |  600 +++
 .../tutorials/latest/petclinic/restful-api.html    |  600 +++
 content/userguide/latest/about.html                |   66 +-
 ...ag-419be38423032876d89d1d44c80aafe9db857a3b.svg |    4 +-
 content/userguide/latest/btb/about.html            |   66 +-
 content/userguide/latest/btb/headless-access.html  |   66 +-
 content/userguide/latest/btb/hints-and-tips.html   |   70 +-
 .../latest/btb/hints-and-tips/are-you-sure.html    |   66 +-
 .../latest/btb/hints-and-tips/custom-css.html      |   66 +-
 .../how-to-handle-void-and-null-results.html       |   66 +-
 .../how-to-implement-a-spellchecker.html           |   66 +-
 .../latest/btb/hints-and-tips/persisted-title.html |   66 +-
 .../replacing-default-service-implementations.html |   68 +-
 .../simulating-collections-of-values.html          |   66 +-
 .../subclass-properties-in-tables.html             |   66 +-
 .../hints-and-tips/transactions-and-errors.html    |   68 +-
 .../btb/hints-and-tips/vetoing-visibility.html     |   66 +-
 .../hints-and-tips/view-model-instantiation.html   |   66 +-
 content/userguide/latest/btb/i18n.html             |   66 +-
 content/userguide/latest/btb/other-techniques.html |   66 +-
 .../userguide/latest/btb/programming-model.html    |   68 +-
 .../btb/programming-model/custom-validator.html    |   66 +-
 .../latest/btb/programming-model/finetuning.html   |   68 +-
 content/userguide/latest/command-log/about.html    |   66 +-
 content/userguide/latest/command-replay/about.html |   66 +-
 content/userguide/latest/flyway/about.html         |   66 +-
 ...ag-1e6be3ab94573991b764958ec88db5a8beb17408.svg |    4 +-
 ...ag-3c9c462c5d1913ae10a71f94738a70175be7f380.svg |    4 +-
 ...ag-cfcb85c10f3dfa05f6aa809ba4178a22cd3640a0.svg |    4 +-
 ...ag-e8d75781c99cc310b1c766dad9661c25d343fb0f.svg |    4 +-
 ...ag-f34a477a8b176974b1ddfe70a43ebfd1901e7f47.svg |    4 +-
 content/userguide/latest/fun/about.html            |   66 +-
 content/userguide/latest/fun/business-rules.html   |   66 +-
 .../latest/fun/business-rules/usability.html       |   66 +-
 .../latest/fun/business-rules/validity.html        |   66 +-
 .../latest/fun/business-rules/visibility.html      |   66 +-
 .../userguide/latest/fun/concepts-patterns.html    |   68 +-
 .../apache-isis-vs-cqrs-and-event-sourcing.html    |   66 +-
 .../latest/fun/concepts-patterns/architecture.html |   68 +-
 .../latest/fun/concepts-patterns/core-values.html  |   66 +-
 .../fun/concepts-patterns/deployment-options.html  |   66 +-
 .../concepts-patterns/domain-driven-design.html    |   66 +-
 .../latest/fun/concepts-patterns/metamodel.html    |   66 +-
 .../concepts-patterns/naked-objects-pattern.html   |   66 +-
 .../latest/fun/domain-entities-and-services.html   |   66 +-
 .../fun/domain-entities-and-services/crud.html     |   66 +-
 .../domain-entities.html                           |   66 +-
 .../domain-services.html                           |   66 +-
 .../inject-services.html                           |   66 +-
 .../latest/fun/drop-downs-and-defaults.html        |   66 +-
 content/userguide/latest/fun/meta-annotations.html |   66 +-
 content/userguide/latest/fun/mixins.html           |   66 +-
 content/userguide/latest/fun/modules.html          |   68 +-
 content/userguide/latest/fun/object-members.html   |   68 +-
 .../latest/fun/object-members/actions.html         |   66 +-
 .../latest/fun/object-members/collections.html     |   68 +-
 .../latest/fun/object-members/properties.html      |   66 +-
 content/userguide/latest/fun/overview.html         |   70 +-
 .../latest/fun/overview/business-rules.html        |   66 +-
 content/userguide/latest/fun/overview/events.html  |   66 +-
 .../userguide/latest/fun/overview/identifiers.html |   66 +-
 content/userguide/latest/fun/overview/modules.html |   70 +-
 .../latest/fun/overview/object-members.html        |   66 +-
 .../latest/fun/overview/programming-model.html     |   66 +-
 .../fun/overview/types-of-domain-objects.html      |   66 +-
 .../userguide/latest/fun/programming-model.html    |   66 +-
 content/userguide/latest/fun/ui.html               |   68 +-
 .../latest/fun/ui/action-icons-and-css.html        |   66 +-
 .../userguide/latest/fun/ui/menubars-layout.html   |   66 +-
 .../latest/fun/ui/names-and-descriptions.html      |   66 +-
 content/userguide/latest/fun/ui/object-layout.html |   66 +-
 .../latest/fun/ui/object-titles-and-icons.html     |   66 +-
 content/userguide/latest/fun/ui/table-columns.html |   68 +-
 content/userguide/latest/fun/view-models.html      |   66 +-
 .../latest/fun/view-models/UNUSED-dto.html         |   66 +-
 content/userguide/latest/quartz/about.html         |   66 +-
 content/valuetypes/latest/about.html               |   66 +-
 content/valuetypes/latest/asciidoc/about.html      |   66 +-
 content/valuetypes/latest/markdown/about.html      |   66 +-
 content/valuetypes/latest/sse/about.html           |   66 +-
 ...ag-f9a8cc2b499edea24153162102fc036f9d270382.svg |    4 +-
 content/vro/latest/about.html                      |   66 +-
 content/vro/latest/content-negotiation.html        |   68 +-
 .../apache-isis-v2-profile.INCOMPLETE.html         |   66 +-
 .../apache-isis-v2-profile.html                    |   66 +-
 .../content-negotiation/other-representations.html |   66 +-
 .../simplified-representations/accept-header.html  |   66 +-
 .../action-invocation.html                         |   66 +-
 .../configuration-properties.html                  |   66 +-
 .../simplified-representations/domain-object.html  |   66 +-
 .../object-collection.html                         |   66 +-
 content/vro/latest/cors/about.html                 |   66 +-
 content/vro/latest/hints-and-tips.html             |   66 +-
 .../vro/latest/hints-and-tips/pretty-printing.html |   66 +-
 .../hints-and-tips/restful-image-property.html     |   66 +-
 .../vro/latest/hints-and-tips/troubleshooting.html |   66 +-
 .../hints-and-tips/view-model-as-parameter.html    |   66 +-
 content/vro/latest/layout-resources.html           |   66 +-
 content/vro/latest/ro-spec.html                    |   66 +-
 content/vro/latest/security.html                   |   66 +-
 content/vro/latest/setup-and-configuration.html    |   70 +-
 ...ag-c4ec2b950533a4717f3df81e1592762cfc3e6e17.svg |    4 +-
 content/vw/latest/about.html                       |   66 +-
 content/vw/latest/customisation.html               |   66 +-
 content/vw/latest/customisation/about-page.html    |   66 +-
 content/vw/latest/customisation/brand-logo.html    |   66 +-
 .../customisation/cheap-n-cheerful-theme.html      |   66 +-
 content/vw/latest/customisation/custom-css.html    |   66 +-
 .../vw/latest/customisation/custom-javascript.html |   66 +-
 content/vw/latest/customisation/embedded-view.html |   66 +-
 .../latest/customisation/top-level-index-page.html |   66 +-
 content/vw/latest/customisation/welcome-page.html  |   66 +-
 content/vw/latest/exceldownload/about.html         |   66 +-
 content/vw/latest/extending.html                   |   66 +-
 .../latest/extending/custom-bootstrap-theme.html   |   66 +-
 content/vw/latest/extending/custom-pages.html      |   66 +-
 .../latest/extending/replacing-page-elements.html  |   66 +-
 content/vw/latest/features.html                    |   68 +-
 content/vw/latest/features/bookmarked-pages.html   |   66 +-
 .../latest/features/sidebar-vs-modal-dialogs.html  |   66 +-
 content/vw/latest/features/titles-in-tables.html   |   68 +-
 content/vw/latest/features/user-registration.html  |   66 +-
 content/vw/latest/features/where-am-i.html         |   66 +-
 content/vw/latest/fullcalendar/about.html          |   66 +-
 content/vw/latest/gmap3/about.html                 |   66 +-
 content/vw/latest/hints-and-tips.html              |   66 +-
 content/vw/latest/hints-and-tips/auto-refresh.html |   66 +-
 .../i18n-label-in-wicket-viewer.html               |   66 +-
 .../vw/latest/hints-and-tips/per-user-themes.html  |   66 +-
 content/vw/latest/hints-and-tips/svg-support.html  |   66 +-
 content/vw/latest/pdfjs/about.html                 |   66 +-
 content/vw/latest/security.html                    |   66 +-
 content/vw/latest/setup-and-configuration.html     |   70 +-
 1851 files changed, 134551 insertions(+), 98266 deletions(-)

diff --git a/content/404.html b/content/404.html
index 543a4ef..796f47a 100644
--- a/content/404.html
+++ b/content/404.html
@@ -286,6 +286,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="/tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -348,7 +356,7 @@ If you typed the URL of this page manually, please double check that you entered
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/_/img/home/favicon.png b/content/_/img/home/favicon.png
index d1b0ea1..aab35c2 100644
Binary files a/content/_/img/home/favicon.png and b/content/_/img/home/favicon.png differ
diff --git a/content/comguide/latest/about.html b/content/comguide/latest/about.html
index c7f28c0..42effc2 100644
--- a/content/comguide/latest/about.html
+++ b/content/comguide/latest/about.html
@@ -40,43 +40,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -84,34 +84,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -127,7 +127,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -363,6 +363,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -400,7 +408,7 @@ page.parent doesn't seem to be set...
     <li><a href="about.html">Committers' Guide</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/about.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/about.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -425,7 +433,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/algolia-search.html b/content/comguide/latest/algolia-search.html
index 89b880d..82506e4 100644
--- a/content/comguide/latest/algolia-search.html
+++ b/content/comguide/latest/algolia-search.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <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/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/algolia-search.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/algolia-search.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -630,7 +638,7 @@ There are other options for styling, see <a href="https://docsearch.algolia.com/
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/antora-publish-procedure.html b/content/comguide/latest/antora-publish-procedure.html
index efa7e3d..4b4b709 100644
--- a/content/comguide/latest/antora-publish-procedure.html
+++ b/content/comguide/latest/antora-publish-procedure.html
@@ -39,43 +39,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -83,34 +83,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -126,7 +126,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -362,6 +362,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -400,7 +408,7 @@ page.parent doesn't seem to be set...
     <li><a href="antora-publish-procedure.html">Publishing the Docs</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/antora-publish-procedure.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/antora-publish-procedure.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -718,7 +726,7 @@ git push</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/applying-patches.html b/content/comguide/latest/applying-patches.html
index 9ddc565..156f291 100644
--- a/content/comguide/latest/applying-patches.html
+++ b/content/comguide/latest/applying-patches.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <li><a href="applying-patches.html">Applying Patches</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/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/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/applying-patches.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -529,7 +537,7 @@ git commit -am "&lt;original authors' commit message&gt;" --signoff</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/cutting-a-release.html b/content/comguide/latest/cutting-a-release.html
index 6ac3d24..4beef60 100644
--- a/content/comguide/latest/cutting-a-release.html
+++ b/content/comguide/latest/cutting-a-release.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <li><a href="cutting-a-release.html">Cutting a Release</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -642,9 +650,10 @@ licenses to remove from supplemental-models.xml (are spurious):
 <div class="paragraph">
 <p>The next step is to generate the website, ensuring that the config, examples, projdoc (system overview and global index) are all updated.</p>
 </div>
-<div class="paragraph">
+<div class="ulist">
+<ul>
+<li>
 <p>Be careful that sometimes the configuration property pages (that are generated from the <code>core/config/target/classes/META-INF/spring-configuration-metadata.json</code> file) may be malformed; in particular for default values going missing.</p>
-</div>
 <div class="paragraph">
 <p>This seems to occur if the IDE (IntelliJ) has compiled the codebase.</p>
 </div>
@@ -656,13 +665,24 @@ licenses to remove from supplemental-models.xml (are spurious):
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn clean install -pl core/config</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>Then, generate the website:</p>
+</li>
+<li>
+<p>It&#8217;s also necessary to make sure the tooling is built:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn -D module-tooling -D skip.essential install -DskipTests</code></pre>
 </div>
+</div>
+</li>
+<li>
+<p>Then, generate the website:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">sh preview.sh</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">bash preview.sh</code></pre>
+</div>
 </div>
+</li>
+</ul>
 </div>
 <div class="paragraph">
 <p>Check for any Asciidoc errors, and fix.
@@ -696,7 +716,7 @@ For example:</p>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">export ISISJIRA=ISIS-9999                           <i class="conum" data-value="1"></i><b>(1)</b>
 export ISISTMP=/c/tmp                               <i class="conum" data-value="2"></i><b>(2)</b>
-export ISISREL=2.0.0-M6                             <i class="conum" data-value="3"></i><b>(3)</b>
+export ISISREL=2.0.0-M7                             <i class="conum" data-value="3"></i><b>(3)</b>
 export ISISRC=RC1                                   <i class="conum" data-value="4"></i><b>(4)</b>
 export ISISBRANCH=release-$ISISREL-$ISISRC
 export ISISART=isis
@@ -732,7 +752,7 @@ env | grep ISIS | sort</code></pre>
 </td>
 <td class="content">
 <div class="paragraph">
-<p>The branch name is intentionally <strong>not</strong> the same as the eventual tag names (eg <code>isis-2.0.0-M6</code>).</p>
+<p>The branch name is intentionally <strong>not</strong> the same as the eventual tag names (eg <code>isis-2.0.0-M7</code>).</p>
 </div>
 </td>
 </tr>
@@ -781,7 +801,7 @@ git push origin $ISISBRANCH -u</code></pre>
 <div class="sect2">
 <h3 id="bump-code-to-isisrel"><a class="anchor" href="#bump-code-to-isisrel"></a>Bump code to <code>$ISISREL</code></h3>
 <div class="paragraph">
-<p>Search through the <code>.java</code> files for <code>2.0.0-M5</code>, and change to <code>2.0.0-M6</code>.</p>
+<p>Search through the <code>.java</code> files for <code>2.0.0-M6</code>, and change to <code>2.0.0-M7</code>.</p>
 </div>
 <div class="paragraph">
 <p>At the time of writing there was just one <code>.java</code> file that had the release hard-coded (<code>IsisConfigurationLegacy</code>).</p>
@@ -1132,26 +1152,31 @@ These are the branches referenced from the home page and getting started pages o
 <div class="paragraph">
 <p>In order that we don&#8217;t break the starter apps while a release is being voted on, we do the changes in work branches, <code>$ISISBRANCH-jdo</code> and <code>$ISISBRANCH-jpa</code>:</p>
 </div>
+<div class="sect2">
+<h3 id="helloworld"><a class="anchor" href="#helloworld"></a>HelloWorld</h3>
+<div class="paragraph">
+<p>For <em>helloworld</em>, we create a release branch for both variants:</p>
+</div>
 <div class="ulist">
 <ul>
 <li>
-<p>for <em>helloworld</em>, we create a release branch for both variants:</p>
+<p>for <code>jpa</code>:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>for <code>jdo</code>:</p>
+<p>Checkout the branch, bump versions, and commit:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jdo-SNAPSHOT
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jpa-SNAPSHOT
 git pull --ff-only
 
-git checkout -b $ISISBRANCH-jdo
+git checkout -b $ISISBRANCH-jpa
 
 mvn versions:update-parent -DparentVersion=$ISISREL <i class="conum" data-value="1"></i><b>(1)</b>
 mvn versions:set -DnewVersion=$ISISREL
 
-mvn clean install -o
-mvn spring-boot:run</code></pre>
+git add .
+git commit -m "$ISISJIRA - updates to $ISISREL (jpa)"</code></pre>
 </div>
 </div>
 <div class="colist arabic">
@@ -1162,66 +1187,122 @@ mvn spring-boot:run</code></pre>
 </tr>
 </table>
 </div>
-<div class="paragraph">
-<p>Commit any changes and then push the branch to origin:</p>
+</li>
+<li>
+<p>Test the app</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn clean install -o
+mvn spring-boot:run</code></pre>
+</div>
 </div>
+</li>
+<li>
+<p>Make any additional changes that might be required (eg update to <code>menubars.layout.xml</code>) commit and retest</p>
+</li>
+<li>
+<p>Push the branch to origin:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git add .
-git commit -m "$ISISJIRA - updates to $ISISREL (jdo)"
-git push -u origin $ISISBRANCH-jdo</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push -u origin $ISISBRANCH-jpa</code></pre>
+</div>
 </div>
+</li>
+</ul>
 </div>
 </li>
 <li>
-<p>repeat for <code>jpa</code>:</p>
+<p>for <code>jdo</code>:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Checkout the branch, bump versions, and commit:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jpa-SNAPSHOT
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jdo-SNAPSHOT
 git pull --ff-only
 
-git checkout -b $ISISBRANCH-jpa
+git checkout -b $ISISBRANCH-jdo
 
 mvn versions:update-parent -DparentVersion=$ISISREL
 mvn versions:set -DnewVersion=$ISISREL
 
-mvn clean install -o
+git add .
+git commit -m "$ISISJIRA - updates to $ISISREL (jdo)"</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p>Test the app</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn clean install -o
 mvn spring-boot:run</code></pre>
 </div>
 </div>
+</li>
+<li>
+<p>Make any additional changes that might be required, and re-test.</p>
+<div class="paragraph">
+<p>This might be easiest to just cherry-pick commits made on the <code>jpa</code> branch.</p>
+</div>
+</li>
+<li>
+<p>Merge in the <code>jpa</code> branch, discarding any conflicts.</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git merge $ISISBRANCH-jpa --no-commit</code></pre>
+</div>
+</div>
 <div class="paragraph">
-<p>Commit any changes and then push the branch to origin:</p>
+<p>The idea here is to show equivalence between the two branches.
+The merge commit should end up with no changes:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git commit -m "$ISISJIRA - merge in jpa"</code></pre>
+</div>
 </div>
+</li>
+<li>
+<p>Push the branch to origin:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git add .
-git commit -m "$ISISJIRA - updates to $ISISREL (jpa)"
-git push -u origin $ISISBRANCH-jpa</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push -u origin $ISISBRANCH-jdo</code></pre>
 </div>
 </div>
 </li>
 </ul>
 </div>
 </li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="simpleapp"><a class="anchor" href="#simpleapp"></a>SimpleApp</h3>
+<div class="paragraph">
+<p>For <em>simple app</em>, the steps are almost the same:</p>
+</div>
+<div class="ulist">
+<ul>
 <li>
-<p>for <em>simple app</em>, the steps are almost the same:</p>
+<p>for <code>jpa</code>:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>for <code>jdo</code>:</p>
-<div class="openblock">
-<div class="content">
+<p>Checkout the branch, bump versions, and commit:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jdo-SNAPSHOT
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jpa-SNAPSHOT
 git pull --ff-only
 
-git checkout -b $ISISBRANCH-jdo
+git checkout -b $ISISBRANCH-jpa
 
-mvn versions:update-parent -DparentVersion=$ISISREL <i class="conum" data-value="1"></i><b>(1)</b>
+mvn versions:update-parent -DparentVersion=$ISISREL  <i class="conum" data-value="1"></i><b>(1)</b>
 mvn versions:set -DnewVersion=$ISISREL
 
-mvn clean install -Dmetamodel.lockdown -B -o        <i class="conum" data-value="2"></i><b>(2)</b></code></pre>
+git add .
+git commit -m "$ISISJIRA - updates to $ISISREL (jpa)"</code></pre>
 </div>
 </div>
 <div class="colist arabic">
@@ -1230,87 +1311,90 @@ mvn clean install -Dmetamodel.lockdown -B -o        <i class="conum" data-value=
 <td><i class="conum" data-value="1"></i><b>1</b></td>
 <td>the top-level <code>pom.xml</code> references the ASF staging repository, so this will pull down the release if not already present in <code>~/.m2/repository</code>.</td>
 </tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>the -B flag is required to avoid control characters in generated output</td>
-</tr>
 </table>
 </div>
-<div class="paragraph">
-<p>Approve any failed lockdown tests (the mavendeps will fail first time around because the dependencies on Apache Isis itself have just be bumped).</p>
-</div>
-<div class="paragraph">
-<p>You could also check the output of the Cucumber tests, under:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>webapp-tests/target/cucumber-reports</code> and</p>
 </li>
 <li>
-<p><code>webapp-tests/target/cucumber-html-reports</code>.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Repeat, then run the app as a sanity check:</p>
-</div>
+<p>Test the app</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn -pl webapp spring-boot:run</code></pre>
-</div>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn clean install -o
+mvn -pl webapp spring-boot:run</code></pre>
 </div>
-<div class="paragraph">
-<p>Commit any changes and then push the branch to origin:</p>
 </div>
+</li>
+<li>
+<p>Make any additional changes that might be required (eg update to <code>menubars.layout.xml</code>) commit and retest</p>
+</li>
+<li>
+<p>Push the branch to origin:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git add .
-git commit -m "$ISISJIRA - updates to $ISISREL (jdo)"
-git push -u origin $ISISBRANCH-jdo</code></pre>
-</div>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push -u origin $ISISBRANCH-jpa</code></pre>
 </div>
 </div>
+</li>
+</ul>
 </div>
 </li>
 <li>
-<p>repeat for <code>jpa</code>:</p>
-<div class="openblock">
-<div class="content">
+<p>for <code>jdo</code>:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Checkout the branch, bump versions, and commit:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jpa-SNAPSHOT
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout jdo-SNAPSHOT
 git pull --ff-only
 
-git checkout -b $ISISBRANCH-jpa
+git checkout -b $ISISBRANCH-jdo
 
 mvn versions:update-parent -DparentVersion=$ISISREL
 mvn versions:set -DnewVersion=$ISISREL
 
-mvn clean install -Dmetamodel.lockdown -B -o</code></pre>
+git add .
+git commit -m "$ISISJIRA - updates to $ISISREL (jdo)"</code></pre>
 </div>
 </div>
-<div class="paragraph">
-<p>Approve any failed lockdown tests (the mavendeps will fail first time around because the dependencies on Apache Isis itself have just be bumped).</p>
+</li>
+<li>
+<p>Test the app</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn clean install -o
+mvn -pl webapp spring-boot:run</code></pre>
+</div>
 </div>
+</li>
+<li>
+<p>Make any additional changes that might be required, and re-test.</p>
 <div class="paragraph">
-<p>Repeat, then run the app as a sanity check:</p>
+<p>This might be easiest to just cherry-pick commits made on the <code>jpa</code> branch.</p>
 </div>
+</li>
+<li>
+<p>Merge in the <code>jpa</code> branch, discarding any conflicts.</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn -pl webapp spring-boot:run</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git merge $ISISBRANCH-jpa --no-commit</code></pre>
 </div>
 </div>
 <div class="paragraph">
-<p>Commit any changes and then push the branch to origin:</p>
+<p>The idea here is to show equivalence between the two branches.
+The merge commit should end up with no changes:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git add .
-git commit -m "$ISISJIRA - updates to $ISISREL (jpa)"
-git push -u origin $ISISBRANCH-jpa</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git commit -m "$ISISJIRA - merge in jpa"</code></pre>
 </div>
 </div>
+</li>
+<li>
+<p>Push the branch to origin:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push -u origin $ISISBRANCH-jdo</code></pre>
 </div>
 </div>
 </li>
@@ -1321,6 +1405,7 @@ git push -u origin $ISISBRANCH-jpa</code></pre>
 </div>
 </div>
 </div>
+</div>
 <div class="sect1">
 <h2 id="preview-website"><a class="anchor" href="#preview-website"></a>Preview website</h2>
 <div class="sectionbody">
@@ -1374,7 +1459,7 @@ popd</code></pre>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">cd ../isis-release
 
-sh preview.sh -A</code></pre>
+bash preview.sh -A</code></pre>
 </div>
 </div>
 <div class="admonitionblock warning">
@@ -1388,7 +1473,18 @@ sh preview.sh -A</code></pre>
 <p>This procedure doesn&#8217;t yet work; Antora does not yet support worktrees.</p>
 </div>
 <div class="paragraph">
-<p>So instead it&#8217;s currently necessary to perform the preview in the main <code>../isis</code> directory (switch branches first, of course).</p>
+<p>So instead it&#8217;s currently necessary to perform the preview in the main <code>../isis</code> directory, switching branches.
+You&#8217;ll also need to rebuild all and then regenerate config files and tooling:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout $ISISBRANCH
+pushd isis-parent
+mvn clean install -DskipTests -Dreleased
+popd
+mvn clean install -pl core/config
+mvn -D module-tooling -D skip.essential install -DskipTests</code></pre>
+</div>
 </div>
 </td>
 </tr>
@@ -1412,7 +1508,7 @@ sh preview.sh -A</code></pre>
 git add .
 git commit -m "$ISISJIRA : staging changes to website"
 
-sh preview.sh</code></pre>
+bash preview.sh</code></pre>
 </div>
 </div>
 </li>
@@ -1454,7 +1550,7 @@ Adapt as required:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code>[VOTE] Apache Isis Core release 2.0.0-M6 RC1</code></pre>
+<pre class="highlightjs highlight"><code>[VOTE] Apache Isis Core release 2.0.0-M7 RC1</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1467,14 +1563,14 @@ Adapt as required:</p>
 The source code zip artifact has been uploaded to a staging repository on
 https://repository.apache.org, along with its corresponding .asc signature.
 
-In the source code repo the code has been tagged as isis-2.0.0-M6-RC1;
+In the source code repo the code has been tagged as isis-2.0.0-M7-RC1;
 see https://github.com/apache/isis/tags
 
 To verify the source code itself, you can use the following commands
 (in an empty directory):
 
 ----------------------------------------------------------------
-VERSION=2.0.0-M6
+VERSION=2.0.0-M7
 RC=RC1
 NEXUSREPONUM=11xx
 
@@ -1509,7 +1605,7 @@ The vote will be open for a minimum of 72 hours.
 <div class="ulist">
 <ul>
 <li>
-<p>the version number (<code>2.0.0-M6</code> or whatever)</p>
+<p>the version number (<code>2.0.0-M7</code> or whatever)</p>
 </li>
 <li>
 <p>the release candidate number (<code>RC1</code> or whatever)</p>
@@ -1542,7 +1638,7 @@ The vote will be open for a minimum of 72 hours.
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/key-generation.html b/content/comguide/latest/key-generation.html
index 6e300dd..e0a0c6e 100644
--- a/content/comguide/latest/key-generation.html
+++ b/content/comguide/latest/key-generation.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <li><a href="key-generation.html">Key Generation</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/key-generation.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/key-generation.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -1146,7 +1154,7 @@ This is defined under a profile so that it is activated only when we perform a r
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/merging-a-pull-request.html b/content/comguide/latest/merging-a-pull-request.html
index 2c95ba3..1225465 100644
--- a/content/comguide/latest/merging-a-pull-request.html
+++ b/content/comguide/latest/merging-a-pull-request.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <li><a href="merging-a-pull-request.html">Merging a Pull Request</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -611,7 +619,7 @@ This is intentional: when the merged branch is pushed, github will automatically
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/pmc-notes.html b/content/comguide/latest/pmc-notes.html
index beacab2..a59ce4e 100644
--- a/content/comguide/latest/pmc-notes.html
+++ b/content/comguide/latest/pmc-notes.html
@@ -40,43 +40,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -84,34 +84,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -127,7 +127,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -363,6 +363,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -402,7 +410,7 @@ page.parent doesn't seem to be set...
     <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/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/pmc-notes.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/pmc-notes.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -835,7 +843,7 @@ modify_committee.pl isis --remove joebloggs</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/policies.html b/content/comguide/latest/policies.html
index e2f7570..4af4acb 100644
--- a/content/comguide/latest/policies.html
+++ b/content/comguide/latest/policies.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <li><a href="policies.html">Policies</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/policies.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/policies.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -601,7 +609,7 @@ git push origin --delete ISIS-999</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/policies/git-policy.html b/content/comguide/latest/policies/git-policy.html
index 459ce14..853396b 100644
--- a/content/comguide/latest/policies/git-policy.html
+++ b/content/comguide/latest/policies/git-policy.html
@@ -39,43 +39,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -83,34 +83,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -126,7 +126,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../../_/img/home.png"></img>
           </span>
@@ -362,6 +362,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -400,7 +408,7 @@ page.parent doesn't seem to be set...
     <li><a href="git-policy.html">Git Policy</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/policies/git-policy.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/policies/git-policy.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -550,7 +558,7 @@ git push origin --delete ISIS-999</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/policies/versioning-policy.html b/content/comguide/latest/policies/versioning-policy.html
index bddb14d..bfd6bef 100644
--- a/content/comguide/latest/policies/versioning-policy.html
+++ b/content/comguide/latest/policies/versioning-policy.html
@@ -39,43 +39,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -83,34 +83,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -126,7 +126,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../../_/img/home.png"></img>
           </span>
@@ -362,6 +362,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -400,7 +408,7 @@ page.parent doesn't seem to be set...
     <li><a href="versioning-policy.html">Versioning Policy</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/policies/versioning-policy.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/policies/versioning-policy.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -465,7 +473,7 @@ This will help avoid "jar hell" (components having conflicting dependencies of c
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/post-release-successful.html b/content/comguide/latest/post-release-successful.html
index 76b03ac..b4a6934 100644
--- a/content/comguide/latest/post-release-successful.html
+++ b/content/comguide/latest/post-release-successful.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -404,7 +412,7 @@ page.parent doesn't seem to be set...
     <li><a href="post-release-successful.html">Post Release (Successful)</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -444,7 +452,7 @@ If there are not +3 votes after this time then it is perfectly permissible to ke
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code>[RESULT] [VOTE] Apache Isis Core release 2.0.0-M6</code></pre>
+<pre class="highlightjs highlight"><code>[RESULT] [VOTE] Apache Isis Core release 2.0.0-M7</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -505,7 +513,7 @@ We release from Maven Central before anything else; we don&#8217;t want to push
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">export ISISJIRA=ISIS-9999                           <i class="conum" data-value="1"></i><b>(1)</b>
 export ISISTMP=/c/tmp                               <i class="conum" data-value="2"></i><b>(2)</b>
-export ISISREL=2.0.0-M6                           <i class="conum" data-value="3"></i><b>(3)</b>
+export ISISREL=2.0.0-M7                           <i class="conum" data-value="3"></i><b>(3)</b>
 export ISISRC=RC1                                   <i class="conum" data-value="4"></i><b>(4)</b>
 export ISISBRANCH=release-$ISISREL-$ISISRC
 export ISISART=isis
@@ -778,7 +786,7 @@ popd</code></pre>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">sh upd.sh [previous_release] 2.0.0-M6</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">sh upd.sh [previous_release] 2.0.0-M7</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -882,7 +890,7 @@ All of this is changed afterwards.</p>
 <p>Update all <code>antora.yml</code> files:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">find . -name antora.yml -exec sed -i 's/latest/2.0.0-M6/g' {} \;</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">find . -name antora.yml -exec sed -i 's/latest/2.0.0-M7/g' {} \;</code></pre>
 </div>
 </div>
 </li>
@@ -903,14 +911,14 @@ git commit -m "$ISISJIRA: bumps antora.yml versions to $ISISREL"</code></pre>
 <div class="ulist">
 <ul>
 <li>
-<p>We create the <code>2.0.0-M6</code> branch.</p>
+<p>We create the <code>2.0.0-M7</code> branch.</p>
 <div class="paragraph">
-<p>This mirrors the "rel/isis-2.0.0-M6" used for the formal (immutable) release tag, but is a branch because it allows us to move it, and must have this simplified name as it is used in the "edit page" link of the site template.</p>
+<p>This mirrors the "rel/isis-2.0.0-M7" used for the formal (immutable) release tag, but is a branch because it allows us to move it, and must have this simplified name as it is used in the "edit page" link of the site template.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git branch 2.0.0-M6
-git push origin 2.0.0-M6</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git branch 2.0.0-M7
+git push origin 2.0.0-M7</code></pre>
 </div>
 </div>
 </li>
@@ -933,7 +941,7 @@ git push origin 2.0.0-M6</code></pre>
 <div class="ulist">
 <ul>
 <li>
-<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-M6</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-M7</code></p>
 <div class="paragraph">
 <p>This should be in hyperlinks, <code>&lt;a href="docs/&#8230;&#8203;"&gt;</code></p>
 </div>
@@ -959,7 +967,7 @@ Every content source needs to be updated:</p>
 <div class="ulist">
 <ul>
 <li>
-<p><code>branches: HEAD</code> &#8594; <code>branches: 2.0.0-M6</code></p>
+<p><code>branches: HEAD</code> &#8594; <code>branches: 2.0.0-M7</code></p>
 </li>
 </ul>
 </div>
@@ -976,15 +984,29 @@ git commit -m "$ISISJIRA: updates references to version in index.html and site.y
 </ul>
 </div>
 <div class="paragraph">
-<p>We are now in a position to actually generate the Antora website:</p>
+<p>We are now in a position to actually generate the Antora website.
+(NOTE, this needs to be performed in the <code>../isis</code> directory because Antora currently doesn&#8217;t support git worktrees)</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
+<p>build prereqs</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout $ISISBRANCH
+pushd isis-parent
+mvn clean install -DskipTests -Dreleased
+popd
+mvn clean install -pl core/config
+mvn -D module-tooling -D skip.essential install -DskipTests</code></pre>
+</div>
+</div>
+</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">sh preview.sh</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">bash preview.sh</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1057,7 +1079,7 @@ git add .</code></pre>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git commit -m "updates website"
 
-sh preview.sh</code></pre>
+bash preview.sh</code></pre>
 </div>
 </div>
 </li>
@@ -1137,9 +1159,9 @@ Additional config options for the crawler can be found <a href="https://www.algo
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout master                              # update master with latest
 git pull
-git merge release-2.0.0-M6-RC1                  # merge branch onto master
-git push origin --delete release-2.0.0-M6-RC1   # remote branch no longer needed
-git branch -d release-2.0.0-M6-RC1              # branch no longer needed</code></pre>
+git merge release-2.0.0-M7-RC1                  # merge branch onto master
+git push origin --delete release-2.0.0-M7-RC1   # remote branch no longer needed
+git branch -d release-2.0.0-M7-RC1              # branch no longer needed</code></pre>
 </div>
 </div>
 </div>
@@ -1217,7 +1239,7 @@ The <code>jdo</code> and <code>jpa</code> branches should always work against th
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code>[ANN] Apache Isis version 2.0.0-M6 Released</code></pre>
+<pre class="highlightjs highlight"><code>[ANN] Apache Isis version 2.0.0-M7 Released</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1225,7 +1247,7 @@ The <code>jdo</code> and <code>jpa</code> branches should always work against th
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code>The Apache Isis team is pleased to announce the release of Apache Isis 2.0.0-M6.
+<pre class="highlightjs highlight"><code>The Apache Isis team is pleased to announce the release of Apache Isis 2.0.0-M7.
 
 New features in this release include:
 
@@ -1240,9 +1262,9 @@ Enjoy!
 
 --The Apache Isis team
 
-[1] http://isis.apache.org/relnotes/2.0.0-M6/about.html
+[1] https://isis.apache.org/relnotes/2.0.0-M7/about.html
 [2] https://search.maven.org
-[3] https://isis.apache.org/docs/2.0.0-M6/downloads/how-to.html</code></pre>
+[3] https://isis.apache.org/docs/2.0.0-M7/downloads/how-to.html</code></pre>
 </div>
 </div>
 </div>
@@ -1288,7 +1310,7 @@ Copy-n-paste the above mailing list announcement should suffice.</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/post-release-unsuccessful.html b/content/comguide/latest/post-release-unsuccessful.html
index bf00555..eb52125 100644
--- a/content/comguide/latest/post-release-unsuccessful.html
+++ b/content/comguide/latest/post-release-unsuccessful.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -404,7 +412,7 @@ page.parent doesn't seem to be set...
     <li><a href="post-release-unsuccessful.html">Post Release (Unsuccessful)</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/post-release-unsuccessful.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/post-release-unsuccessful.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -446,7 +454,7 @@ page.parent doesn't seem to be set...
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">[RESULT] [VOTE] Apache Isis Core release 2.0.0-M6</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">[RESULT] [VOTE] Apache Isis Core release 2.0.0-M7</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -479,10 +487,10 @@ The vote is UNSUCCESSFUL.</code></pre>
 <p>Working in the release worktree, tidy up remote branches in the git repo:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release-2.0.0-M6-RC1     <i class="conum" data-value="1"></i><b>(1)</b>
-git push --delete origin isis-2.0.0-M6-RC1        <i class="conum" data-value="2"></i><b>(2)</b>
-git tag -d isis-2.0.0-M6                          <i class="conum" data-value="3"></i><b>(3)</b>
-git tag -d isis-2.0.0-M6-RC1</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release-2.0.0-M7-RC1     <i class="conum" data-value="1"></i><b>(1)</b>
+git push --delete origin isis-2.0.0-M7-RC1        <i class="conum" data-value="2"></i><b>(2)</b>
+git tag -d isis-2.0.0-M7                          <i class="conum" data-value="3"></i><b>(3)</b>
+git tag -d isis-2.0.0-M7-RC1</code></pre>
 </div>
 </div>
 <div class="colist arabic">
@@ -507,7 +515,7 @@ These steps:</td>
 <p>For helloworld starter app, similarly:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release-2.0.0-M6-RC1     <i class="conum" data-value="1"></i><b>(1)</b></code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release-2.0.0-M7-RC1     <i class="conum" data-value="1"></i><b>(1)</b></code></pre>
 </div>
 </div>
 </li>
@@ -515,7 +523,7 @@ These steps:</td>
 <p>For simpleapp starter app, similarly:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release-2.0.0-M6-RC1     <i class="conum" data-value="1"></i><b>(1)</b></code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release-2.0.0-M7-RC1     <i class="conum" data-value="1"></i><b>(1)</b></code></pre>
 </div>
 </div>
 </li>
@@ -563,7 +571,7 @@ These steps:</td>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/release-process-prereqs.html b/content/comguide/latest/release-process-prereqs.html
index 6b58fd5..52686fc 100644
--- a/content/comguide/latest/release-process-prereqs.html
+++ b/content/comguide/latest/release-process-prereqs.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <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/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/release-process-prereqs.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/release-process-prereqs.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -540,7 +548,7 @@ A description of how to do this can be found, for example, <a href="http://bval.
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/starter-apps.html b/content/comguide/latest/starter-apps.html
index fb30de6..0d46616 100644
--- a/content/comguide/latest/starter-apps.html
+++ b/content/comguide/latest/starter-apps.html
@@ -39,43 +39,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -83,34 +83,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -126,7 +126,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -362,6 +362,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -400,7 +408,7 @@ page.parent doesn't seem to be set...
     <li><a href="starter-apps.html">Starter Apps</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/starter-apps.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/starter-apps.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -480,7 +488,7 @@ Then we build and copy over to the apache/isis-site repo to publish up to isis.a
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/updating-the-website.html b/content/comguide/latest/updating-the-website.html
index 7b64291..be5ee65 100644
--- a/content/comguide/latest/updating-the-website.html
+++ b/content/comguide/latest/updating-the-website.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <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/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/updating-the-website.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -412,7 +420,7 @@ page.parent doesn't seem to be set...
 <div class="sectionbody">
 <div class="paragraph">
 <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-M6</code>).
+An (intentional) side-effect of this process is to create a branch for the release (that is, <code>2.0.0-M7</code>).
 This branch can then be used for documentation updates.</p>
 </div>
 </div>
@@ -429,7 +437,7 @@ This branch can then be used for documentation updates.</p>
 <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 checkout 2.0.0-M6</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git checkout 2.0.0-M7</code></pre>
 </div>
 </div>
 </li>
@@ -437,10 +445,39 @@ This branch can then be used for documentation updates.</p>
 <p>make documentation updates, and commit changes</p>
 </li>
 <li>
+<p>make sure config properties are up-to-date:</p>
+<div class="paragraph">
+<p>This is most easily done by rebuilding all:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">pushd isis-parent
+mvn clean install -DskipTests -Dreleased
+popd</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Though it might be sufficient to just build the core/config module</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn clean install -pl core/config</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p>make sure the tooling is also built:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">mvn -D module-tooling -D skip.essential install -DskipTests</code></pre>
+</div>
+</div>
+</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">sh preview.sh</code></pre>
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">bash preview.sh</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -516,7 +553,7 @@ git add .</code></pre>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git commit -m "updates website"
 
-sh preview.sh</code></pre>
+bash preview.sh</code></pre>
 </div>
 </div>
 </li>
@@ -600,7 +637,7 @@ Additional config options for the crawler can be found <a href="https://www.algo
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/comguide/latest/verifying-releases.html b/content/comguide/latest/verifying-releases.html
index be8ff9b..62df432 100644
--- a/content/comguide/latest/verifying-releases.html
+++ b/content/comguide/latest/verifying-releases.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -364,6 +364,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -403,7 +411,7 @@ page.parent doesn't seem to be set...
     <li><a href="verifying-releases.html">Verifying Releases</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/comguide/modules/ROOT/pages/verifying-releases.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/comguide/modules/ROOT/pages/verifying-releases.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -501,7 +509,7 @@ Run these commands, with the environment variables set correctly.
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">VERSION=2.0.0-M6
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">VERSION=2.0.0-M7
 RC=RC1
 NEXUSREPONUM=11xx
 
@@ -665,7 +673,7 @@ Things to check include:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/latest/about.html b/content/conguide/latest/about.html
index 56632f0..0d93411 100644
--- a/content/conguide/latest/about.html
+++ b/content/conguide/latest/about.html
@@ -40,43 +40,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -84,34 +84,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -127,7 +127,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -349,6 +349,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -386,7 +394,7 @@ page.parent doesn't seem to be set...
     <li><a href="about.html">Contributors' Guide</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/conguide/modules/ROOT/pages/about.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/conguide/modules/ROOT/pages/about.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -411,7 +419,7 @@ page.parent doesn't seem to be set...
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/latest/agilej/about.html b/content/conguide/latest/agilej/about.html
index 4653c72..40f5526 100644
--- a/content/conguide/latest/agilej/about.html
+++ b/content/conguide/latest/agilej/about.html
@@ -39,43 +39,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -83,34 +83,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -126,7 +126,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../../_/img/home.png"></img>
           </span>
@@ -348,6 +348,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -386,7 +394,7 @@ page.parent doesn't seem to be set...
     <li><a href="about.html">AgileJ</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/conguide/modules/agilej/pages/about.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/conguide/modules/agilej/pages/about.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -467,7 +475,7 @@ hide method lines</code></pre>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/latest/building-apache-isis.html b/content/conguide/latest/building-apache-isis.html
index f150a23..47f8d6e 100644
--- a/content/conguide/latest/building-apache-isis.html
+++ b/content/conguide/latest/building-apache-isis.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -350,6 +350,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -388,7 +396,7 @@ page.parent doesn't seem to be set...
     <li><a href="building-apache-isis.html">Building Apache Isis</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/conguide/modules/ROOT/pages/building-apache-isis.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/conguide/modules/ROOT/pages/building-apache-isis.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -603,56 +611,13 @@ Note that the JRE is <em>not</em> sufficient.</p>
 </tr>
 </table>
 </div>
-<div class="sect2">
-<h3 id="configure-maven-toolchains-plugin"><a class="anchor" href="#configure-maven-toolchains-plugin"></a>Configure Maven toolchains plugin</h3>
-<div class="paragraph">
-<p>If you are a committer that will be performing releases of Apache Isis, then you <em>must</em> configure the
-<a href="http://maven.apache.org/plugins/maven-toolchains-plugin/">toolchains</a> plugin so that releases can be built using Java 11.</p>
-</div>
-<div class="paragraph">
-<p>This is done by placing the <code>toolchains.xml</code> file in <code>~/.m2</code> directory.
-Use the following file as a template, adjusting paths for your platform:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">&lt;?xml version="1.0" encoding="UTF8"?&gt;
-&lt;toolchains&gt;
-    &lt;toolchain&gt;
-        &lt;type&gt;jdk&lt;/type&gt;
-        &lt;provides&gt;
-            &lt;version&gt;1.8&lt;/version&gt;            <i class="conum" data-value="1"></i><b>(1)</b>
-            &lt;vendor&gt;openjdk&lt;/vendor&gt;
-        &lt;/provides&gt;
-        &lt;configuration&gt;
-            &lt;jdkHome&gt;C:\Program Files\OpenJDK\openjdk-8u262-b10&lt;/jdkHome&gt;    <i class="conum" data-value="2"></i><b>(2)</b>
-        &lt;/configuration&gt;
-    &lt;/toolchain&gt;
-&lt;/toolchains&gt;</code></pre>
-</div>
-</div>
-<div class="colist arabic">
-<table>
-<tr>
-<td><i class="conum" data-value="1"></i><b>1</b></td>
-<td>The Apache Isis build is configured to search for the (<code>1.8, openjdk</code>) JDK toolchain.</td>
-</tr>
-<tr>
-<td><i class="conum" data-value="2"></i><b>2</b></td>
-<td>adjust as necessary</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>The Apache Isis parent <code>pom.xml</code> activates this plugin whenever the <code>apache-release</code> profile is enabled.</p>
-</div>
-</div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="installing-maven"><a class="anchor" href="#installing-maven"></a>Installing Maven</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Install Maven 3.0.x, downloadable <a href="http://maven.apache.org/download.html">here</a>.</p>
+<p>Install Maven 3.6.3 or later, downloadable <a href="http://maven.apache.org/download.html">here</a>.</p>
 </div>
 <div class="paragraph">
 <p>Set <code>MAVEN_OPTS</code> environment variable:</p>
@@ -868,7 +833,7 @@ This is in preparation for Java 9 module system (Jigsaw) which will prevent such
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/latest/contributing.html b/content/conguide/latest/contributing.html
index 444869d..f87cb13 100644
--- a/content/conguide/latest/contributing.html
+++ b/content/conguide/latest/contributing.html
@@ -41,43 +41,43 @@
           <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-M6/starters/helloworld.html">Hello World</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/starters/simpleapp.html">Simple App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/starters/helloworld.html">Hello World</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/demo/about.html">Demo App</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/resources/cheatsheet.html">Cheatsheet</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/resources/icons.html">Icons</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/resources/cheatsheet.html">Cheatsheet</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Setup Guide</a>
+            <a class="navbar-item" href="../../setupguide/2.0.0-M7/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-M6/about.html">User Guide</a>
-            <a class="navbar-item" href="../../refguide/2.0.0-M6/about.html">Reference Guide</a>
-            <a class="navbar-item" href="../../testing/2.0.0-M6/about.html">Testing Guide</a>
+            <a class="navbar-item" href="../../userguide/2.0.0-M7/about.html">User Guide</a>
+            <a class="navbar-item" href="../../refguide/2.0.0-M7/about.html">Reference Guide</a>
+            <a class="navbar-item" href="../../testing/2.0.0-M7/about.html">Testing Guide</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-M6/about.html">Web UI (Wicket)</a>
-            <a class="navbar-item" href="../../vro/2.0.0-M6/about.html">REST API (Restful Objects)</a>
+            <a class="navbar-item" href="../../vw/2.0.0-M7/about.html">Web UI (Wicket)</a>
+            <a class="navbar-item" href="../../vro/2.0.0-M7/about.html">REST API (Restful Objects)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Persistence</span>
-            <a class="navbar-item" href="../../pjpa/2.0.0-M6/about.html">JPA (EclipseLink)</a>
-            <a class="navbar-item" href="../../pjdo/2.0.0-M6/about.html">JDO (DataNucleus)</a>
+            <a class="navbar-item" href="../../pjpa/2.0.0-M7/about.html">JPA (EclipseLink)</a>
+            <a class="navbar-item" href="../../pjdo/2.0.0-M7/about.html">JDO (DataNucleus)</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Security</span>
-            <a class="navbar-item" href="../../security/2.0.0-M6/about.html">Security Guide</a>
+            <a class="navbar-item" href="../../security/2.0.0-M7/about.html">Security Guide</a>
             <hr class="navbar-divider"/>
           </div>
         </div>
@@ -85,34 +85,34 @@
           <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-M6/about.html">Subdomain Libraries</a>
-            <a class="navbar-item" href="../../valuetypes/2.0.0-M6/about.html">Value Type Catalog</a>
+            <a class="navbar-item" href="../../subdomains/2.0.0-M7/about.html">Subdomain Libraries</a>
+            <a class="navbar-item" href="../../valuetypes/2.0.0-M7/about.html">Value Type Catalog</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Integrate between Apps</span>
-            <a class="navbar-item" href="../../mappings/2.0.0-M6/about.html">Bounded Context Mapping Libraries</a>
+            <a class="navbar-item" href="../../mappings/2.0.0-M7/about.html">Bounded Context Mapping Libraries</a>
             <hr class="navbar-divider"/>
             <span class="navbar-item navbar-heading">Extending the framework itself</span>
-            <a class="navbar-item" href="../../extensions/2.0.0-M6/about.html">Extensions Catalog</a>
+            <a class="navbar-item" href="../../extensions/2.0.0-M7/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-M6/support/slack-channel.html">Slack</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/support/mailing-list.html">Mailing Lists</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/support/slack-channel.html">Slack</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/downloads/how-to.html">Downloads</a>
-            <a class="navbar-item" href="../../relnotes/2.0.0-M6/about.html">Release Notes</a>
-            <a class="navbar-item" href="../../docs/2.0.0-M6/archive/1-x.html">Archive (1.x)</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/downloads/how-to.html">Downloads</a>
+            <a class="navbar-item" href="../../relnotes/2.0.0-M7/about.html">Release Notes</a>
+            <a class="navbar-item" href="../../docs/2.0.0-M7/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-M6/about.html">Contributors' Guide</a>
-            <a class="navbar-item" href="../../comguide/2.0.0-M6/about.html">Committers' Guide</a>
-            <a class="navbar-item" href="../../core/2.0.0-M6/about.html">Core Design</a>
+            <a class="navbar-item" href="../../conguide/2.0.0-M7/about.html">Contributors' Guide</a>
+            <a class="navbar-item" href="../../comguide/2.0.0-M7/about.html">Committers' Guide</a>
+            <a class="navbar-item" href="../../core/2.0.0-M7/about.html">Core Design</a>
           </div>
         </div>
         <div class="navbar-item has-dropdown is-hoverable">
@@ -128,7 +128,7 @@
             <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-M6/about.html">
+        <a class="navbar-item" href="../../docs/2.0.0-M7/about.html">
           <span class="icon">
             <img src="../../_/img/home.png"></img>
           </span>
@@ -350,6 +350,14 @@ page.parent doesn't seem to be set...
       </ul>
     </li>
     <li class="component">
+      <span class="title">Tutorials</span>
+      <ul class="versions">
+        <li class="version is-latest">
+          <a href="../../tutorials/latest/about.html">latest</a>
+        </li>
+      </ul>
+    </li>
+    <li class="component">
       <span class="title">User Guide</span>
       <ul class="versions">
         <li class="version is-latest">
@@ -388,7 +396,7 @@ page.parent doesn't seem to be set...
     <li><a href="contributing.html">Contributing</a></li>
   </ul>
 </nav>
-  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M6-RC1/antora/components/conguide/modules/ROOT/pages/contributing.adoc">Edit</a></div>
+  <div class="edit-this-page"><a href="https://github.com/apache/isis/edit/release-2.0.0-M7-RC1/antora/components/conguide/modules/ROOT/pages/contributing.adoc">Edit</a></div>
 </div>
 <article class="doc">
     <a name="section-top"></a>
@@ -775,7 +783,7 @@ If so, use:</p>
             </p>
         </div>
         <div class="revision">
-            <p>Revision: release-2.0.0-M6-RC1.20210822-1720</p>
+            <p>Revision: release-2.0.0-M7-RC1.20220213-1333</p>
         </div>
     </div>
 </footer>
diff --git a/content/conguide/latest/documentation/_images/diag-6583b9501f99503130bf355e5911a608e0345f19.svg b/content/conguide/latest/documentation/_images/diag-6583b9501f99503130bf355e5911a608e0345f19.svg
deleted file mode 100644
index ec51a6e..0000000
--- a/content/conguide/latest/documentation/_images/diag-6583b9501f99503130bf355e5911a608e0345f19.svg
+++ /dev/null
@@ -1,1420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="565px" preserveAspectRatio="none" style="width:525px;height:565px;background:#FFFFFF;" version="1.1" viewBox="0 0 525 565" width="525px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="424" x="44"  [...]
-entity customer--><rect fill="#08427B" height="151.9999" style="stroke:#073B6F;stroke-width:1.5;" width="203" x="172.5" y="28.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="47" x="250.5" y="50.5999">«person»</text><image height="48" width="48" x="250" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAACD0lEQVR4Xu2YoU4EMRCGT+4j8Ai8AhaH4QHgAUjQuFMECUgMIUgwJAgMhgQsAYUiJCiQIBBY+EITsjfTdm [...]
-entity banking_system--><rect fill="#1168BD" height="103.9999" style="stroke:#3C7FC0;stroke-width:1.5;" width="220" x="7" y="256.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="93" y="278.5999">«system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="187" x="23.5" y="297">Internet Banking System</text><text fill="#FFFFFF" font-family=" [...]
-entity mail_system--><rect fill="#999999" height="103.9999" style="stroke:#8A8A8A;stroke-width:1.5;" width="174" x="345" y="256.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="383" y="278.5999">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="106" x="379" y="297">E-mail system</text><text fill="#FFFFFF" font-family="sa [...]
-entity mainframe--><rect fill="#999999" height="123.2" style="stroke:#8A8A8A;stroke-width:1.5;" width="207" x="13.5" y="436.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="68" y="458.5999">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="147" x="41.5" y="477">Mainframe Banking</text><text fill="#FFFFFF" font-family="sa [...]
-link customer to banking_system--><path d="M215.54,180.8199 C197.76,203.6899 178.52,228.4499 161.79,249.9699 " fill="none" id="customer-to-banking_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="156.68,256.5399,163.9547,252.0589,159.2145,248.3804,156.68,256.5399" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="30" x="192" y="223.5999">Uses</text>< [...]
-reverse link customer to mail_system--><path d="M337.96,187.3699 C356.25,210.7599 375.66,235.5699 392.06,256.5399 " fill="none" id="customer-backto-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="332.83,180.8199,335.3965,188.9693,340.1222,185.2723,332.83,180.8199" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="95" x="368" y="223.5999">Sends  [...]
-link banking_system to mail_system--><path d="M227.17,308.5999 C262.9,308.5999 302.2,308.5999 336.75,308.5999 " fill="none" id="banking_system-to-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="344.96,308.5999,336.96,305.5999,336.96,311.5999,344.96,308.5999" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="81" x="245.5" y="288.5999">Sends e-ma [...]
-link banking_system to mainframe--><path d="M117,360.8399 C117,381.5999 117,405.8899 117,428.1699 " fill="none" id="banking_system-to-mainframe" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="117,436.2699,120,428.2699,114,428.2699,117,436.2699" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="30" x="118" y="403.5999">Uses</text><!--MD5=[50be6e3e52af99903d [...]
-@startuml
-' C4-PlantUML
-' https://github.com/plantuml-stdlib/C4-PlantUML/tree/v2.2.0
-
-' Colors
-' ##################################
-
-!global $ELEMENT_FONT_COLOR = "#FFFFFF"
-
-!global $ARROW_COLOR = "#666666"
-
-!global $BOUNDARY_COLOR = "#444444"
-!global $BOUNDARY_BG_COLOR = "#FFFFFF"
-
-!global $LEGEND_FONT_COLOR = "#FFFFFF"
-!global $LEGEND_TITLE_COLOR = "#000000"
-!global $LEGEND_UNDEFINED_BG_COLOR = "#D5CFEE"
-!global $LEGEND_UNDEFINED_FONT_COLOR = "#8B77E4"
-
-!global $LEGEND_SHADOW_TEXT = "(shadow) "
-!global $LEGEND_NO_SHADOW_TEXT = "(no shadow) "
-!global $LEGEND_NO_FONT_BG_TEXT = "(no text, no back color) "
-!global $LEGEND_NO_FONT_TEXT = "(no text color) "
-!global $LEGEND_NO_BG_TEXT = "(no back color) "
-!global $LEGEND_NO_LINE_TEXT = "(no line color) "
-
-' Styling
-' ##################################
-
-!global $TECHN_FONT_SIZE = 12
-
-skinparam defaultTextAlignment center
-
-skinparam wrapWidth 200
-skinparam maxMessageSize 150
-
-skinparam LegendBorderColor transparent
-skinparam LegendBackgroundColor transparent
-skinparam LegendFontColor $LEGEND_FONT_COLOR
-
-skinparam rectangle {
-    StereotypeFontSize 12
-    shadowing false
-}
-
-skinparam database {
-    StereotypeFontSize 12
-    shadowing false
-}
-
-skinparam queue {
-    StereotypeFontSize 12
-    shadowing false
-}
-
-skinparam Arrow {
-    Color $ARROW_COLOR
-    FontColor $ARROW_COLOR
-    FontSize 12
-}
-
-' Some boundary skinparam have to be set a package skinparams too (PlantUML uses internal packages)
-skinparam package {
-    StereotypeFontSize 6
-    StereotypeFontColor $BOUNDARY_BG_COLOR
-    FontStyle plain
-    BackgroundColor $BOUNDARY_BG_COLOR
-}
-
-skinparam rectangle<<boundary>> {
-    Shadowing false
-    StereotypeFontSize 6
-    StereotypeFontColor $BOUNDARY_BG_COLOR
-    FontColor $BOUNDARY_COLOR
-    BorderColor $BOUNDARY_COLOR
-    BackgroundColor $BOUNDARY_BG_COLOR
-    BorderStyle dashed
-}
-
-' Legend and Tags
-' ##################################
-!global $tagDefaultLegend = ""
-!global $tagCustomLegend = ""
-
-' rel specific
-!unquoted function $toStereos($tags)
-  !if (%strlen($tags) == 0)
-    !return ''
-  !endif
-  !$stereos = ''
-  !$brPos = %strpos($tags, "+")
-  !while ($brPos >= 0)
-    !$tag = %substr($tags, 0, $brPos)
-    !$stereos = $stereos + '<<' + $tag + '>>'
-%set_variable_value("$" + $tag + "_LineLegend", %true())
-    !$tags = %substr($tags, $brPos+1)
-    !$brPos = %strpos($tags, "+")
-  !endwhile
-  !if (%strlen($tags)>0)
-    !$stereos = $stereos + '<<' + $tags + '>>'
-%set_variable_value("$" + $tags + "_LineLegend", %true())
-  !endif
-  !return $stereos
-!endfunction
-
-!unquoted function $toStereos($elementType, $tags)
-  !if (%strlen($tags) == 0)
-    !$stereos = '<<' + $elementType + '>>'
-%set_variable_value("$" + $elementType + "Legend", %true())
-    !return $stereos
-  !endif
-  !$stereos = ''
-  !$brPos = %strpos($tags, "+")
-  !while ($brPos >= 0)
-    !$tag = %substr($tags, 0, $brPos)
-    !$stereos = $stereos + '<<' + $tag + '>>'
-%set_variable_value("$" + $tag + "Legend", %true())
-    !$tags = %substr($tags, $brPos+1)
-    !$brPos = %strpos($tags, "+")
-  !endwhile
-  !if (%strlen($tags)>0)
-    !$stereos = $stereos + '<<' + $tags + '>>'
-%set_variable_value("$" + $tags + "Legend", %true())
-  !endif
-  ' has to be last, otherwise PlantUML overwrites all tag specific skinparams
-  !$stereos = $stereos + '<<' + $elementType + '>>'
-%set_variable_value("$" + $elementType + "Legend", %true())
-  !return $stereos
-!endfunction
-
-!function $elementTagSkinparams($element, $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-  !$elementSkin = "skinparam " + $element +"<<" + $tagStereo + ">> {" + %newline()
-  !if ($fontColor!="")
-    !if ($tagStereo != "boundary")
-      !$elementSkin = $elementSkin + "    StereotypeFontColor " + $fontColor + %newline()
-    !endif
-    !$elementSkin = $elementSkin + "    FontColor " + $fontColor + %newline()
-  !endif
-  !if ($bgColor!="")
-    !$elementSkin = $elementSkin + "    BackgroundColor " + $bgColor + %newline()
-  !endif
-  !if ($borderColor!="")
-    !$elementSkin = $elementSkin + "    BorderColor " + $borderColor+ %newline()
-  !endif
-  !if ($shadowing == "true")
-    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "true" + %newline()
-  !endif
-  !if ($shadowing == "false")
-    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "false" + %newline()
-  !endif
-  !$elementSkin = $elementSkin + "}" + %newline()
-  !return $elementSkin
-!endfunction
-
-!unquoted procedure $defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-  !$tagSkin = $elementTagSkinparams("rectangle", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-  !$tagSkin = $tagSkin + $elementTagSkinparams("database", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-  !$tagSkin = $tagSkin + $elementTagSkinparams("queue", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-  !if ($tagStereo == "boundary" && $bgColor!="")
-    !$tagSkin = $tagSkin + "skinparam package<<boundary>>StereotypeFontColor " + $bgColor + %newline()
-    !$tagSkin = $tagSkin + "skinparam rectangle<<boundary>>StereotypeFontColor " + $bgColor + %newline()
-  !endif
-$tagSkin
-!endprocedure
-
-' arrow colors cannot start with # (legend background has to start with #)
-!function ColorNoHash($c)
-  !if (%substr($c, 0, 1) == "#")
-    !$c = %substr($c,1)
-  !endif
-  !return $c
-!endfunction
-
-!unquoted procedure $defineRelSkinparams($tagStereo, $textColor, $lineColor)
-  !$elementSkin = "skinparam Arrow<<" + $tagStereo + ">> {" + %newline()
-  !$elementSkin = $elementSkin + "    Color "
-  !if ($lineColor!="")
-    !$elementSkin = $elementSkin + ColorNoHash($lineColor)
-  !endif
-  !if ($textColor!="")
-    !$elementSkin = $elementSkin + ";text:" + ColorNoHash($textColor)
-  !endif
-  !$elementSkin = $elementSkin + %newline()
-  !$elementSkin = $elementSkin + "}" + %newline()
-$elementSkin
-!endprocedure
-
-!function $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-  !$tagEntry = "|"
-  !if ($bgColor!="")
-    !$bg = $bgColor
-  !else
-    !$bg = $LEGEND_UNDEFINED_BG_COLOR
-  !endif
-  ' named colors have to start with # too
-  !if (%substr($bg, 0, 1) != "#")
-    !$bg = "#" + $bg
-  !endif
-  !$tagEntry = $tagEntry + "<" + $bg +">"
-  ' <U+25AF> ..white rectangle
-  !if ($borderColor!="")
-    !$tagEntry = $tagEntry + "<color:"+$borderColor+"> <U+25AF></color> "
-  !else
-    !$tagEntry = $tagEntry + "<color:"+$bg+"> <U+25AF></color> "
-  !endif
-  !if ($fontColor!="")
-    !$tagEntry = $tagEntry + "<color:"+$fontColor+">"
-  !else
-    !$tagEntry = $tagEntry + "<color:"+$LEGEND_UNDEFINED_FONT_COLOR+">"
-  !endif
-  !$tagEntry = $tagEntry + " " + $tagStereo + " "
-  !if ($shadowing == "true")
-    !$tagEntry = $tagEntry + $LEGEND_SHADOW_TEXT
-  !endif
-  !if ($shadowing == "false")
-    !$tagEntry = $tagEntry + $LEGEND_NO_SHADOW_TEXT
-  !endif
-  !if ($fontColor == "" && $bgColor == "")
-      !$tagEntry = $tagEntry + $LEGEND_NO_FONT_BG_TEXT
-  !else
-    !if ($fontColor == "")
-      !$tagEntry = $tagEntry + $LEGEND_NO_FONT_TEXT
-    !endif
-    !if ($bgColor == "")
-      !$tagEntry = $tagEntry + $LEGEND_NO_BG_TEXT
-    !endif
-  !endif
-  !$tagEntry = $tagEntry + "</color> "
-  !$tagEntry = $tagEntry + "|"
-  !return $tagEntry
-!endfunction
-
-!function $tagRelLegendEntry($tagStereo, $textColor, $lineColor)
-  !$tagEntry = "|"
-  ' <U+2500> ..white line
-  !if ($lineColor!="")
-    !$tagEntry = $tagEntry + "<color:"+$lineColor+"> <U+2500></color> "
-  !else
-    !$tagEntry = $tagEntry + " <U+2500> "
-  !endif
-  !if ($textColor!="")
-    !$tagEntry = $tagEntry + "<color:"+$textColor+">"
-  !else
-    !$tagEntry = $tagEntry + "<color:"+$LEGEND_UNDEFINED_FONT_COLOR+">"
-  !endif
-  !$tagEntry = $tagEntry + " " + $tagStereo + " "
-  !if ($textColor == "")
-    !$tagEntry = $tagEntry + $LEGEND_NO_FONT_TEXT
-  !endif
-  !if ($lineColor == "")
-    !$tagEntry = $tagEntry + $LEGEND_NO_LINE_TEXT
-  !endif
-  !$tagEntry = $tagEntry + "</color> "
-  !$tagEntry = $tagEntry + "|"
-  !return $tagEntry
-!endfunction
-
-!unquoted procedure $addTagToLegend($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
-'' if a combined element tag is defined (e.g. "v1.0&v1.1") then it is typically a merged color,
-'' like a new $fontColor="#fdae61" therefore it should be added to the legend
-'' and the & combined tags will be not removed
-'  !if (%strpos($tagStereo, "&")<0)
-    !$tagEntry = $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-%set_variable_value("$" + $tagStereo + "LegendEntry", $tagEntry)
-    !$tagCustomLegend = $tagCustomLegend + $tagStereo + "\n"
-'  !endif
-!endprocedure
-
-!unquoted procedure $addRelTagToLegend($tagStereo, $textColor="", $lineColor="")
-'' Arrows have a bug with stereotype/skinparams and cannot combine text colors of one stereotype
-'' and the line color of another stereotype. Therefore the text color of one tag and the line color
-'' of another tag have to be combined via a "workaround" tag ("v1.0&v1.1").
-'' This workaround tag could be theoretically removed in the legend but after that there would
-'' be an inconsistency between the element tags and the rel tags and therefore
-'' & combined workaround tags are not removed too (and in unlikely cases the color itself could be changed)
-'  !if (%strpos($tagStereo, "&")<0)
-    !$tagEntry = $tagRelLegendEntry($tagStereo, $textColor, $lineColor)
-%set_variable_value("$" + $tagStereo + "_LineLegendEntry", $tagEntry)
-    !$tagCustomLegend = $tagCustomLegend + $tagStereo + "_Line\n"
-'  !endif
-!endprocedure
-
-!procedure $showActiveLegendEntries($allDefined)
-  !$brPos = %strpos($allDefined, "\n")
-  !while ($brPos >= 0)
-    !$tagStereo = %substr($allDefined, 0, $brPos)
-    !$allDefined = %substr($allDefined, $brPos+2)
-    !$brPos = %strpos($allDefined, "\n")
-    !if (%variable_exists("$" + $tagStereo + "Legend"))
-%get_variable_value("$" + $tagStereo + "LegendEntry")
-    !endif
-  !endwhile
-  !if (%strlen($allDefined)>0)
-    !$tagStereo = $allDefined
-    !if (%variable_exists("$" + $tagStereo + "Legend"))
-%get_variable_value("$" + $tagStereo + "LegendEntry")
-    !endif
-  !endif
-!endprocedure
-
-' used by new defined tags
-!unquoted procedure AddElementTag($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
-$defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-$addTagToLegend($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing)
-!endprocedure
-
-' used by new defined rel tags
-!unquoted procedure AddRelTag($tagStereo, $textColor="", $lineColor="")
-$defineRelSkinparams($tagStereo, $textColor, $lineColor)
-$addRelTagToLegend($tagStereo, $textColor, $lineColor)
-!endprocedure
-
-' update the style of existing elements like person, ...
-!unquoted procedure UpdateElementStyle($elementName, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
-$defineSkinparams($elementName, $bgColor, $fontColor, $borderColor, $shadowing)
-  !$tagEntry = $tagLegendEntry($elementName, $bgColor, $fontColor, $borderColor, $shadowing)
-%set_variable_value("$" + $elementName + "LegendEntry", $tagEntry)
-!endprocedure
-
-/' @deprecated in favor of UpdateElementStyle '/
-!unquoted procedure UpdateSkinparamsAndLegendEntry($elementName, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
-UpdateElementStyle($elementName, $bgColor, $fontColor, $borderColor, $shadowing)
-!endprocedure
-
-' update the style of default relation, it has to set both properties (combined statement not working)
-!unquoted procedure UpdateRelStyle($textColor, $lineColor)
-  !$elementSkin = "skinparam Arrow {" + %newline()
-  !$elementSkin = $elementSkin + "    Color " + $lineColor + %newline()
-  !$elementSkin = $elementSkin + "    FontColor " + $textColor + %newline()
-  !$elementSkin = $elementSkin + "}" + %newline()
-$elementSkin
-!endprocedure
-
-' tags/stereotypes have to be delimited with \n
-!unquoted procedure SetDefaultLegendEntries($tagStereoEntries)
-  !$tagDefaultLegend = $tagStereoEntries
-!endprocedure
-
-' Links
-' ##################################
-
-!function $getLink($link)
-  !if ($link!="")
-    !return "[[" + $link + "]]"
-  !else
-    !return ""
-  !endif
-!endfunction
-
-' Line breaks
-' ##################################
-
-' PlantUML supports no DETERMINISTIC/automatic line breaks of "PlantUML line" (C4 Relashionships)
-' therefore Rel...() implements an automatic line break based on spaces (like in all other objects).
-' If a $type contains \n then these are used (and no automatic space based line breaks are done)
-' $REL_TECHN_MAX_CHAR_WIDTH defines the automatic line break position
-!global $REL_TECHN_MAX_CHAR_WIDTH = 35
-!global $REL_DESCR_MAX_CHAR_WIDTH = 32
-
-!unquoted function $breakDescr($descr, $widthStr)
-!$width = %intval($widthStr)
-!$multiLine = ""
-!if (%strpos($descr, "\n") >= 0)
-!else
-  !while (%strlen($descr)>$width)
-    !$brPos = $width
-    !while ($brPos>0 && %substr($descr, $brPos, 1)!= ' ')
-      !$brPos = $brPos - 1
-    !endwhile
-
-    !if ($brPos < 1)
-      !$brPos = %strpos($descr, " ")
-    !else
-    !endif
-
-    !if ($brPos > 0)
-      !$multiLine = $multiLine + %substr($descr, 0, $brPos) + "\n"
-      !$descr = %substr($descr, $brPos + 1)
-    !else
-      !$multiLine = $multiLine+ $descr
-      !$descr = ""
-    !endif
-  !endwhile
-!endif
-!if (%strlen($descr)>0)
-  !$multiLine = $multiLine + $descr
-!endif
-!return $multiLine
-!endfunction
-
-' $breakTechn() supports //...//; $breakNode() in C4_Deployment supports no //....//
-!unquoted function $breakTechn($techn, $widthStr)
-!$width = %intval($widthStr)
-!$multiLine = ""
-!if (%strpos($techn, "\n") >= 0)
-  !while (%strpos($techn, "\n") >= 0)
-    !$brPos = %strpos($techn, "\n")
-    !$multiLine = $multiLine + %substr($techn, 0, $brPos) + '</size>//\n//<size:'+$TECHN_FONT_SIZE+'>'
-    !$techn = %substr($techn, $brPos+2)
-  !endwhile
-!else
-  !while (%strlen($techn)>$width)
-    !$brPos = $width
-    !while ($brPos>0 && %substr($techn, $brPos, 1)!= ' ')
-      !$brPos = $brPos - 1
-    !endwhile
-
-    !if ($brPos < 1)
-      !$brPos = %strpos($techn, " ")
-    !else
-    !endif
-
-    !if ($brPos > 0)
-      !$multiLine = $multiLine + %substr($techn, 0, $brPos) + '</size>//\n//<size:'+$TECHN_FONT_SIZE+'>'
-      !$techn = %substr($techn, $brPos + 1)
-    !else
-      !$multiLine = $multiLine+ $techn
-      !$techn = ""
-    !endif
-  !endwhile
-!endif
-!if (%strlen($techn)>0)
-  !$multiLine = $multiLine + $techn
-!endif
-!return $multiLine
-!endfunction
-
-' Element properties
-' ##################################
-
-' collect all defined properties as table rows
-!global $propTable = ""
-!global $propTableCaption = ""
-!global $propColCaption = "="
-
-!unquoted function SetPropertyHeader($col1Name, $col2Name, $col3Name = "", $col4Name = "")
-  !$propColCaption = ""
-  !$propTableCaption = "|= " + $col1Name + " |= " + $col2Name + " |"
-  !if ($col3Name != "")
-    !$propTableCaption = $propTableCaption + "= " + $col3Name + " |"
-  !endif
-  !if ($col4Name != "")
-    !$propTableCaption = $propTableCaption + "= " + $col4Name + " |"
-  !endif
-  !return ""
-!endfunction
-
-!unquoted function WithoutPropertyHeader()
-  !$propTableCaption = ""
-  !$propColCaption = "="
-  !return ""
-!endfunction
-
-!unquoted function AddProperty($col1, $col2, $col3 = "", $col4 = "")
-  !if ($propTable == "")
-    !if ($propTableCaption != "")
-      !$propTable = $propTableCaption + "\n"
-    !endif
-  !else
-    !$propTable = $propTable + "\n"
-  !endif
-  !$propTable = $propTable + "| " + $col1 + " |" + $propColCaption + " " + $col2 + " |"
-  !if ($col3 != "")
-    !$propTable = $propTable + " " + $col3 + " |"
-  !endif
-  !if ($col4 != "")
-    !$propTable = $propTable + " " + $col4 + " |"
-  !endif
-  !return ""
-!endfunction
-
-!unquoted function $getProps($alignedNL = "\n")
-  !if ($propTable != "")
-    !$retTable = $alignedNL + $propTable
-    !$propTable = ""
-    !return $retTable
-  !endif
-  !return ""
-!endfunction
-
-!unquoted function $getProps_L()
-  !return $getProps("\l")
-!endfunction
-
-!unquoted function $getProps_R()
-  !return $getProps("\r")
-!endfunction
-
-SetPropertyHeader("Property","Value")
-
-' Layout
-' ##################################
-
-!procedure HIDE_STEREOTYPE()
-hide stereotype
-!endprocedure
-
-!procedure LAYOUT_AS_SKETCH()
-skinparam backgroundColor #EEEBDC
-skinparam handwritten true
-skinparam defaultFontName "Comic Sans MS"
-center footer <font color=red>Warning:</font> Created for discussion, needs to be validated
-!endprocedure
-
-!procedure LAYOUT_TOP_DOWN()
-top to bottom direction
-!endprocedure
-
-!procedure LAYOUT_LEFT_RIGHT()
-left to right direction
-!endprocedure
-
-' has to be last call in diagram
-!unquoted procedure SHOW_LEGEND($hideStereotype="true")
-!if ($hideStereotype=="true")
-hide stereotype
-!endif
-legend right
-|<color:$LEGEND_TITLE_COLOR>**Legend**</color> |
-$showActiveLegendEntries($tagDefaultLegend)
-$showActiveLegendEntries($tagCustomLegend)
-endlegend
-!endprocedure
-
-/' @deprecated in favor of SHOW_LEGEND '/
-!unquoted procedure SHOW_DYNAMIC_LEGEND($hideStereotype="true")
-SHOW_LEGEND($hideStereotype)
-!endprocedure
-
-' Boundaries
-' ##################################
-
-!function $getBoundary($label, $type)
-  !if ($type == "")
-    !return '==' + $label
-  !endif
-  !if (type != "")
-    !return '==' + $label + '\n<size:' + $TECHN_FONT_SIZE + '>[' + $type + ']</size>'
-  !endif
-!endfunction
-
-!unquoted procedure Boundary($alias, $label, $type="", $tags="", $link="")
-rectangle "$getBoundary($label, $type)" $toStereos("boundary", $tags) as $alias $getLink($link)
-!endprocedure
-
-' Relationship
-' ##################################
-
-!function $getRel($direction, $alias1, $alias2, $label, $techn, $descr, $sprite, $tags, $link)
-  !$rel = $alias1 + ' ' + $direction + ' ' + $alias2
-  !if ($tags != "")
-    !$rel = $rel + ' ' + $toStereos($tags)
-  !endif
-  !$rel = $rel + ' : '
-  !if ($sprite != "")
-    ' if it starts with & it's a OpenIconic, details see https://useiconic.com/open/
-    !if (%substr($sprite, 0, 1) != "&")
-      !$rel = $rel + '<$'+$sprite+'> '
-    !else
-      !$rel = $rel + '<'+$sprite+'> '
-    !endif
-  !endif
-  !if ($link != "")
-    !$rel = $rel + '**[[' + $link + ' ' + $label + ']]**'
-  !else
-    !$rel = $rel + '**' + $label + '**'
-  !endif
-  !if ($techn != "")
-    ' line break is not deterministic, calculate it
-    !$rel = $rel + '\n//<size:' + $TECHN_FONT_SIZE + '>[' + $breakTechn($techn, $REL_TECHN_MAX_CHAR_WIDTH) + ']</size>//'
-  !endif
-  !if ($descr != "")
-    ' line break is not deterministic, calculate it
-    !$rel = $rel + '\n\n' + $breakDescr($descr, $REL_DESCR_MAX_CHAR_WIDTH)
-  !endif
-  !return $rel
-!endfunction
-
-!unquoted procedure Rel_($alias1, $alias2, $label, $direction)
-$alias1 $direction $alias2 : **$label**
-!endprocedure
-!unquoted procedure Rel_($alias1, $alias2, $label, $techn, $direction)
-$alias1 $direction $alias2 : **$label**\n//<size:$TECHN_FONT_SIZE>[$techn]</size>//
-!endprocedure
-
-!unquoted procedure Rel($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("- ->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure BiRel($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<- ->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure Rel_Back($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<- -", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure Rel_Neighbor($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure Rel_Back_Neighbor($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure Rel_D($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure Rel_Down($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure BiRel_D($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure BiRel_Down($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure Rel_U($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure Rel_Up($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure BiRel_U($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure BiRel_Up($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure Rel_L($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure Rel_Left($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure BiRel_L($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure BiRel_Left($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure Rel_R($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure Rel_Right($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-!unquoted procedure BiRel_R($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-!unquoted procedure BiRel_Right($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
-$getRel("<<-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
-!endprocedure
-
-' Layout Helpers
-' ##################################
-
-!unquoted procedure Lay_D($from, $to)
-$from -[hidden]D- $to
-!endprocedure
-!unquoted procedure Lay_U($from, $to)
-$from -[hidden]U- $to
-!endprocedure
-!unquoted procedure Lay_R($from, $to)
-$from -[hidden]R- $to
-!endprocedure
-!unquoted procedure Lay_L($from, $to)
-$from -[hidden]L- $to
-!endprocedure' Scope: A single software system.
-' Primary elements: The software system in scope.
-' Supporting elements: People and software systems directly connected to the software system in scope.
-' Intended audience: Everybody, both technical and non-technical people, inside and outside of the software development team.
-
-' Colors
-' ##################################
-
-!global $PERSON_BG_COLOR = "#08427B"
-!global $PERSON_BORDER_COLOR = "#073B6F"
-!global $EXTERNAL_PERSON_BG_COLOR = "#686868"
-!global $EXTERNAL_PERSON_BORDER_COLOR = "#8A8A8A"
-!global $SYSTEM_BG_COLOR = "#1168BD"
-!global $SYSTEM_BORDER_COLOR = "#3C7FC0"
-!global $EXTERNAL_SYSTEM_BG_COLOR = "#999999"
-!global $EXTERNAL_SYSTEM_BORDER_COLOR = "#8A8A8A"
-
-' Styling
-' ##################################
-
-UpdateElementStyle("person", $PERSON_BG_COLOR, $ELEMENT_FONT_COLOR, $PERSON_BORDER_COLOR)
-UpdateElementStyle("external_person", $EXTERNAL_PERSON_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_PERSON_BORDER_COLOR)
-UpdateElementStyle("system", $SYSTEM_BG_COLOR, $ELEMENT_FONT_COLOR, $SYSTEM_BORDER_COLOR)
-UpdateElementStyle("external_system", $EXTERNAL_SYSTEM_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_SYSTEM_BORDER_COLOR)
-
-
-' Sprites
-' ##################################
-
-sprite $person [48x48/16] {
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-0000000000000000000049BCCA7200000000000000000000
-0000000000000000006EFFFFFFFFB3000000000000000000
-00000000000000001CFFFFFFFFFFFF700000000000000000
-0000000000000001EFFFFFFFFFFFFFF80000000000000000
-000000000000000CFFFFFFFFFFFFFFFF6000000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
-0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
-0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
-0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
-00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-000000000000000BFFFFFFFFFFFFFFFF5000000000000000
-0000000000000001DFFFFFFFFFFFFFF70000000000000000
-00000000000000000BFFFFFFFFFFFF500000000000000000
-0000000000000000005DFFFFFFFFA1000000000000000000
-0000000000000000000037ABB96100000000000000000000
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-000000000000025788300000000005886410000000000000
-000000000007DFFFFFFD9643347BFFFFFFFB400000000000
-0000000004EFFFFFFFFFFFFFFFFFFFFFFFFFFB1000000000
-000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFD200000000
-00000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE10000000
-0000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0000000
-000000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5000000
-000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD000000
-000009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF200000
-00000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF600000
-00000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF800000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
-00000EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF700000
-000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
-0000008FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD3000000
-000000014555555555555555555555555555555300000000
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-}
-
-sprite $person2 [48x48/16] {
-0000000000000000000049BCCA7200000000000000000000
-0000000000000000006EFFFFFFFFB3000000000000000000
-00000000000000001CFFFFFFFFFFFF700000000000000000
-0000000000000001EFFFFFFFFFFFFFF80000000000000000
-000000000000000CFFFFFFFFFFFFFFFF6000000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
-0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
-0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
-0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
-00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-000000000000000BFFFFFFFFFFFFFFFF5000000000000000
-0000000000000001DFFFFFFFFFFFFFF70000000000000000
-00000000000000000BFFFFFFFFFFFF500000000000000000
-0000000000000000005DFFFFFFFFA1000000000000000000
-0000000000000000000037ABB96100000000000000000000
-000000000002578888300000000005888864100000000000
-0000000007DFFFFFFFFD9643347BFFFFFFFFFB4000000000
-00000004EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB10000000
-0000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD2000000
-000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
-00003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-0000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF50000
-0003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0000
-0009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2000
-000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
-000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA000
-000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
-000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
-0009FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFF2000
-0003FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFD0000
-0000BFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFF50000
-00003FFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFB00000
-000006FFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFE100000
-0000007FFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFD2000000
-00000004EFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFB10000000
-0000000007DF8FFFFFFFFFFFFFFFFFFFFFF8FB4000000000
-000000000002578888888888888888888864100000000000
-}
-
-' Layout
-' ##################################
-
-SetDefaultLegendEntries("person\nsystem\nexternal_person\nexternal_system")
-
-!procedure LAYOUT_WITH_LEGEND()
-hide stereotype
-legend right
-|<color:$LEGEND_TITLE_COLOR>**Legend**</color> |
-|<$PERSON_BG_COLOR> person |
-|<$SYSTEM_BG_COLOR> system|
-|<$EXTERNAL_PERSON_BG_COLOR> external person |
-|<$EXTERNAL_SYSTEM_BG_COLOR> external system |
-endlegend
-!endprocedure
-
-!global $defaultPersonSprite = "person"
-
-!procedure HIDE_PERSON_SPRITE()
-  !$defaultPersonSprite = ""
-!endprocedure
-
-!unquoted procedure SHOW_PERSON_SPRITE($sprite="")
-  !if ($sprite == "")
-    !$defaultPersonSprite = "person"
-  !else
-    !$defaultPersonSprite = $sprite
-  !endif
-!endprocedure
-
-' Elements
-' ##################################
-
-!function $getPerson($label, $descr, $sprite)
-!if ($sprite == "") && ($defaultPersonSprite!="")
-  !$sprite = $defaultPersonSprite
-!endif
-!if ($descr == "") && ($sprite == "")
-  !return '=='+$label
-!endif
-!if ($descr == "") && ($sprite != "")
-  !return '<$'+$sprite+'>\n=='+$label
-!endif
-!if ($descr != "") && ($sprite == "")
-  !return '=='+$label+'\n\n '+$descr
-!endif
-!if ($descr != "") && ($sprite != "")
-  !return '<$'+$sprite+'>\n=='+$label+'\n\n '+$descr
-!endif
-!endfunction
-
-!function $getSystem($label, $descr, $sprite)
-!if ($descr == "") && ($sprite == "")
-!return '=='+$label
-!endif
-!if ($descr == "") && ($sprite != "")
-!return '<$'+$sprite+'>\n=='+$label
-!endif
-!if ($descr != "") && ($sprite == "")
-!return '=='+$label+'\n\n '+$descr
-!endif
-!if ($descr != "") && ($sprite != "")
-!return '<$'+$sprite+'>\n=='+$label+'\n\n '+$descr
-!endif
-!endfunction
-
-!unquoted procedure Person($alias, $label, $descr="", $sprite="", $tags="", $link="")
-rectangle "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("person", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure Person_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
-rectangle "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("external_person", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure System($alias, $label, $descr="", $sprite="", $tags="", $link="")
-rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
-rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure SystemDb($alias, $label, $descr="", $sprite="", $tags="", $link="")
-database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="", $tags="", $link="")
-queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure SystemDb_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
-database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure SystemQueue_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
-queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
-!endprocedure
-
-' Boundaries
-' ##################################
-
-!unquoted procedure Enterprise_Boundary($alias, $label, $tags="", $link="")
-Boundary($alias, $label, "Enterprise", $tags, $link)
-!endprocedure
-
-!unquoted procedure System_Boundary($alias, $label, $tags="", $link="")
-Boundary($alias, $label, "System", $tags, $link)
-!endprocedure' Scope: A single software system.
-' Primary elements: Containers within the software system in scope.
-' Supporting elements: People and software systems directly connected to the containers.
-' Intended audience: Technical people inside and outside of the software development team; including software architects, developers and operations/support staff.
-
-' Colors
-' ##################################
-
-!global $CONTAINER_BG_COLOR = "#438DD5"
-!global $CONTAINER_BORDER_COLOR = "#3C7FC0"
-!global $EXTERNAL_CONTAINER_BG_COLOR = "#B3B3B3"
-!global $EXTERNAL_CONTAINER_BORDER_COLOR = "#A6A6A6"
-
-' Styling
-' ##################################
-UpdateElementStyle("container", $CONTAINER_BG_COLOR, $ELEMENT_FONT_COLOR, $CONTAINER_BORDER_COLOR)
-UpdateElementStyle("external_container", $EXTERNAL_CONTAINER_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_CONTAINER_BORDER_COLOR)
-
-' Layout
-' ##################################
-
-SetDefaultLegendEntries("person\nsystem\ncontainer\nexternal_person\nexternal_system\nexternal_container")
-
-!procedure LAYOUT_WITH_LEGEND()
-hide stereotype
-legend right
-|<color:$LEGEND_TITLE_COLOR>**Legend**</color> |
-|<$PERSON_BG_COLOR> person |
-|<$SYSTEM_BG_COLOR> system |
-|<$CONTAINER_BG_COLOR> container |
-|<$EXTERNAL_PERSON_BG_COLOR> external person |
-|<$EXTERNAL_SYSTEM_BG_COLOR> external system |
-|<$EXTERNAL_CONTAINER_BG_COLOR> external container |
-endlegend
-!endprocedure
-
-' Elements
-' ##################################
-
-!function $getContainer($label, $techn, $descr, $sprite)
-!if ($descr == "") && ($sprite == "")
-!return '=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//'
-!endif
-!if ($descr == "") && ($sprite != "")
-!return '<$'+$sprite+'>\n=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//'
-!endif
-!if ($descr != "") && ($sprite == "")
-!return '=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//\n\n '+$descr
-!endif
-!if ($descr != "") && ($sprite != "")
-!return '<$'+$sprite+'>\n=='+$label+'\n//<size:'+$TECHN_FONT_SIZE+'>['+$techn+']</size>//\n\n '+$descr
-!endif
-!endfunction
-
-!unquoted procedure Container($alias, $label, $techn, $descr="", $sprite="", $tags="", $link="")
-rectangle "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure ContainerDb($alias, $label, $techn, $descr="", $sprite="", $tags="", $link="")
-database "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure ContainerQueue($alias, $label, $techn, $descr="", $sprite="", $tags="", $link="")
-queue "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("container", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure Container_Ext($alias, $label, $techn, $descr="", $sprite="", $tags="", $link="")
-rectangle "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure ContainerDb_Ext($alias, $label, $techn, $descr="", $sprite="", $tags="", $link="")
-database "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias $getLink($link)
-!endprocedure
-
-!unquoted procedure ContainerQueue_Ext($alias, $label, $techn, $descr="", $sprite="", $tags="", $link="")
-queue "$getContainer($label, $techn, $descr, $sprite)$getProps()" $toStereos("external_container", $tags) as $alias $getLink($link)
-!endprocedure
-
-' Boundaries
-' ##################################
-
-!unquoted procedure Container_Boundary($alias, $label, $tags="", $link="")
-Boundary($alias, $label, "Container", $tags, $link)
-!endprocedure
-
-title System Context diagram for Internet Banking System
-
-Person(customer, "Banking Customer", "A customer of the bank, with personal bank accounts.")
-System(banking_system, "Internet Banking System", "Allows customers to check their accounts.")
-
-System_Ext(mail_system, "E-mail system", "The internal Microsoft Exchange e-mail system.")
-System_Ext(mainframe, "Mainframe Banking System", "Stores all of the core banking information.")
-
-Rel(customer, banking_system, "Uses")
-Rel_Back(customer, mail_system, "Sends e-mails to")
-Rel_Neighbor(banking_system, mail_system, "Sends e-mails", "SMTP")
-Rel(banking_system, mainframe, "Uses")
-@enduml
-
-@startuml
-
-
-
-
-
-
-
-
-
-skinparam defaultTextAlignment center
-
-skinparam wrapWidth 200
-skinparam maxMessageSize 150
-
-skinparam LegendBorderColor transparent
-skinparam LegendBackgroundColor transparent
-skinparam LegendFontColor #FFFFFF
-
-skinparam rectangle {
-    StereotypeFontSize 12
-    shadowing false
-}
-
-skinparam database {
-    StereotypeFontSize 12
-    shadowing false
-}
-
-skinparam queue {
-    StereotypeFontSize 12
-    shadowing false
-}
-
-skinparam Arrow {
-    Color #666666
-    FontColor #666666
-    FontSize 12
-}
-
-skinparam package {
-    StereotypeFontSize 6
-    StereotypeFontColor #FFFFFF
-    FontStyle plain
-    BackgroundColor #FFFFFF
-}
-
-skinparam rectangle<<boundary>> {
-    Shadowing false
-    StereotypeFontSize 6
-    StereotypeFontColor #FFFFFF
-    FontColor #444444
-    BorderColor #444444
-    BackgroundColor #FFFFFF
-    BorderStyle dashed
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-skinparam rectangle<<person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #08427B
-    BorderColor #073B6F
-}
-skinparam database<<person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #08427B
-    BorderColor #073B6F
-}
-skinparam queue<<person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #08427B
-    BorderColor #073B6F
-}
-
-skinparam rectangle<<external_person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #686868
-    BorderColor #8A8A8A
-}
-skinparam database<<external_person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #686868
-    BorderColor #8A8A8A
-}
-skinparam queue<<external_person>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #686868
-    BorderColor #8A8A8A
-}
-
-skinparam rectangle<<system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #1168BD
-    BorderColor #3C7FC0
-}
-skinparam database<<system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #1168BD
-    BorderColor #3C7FC0
-}
-skinparam queue<<system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #1168BD
-    BorderColor #3C7FC0
-}
-
-skinparam rectangle<<external_system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #999999
-    BorderColor #8A8A8A
-}
-skinparam database<<external_system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #999999
-    BorderColor #8A8A8A
-}
-skinparam queue<<external_system>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #999999
-    BorderColor #8A8A8A
-}
-
-
-
-
-sprite $person [48x48/16] {
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-0000000000000000000049BCCA7200000000000000000000
-0000000000000000006EFFFFFFFFB3000000000000000000
-00000000000000001CFFFFFFFFFFFF700000000000000000
-0000000000000001EFFFFFFFFFFFFFF80000000000000000
-000000000000000CFFFFFFFFFFFFFFFF6000000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
-0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
-0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
-0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
-00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-000000000000000BFFFFFFFFFFFFFFFF5000000000000000
-0000000000000001DFFFFFFFFFFFFFF70000000000000000
-00000000000000000BFFFFFFFFFFFF500000000000000000
-0000000000000000005DFFFFFFFFA1000000000000000000
-0000000000000000000037ABB96100000000000000000000
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-000000000000025788300000000005886410000000000000
-000000000007DFFFFFFD9643347BFFFFFFFB400000000000
-0000000004EFFFFFFFFFFFFFFFFFFFFFFFFFFB1000000000
-000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFD200000000
-00000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE10000000
-0000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0000000
-000000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5000000
-000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD000000
-000009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF200000
-00000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF600000
-00000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF800000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
-00000EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF700000
-000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
-0000008FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD3000000
-000000014555555555555555555555555555555300000000
-000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000
-}
-
-sprite $person2 [48x48/16] {
-0000000000000000000049BCCA7200000000000000000000
-0000000000000000006EFFFFFFFFB3000000000000000000
-00000000000000001CFFFFFFFFFFFF700000000000000000
-0000000000000001EFFFFFFFFFFFFFF80000000000000000
-000000000000000CFFFFFFFFFFFFFFFF6000000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
-0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
-0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
-0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
-0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
-00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
-00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
-000000000000007FFFFFFFFFFFFFFFFFF100000000000000
-000000000000000BFFFFFFFFFFFFFFFF5000000000000000
-0000000000000001DFFFFFFFFFFFFFF70000000000000000
-00000000000000000BFFFFFFFFFFFF500000000000000000
-0000000000000000005DFFFFFFFFA1000000000000000000
-0000000000000000000037ABB96100000000000000000000
-000000000002578888300000000005888864100000000000
-0000000007DFFFFFFFFD9643347BFFFFFFFFFB4000000000
-00000004EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB10000000
-0000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD2000000
-000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
-00003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
-0000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF50000
-0003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0000
-0009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2000
-000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
-000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
-001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA000
-000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
-000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
-0009FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFF2000
-0003FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFD0000
-0000BFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFF50000
-00003FFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFB00000
-000006FFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFE100000
-0000007FFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFD2000000
-00000004EFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFB10000000
-0000000007DF8FFFFFFFFFFFFFFFFFFFFFF8FB4000000000
-000000000002578888888888888888888864100000000000
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-skinparam rectangle<<container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #438DD5
-    BorderColor #3C7FC0
-}
-skinparam database<<container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #438DD5
-    BorderColor #3C7FC0
-}
-skinparam queue<<container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #438DD5
-    BorderColor #3C7FC0
-}
-
-skinparam rectangle<<external_container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #B3B3B3
-    BorderColor #A6A6A6
-}
-skinparam database<<external_container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #B3B3B3
-    BorderColor #A6A6A6
-}
-skinparam queue<<external_container>> {
-    StereotypeFontColor #FFFFFF
-    FontColor #FFFFFF
-    BackgroundColor #B3B3B3
-    BorderColor #A6A6A6
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-title System Context diagram for Internet Banking System
-
-rectangle "<$person>\n==Banking Customer\n\n A customer of the bank, with personal bank accounts." <<person>> as customer 
-rectangle "==Internet Banking System\n\n Allows customers to check their accounts." <<system>> as banking_system 
-
-rectangle "==E-mail system\n\n The internal Microsoft Exchange e-mail system." <<external_system>> as mail_system 
-rectangle "==Mainframe Banking System\n\n Stores all of the core banking information." <<external_system>> as mainframe 
-
-customer - ->> banking_system : **Uses**
-customer <<- - mail_system : **Sends e-mails to**
-banking_system ->> mail_system : **Sends e-mails**\n//<size:12>[SMTP]</size>//
-banking_system - ->> mainframe : **Uses**
-@enduml
-
-PlantUML version 1.2021.8(Sat Jun 26 08:20:59 GMT 2021)
-(GPL source distribution)
-Java Runtime: OpenJDK Runtime Environment
-JVM: OpenJDK 64-Bit Server VM
-Default Encoding: UTF-8
-Language: en
-Country: US
---></g></svg>
\ No newline at end of file
diff --git a/content/conguide/latest/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg b/content/conguide/latest/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg
index 19fc9ae..e10f5ea 100644
--- a/content/conguide/latest/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg
+++ b/content/conguide/latest/documentation/_images/diag-754aa464614732e6d3716ee22fa558d5867965d3.svg
@@ -5,7 +5,7 @@ class Wheel--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id=
 class Person--><rect fill="#FEFECE" filter="url(#f1fbfkwplcf7tv)" height="48" id="Person" style="stroke:#A80036;stroke-width:1.5;" width="68" x="144.5" y="132"/><ellipse cx="159.5" cy="148" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M158.8594,151.7813 Q159.6563,151.7813 160.2188,151.5938 Q160.7969,151.3906 161.0313,151.1719 Q161.2813,150.9375 161.5156,150.75 Q161.7656,150.5469 161.9844,150.5469 Q162.3281,150.5469 162.5781,150.8125 Q162.8438,151.0625 [...]
 link Driver to Car--><path codeLine="3" d="M70.27,31 C95.12,31 129.24,31 152.48,31 " fill="none" id="Driver-Car" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="97.25,19.8,88.2049,16.8611,88.2049,22.7389,97.25,19.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="33" x="101.25" y="25">drives</text><!--MD5=[6190aadcc963d15c02367c0199cc5452]
 reverse link Car to Wheel--><path codeLine="4" d="M217.92,31 C240.96,31 269.69,31 291.35,31 " fill="none" id="Car-backto-Wheel" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="204.76,31,210.76,35,216.76,31,210.76,27,204.76,31" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="232,19.8,222.9549,16.8611,222.9549,22.7389,232,19.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdj [...]
-link Car to Person--><path codeLine="5" d="M178.5,55.14 C178.5,77.13 178.5,110.01 178.5,131.97 " fill="none" id="Car-Person" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="183.5,88.8,180.5611,97.8451,186.4389,97.8451,183.5,88.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="192.5" y="99">owns</text><!--MD5=[e7c8e8a4a2ba41a175acf58ccba60987]
+link Car to Person--><path codeLine="5" d="M178.5,55.14 C178.5,77.13 178.5,110.01 178.5,131.97 " fill="none" id="Car-Person" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#000000" points="183.5,88.8,180.5611,97.8451,186.4389,97.8451,183.5,88.8" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="29" x="192.5" y="99">owns</text><!--MD5=[6e7709ee6e98d7f67428007b3d2092d3]
 @startuml
 class Car
 
@@ -14,7 +14,7 @@ Car *- Wheel : have 4 >
 Car - - Person : < owns
 @enduml
 
-PlantUML version 1.2021.8(Sat Jun 26 08:20:59 GMT 2021)
+PlantUML version 1.2021.16(Wed Dec 08 17:25:22 GMT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/content/conguide/latest/documentation/_images/diag-eb272571d12d000c815df853605c5e9285cfb779.svg b/content/conguide/latest/documentation/_images/diag-eb272571d12d000c815df853605c5e9285cfb779.svg
new file mode 100644
index 0000000..e0f4d20
--- /dev/null
+++ b/content/conguide/latest/documentation/_images/diag-eb272571d12d000c815df853605c5e9285cfb779.svg
@@ -0,0 +1,4252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="565px" preserveAspectRatio="none" style="width:525px;height:565px;background:#FFFFFF;" version="1.1" viewBox="0 0 525 565" width="525px" zoomAndPan="magnify"><defs/><g><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="424" x="44"  [...]
+entity customer--><rect fill="#08427B" height="151.9999" style="stroke:#073B6F;stroke-width:1.5;" width="203" x="172.5" y="28.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="47" x="250.5" y="50.5999">«person»</text><image height="48" width="48" x="250" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAACD0lEQVR4Xu2YoU4EMRCGT+4j8Ai8AhaH4QHgAUjQuFMECUgMIUgwJAgMhgQsAYUiJCiQIBBY+EITsjfTdm [...]
+entity banking_system--><rect fill="#1168BD" height="103.9999" style="stroke:#3C7FC0;stroke-width:1.5;" width="220" x="7" y="256.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="48" x="93" y="278.5999">«system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="187" x="23.5" y="297">Internet Banking System</text><text fill="#FFFFFF" font-family=" [...]
+entity mail_system--><rect fill="#999999" height="103.9999" style="stroke:#8A8A8A;stroke-width:1.5;" width="174" x="345" y="256.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="383" y="278.5999">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="106" x="379" y="297">E-mail system</text><text fill="#FFFFFF" font-family="sa [...]
+entity mainframe--><rect fill="#999999" height="123.2" style="stroke:#8A8A8A;stroke-width:1.5;" width="207" x="13.5" y="436.5999"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="98" x="68" y="458.5999">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacing" textLength="147" x="41.5" y="477">Mainframe Banking</text><text fill="#FFFFFF" font-family="sa [...]
+link customer to banking_system--><path d="M215.54,180.8199 C197.76,203.6899 178.52,228.4499 161.79,249.9699 " fill="none" id="customer-to-banking_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="156.68,256.5399,163.9547,252.0589,159.2145,248.3804,156.68,256.5399" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="30" x="192" y="223.5999">Uses</text>< [...]
+reverse link customer to mail_system--><path d="M337.96,187.3699 C356.25,210.7599 375.66,235.5699 392.06,256.5399 " fill="none" id="customer-backto-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="332.83,180.8199,335.3965,188.9693,340.1222,185.2723,332.83,180.8199" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="95" x="368" y="223.5999">Sends  [...]
+link banking_system to mail_system--><path d="M227.17,308.5999 C262.9,308.5999 302.2,308.5999 336.75,308.5999 " fill="none" id="banking_system-to-mail_system" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="344.96,308.5999,336.96,305.5999,336.96,311.5999,344.96,308.5999" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="81" x="245.5" y="288.5999">Sends e-ma [...]
+link banking_system to mainframe--><path d="M117,360.8399 C117,381.5999 117,405.8899 117,428.1699 " fill="none" id="banking_system-to-mainframe" style="stroke:#666666;stroke-width:1.0;"/><polygon fill="#666666" points="117,436.2699,120,428.2699,114,428.2699,117,436.2699" style="stroke:#666666;stroke-width:1.0;"/><text fill="#666666" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacing" textLength="30" x="118" y="403.5999">Uses</text><!--MD5=[fdc0db0fe2fc29cdd1 [...]
+@startuml
+' convert it with additional command line argument -DRELATIVE_INCLUDE="." to use locally
+!if %variable_exists("RELATIVE_INCLUDE")
+' C4-PlantUML
+' https://github.com/plantuml-stdlib/C4-PlantUML/tree/v2.3.0
+
+' Colors
+' ##################################
+
+!global $ELEMENT_FONT_COLOR = "#FFFFFF"
+
+!global $ARROW_COLOR = "#666666"
+
+!global $BOUNDARY_COLOR = "#444444"
+!global $BOUNDARY_BG_COLOR = "transparent"
+
+!global $LEGEND_FONT_COLOR = "#FFFFFF"
+!global $LEGEND_TITLE_COLOR = "#000000"
+' %darken(darkkhaki,50), #khaki
+!global $LEGEND_DARK_COLOR = "#66622E"
+!global $LEGEND_LIGHT_COLOR = "#khaki"
+
+' Labels
+' ##################################
+
+!global $LEGEND_SHADOW_TEXT = "(shadow) "
+!global $LEGEND_NO_SHADOW_TEXT = "(no shadow) "
+!global $LEGEND_NO_FONT_BG_TEXT = "(no text, no back color) "
+!global $LEGEND_NO_FONT_TEXT = "(no text color) "
+!global $LEGEND_NO_BG_TEXT = "(no back color) "
+!global $LEGEND_NO_LINE_TEXT = "(no line color) "
+!global $LEGEND_ROUNDED_BOX = "(rounded box) "
+!global $LEGEND_EIGHT_SIDED = "(eight sided) "
+!global $LEGEND_DOTTED_LINE = "(dotted) "
+!global $LEGEND_DASHED_LINE = "(dashed) "
+!global $LEGEND_BOLD_LINE = "(bold) "
+
+' Styling
+' ##################################
+
+!global $TECHN_FONT_SIZE = 12
+!global $ROUNDED_BOX_SIZE = 25
+!global $EIGHT_SIDED_SIZE = 18
+
+!global $ROUNDED_BOX = "roundedBox"
+!global $EIGHT_SIDED = "eightSided"
+
+!global $DOTTED_LINE = "dotted"
+!global $DASHED_LINE = "dashed"
+!global $BOLD_LINE = "bold"
+
+skinparam defaultTextAlignment center
+
+skinparam wrapWidth 200
+skinparam maxMessageSize 150
+
+skinparam LegendBorderColor transparent
+skinparam LegendBackgroundColor transparent
+skinparam LegendFontColor $LEGEND_FONT_COLOR
+
+skinparam shadowing<<legendArea>> false
+' #00000000 is transparent
+skinparam rectangle<<legendArea>> {
+    backgroundcolor #00000000
+    bordercolor #00000000
+}
+
+skinparam rectangle {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam database {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam queue {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam arrow {
+    Color $ARROW_COLOR
+    FontColor $ARROW_COLOR
+    FontSize 12
+}
+
+skinparam actor {
+    StereotypeFontSize 12
+    shadowing false
+    style awesome
+}
+
+skinparam person {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+' Some boundary skinparams have to be set as package skinparams too (PlantUML uses internal packages)
+skinparam package {
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontStyle plain
+    BackgroundColor $BOUNDARY_BG_COLOR
+}
+
+skinparam rectangle<<boundary>> {
+    Shadowing false
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontColor $BOUNDARY_COLOR
+    BorderColor $BOUNDARY_COLOR
+    BackgroundColor $BOUNDARY_BG_COLOR
+    BorderStyle dashed
+}
+
+' Legend and Tags
+' ##################################
+!global $tagDefaultLegend = ""
+!global $tagCustomLegend = ""
+
+' rel specific
+!unquoted function $toStereos($tags)
+  !if (%strlen($tags) == 0)
+    !return ''
+  !endif
+  !$stereos = ''
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$stereos = $stereos + '<<' + $tag + '>>'
+%set_variable_value("$" + $tag + "_LineLegend", %true())
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags)>0)
+    !$stereos = $stereos + '<<' + $tags + '>>'
+%set_variable_value("$" + $tags + "_LineLegend", %true())
+  !endif
+  !return $stereos
+!endfunction
+
+' element specific (unused are hidden based on mask)
+!unquoted function $toStereos($elementType, $tags)
+  !if (%strlen($tags) == 0)
+    !$stereos = '<<' + $elementType + '>>'
+%set_variable_value("$" + $elementType + "Legend", %true())
+    !return $stereos
+  !endif
+  !$stereos = ''
+  !$mask = $resetMask()
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$stereos = $stereos + '<<' + $tag + '>>'
+    !$mergedMask = $combineMaskWithTag($mask, $tag)
+    !if ($mergedMask != $mask)
+%set_variable_value("$" + $tag + "Legend", %true())
+      !$mask = $mergedMask
+    !endif
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags)>0)
+    !$stereos = $stereos + '<<' + $tags + '>>'
+    !$mergedMask = $combineMaskWithTag($mask, $tags)
+    !if ($mergedMask != $mask)
+%set_variable_value("$" + $tags + "Legend", %true())
+      !$mask = $mergedMask
+    !endif
+  !endif
+  ' has to be last, otherwise PlantUML overwrites all tag specific skinparams
+  !$stereos = $stereos + '<<' + $elementType + '>>'
+  !$mergedMask = $combineMaskWithTag($mask, $elementType)
+  !if ($mergedMask != $mask)
+%set_variable_value("$" + $elementType + "Legend", %true())
+    !$mask = $mergedMask
+  !endif
+  !return $stereos
+!endfunction
+
+!function $elementTagSkinparams($element, $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$elementSkin = "skinparam " + $element +"<<" + $tagStereo + ">> {" + %newline()
+  !if ($fontColor!="")
+    !if ($tagStereo != "boundary")
+      !$elementSkin = $elementSkin + "    StereotypeFontColor " + $fontColor + %newline()
+    !endif
+    !$elementSkin = $elementSkin + "    FontColor " + $fontColor + %newline()
+  !endif
+  !if ($bgColor!="")
+    !$elementSkin = $elementSkin + "    BackgroundColor " + $bgColor + %newline()
+  !endif
+  !if ($borderColor!="")
+    !$elementSkin = $elementSkin + "    BorderColor " + $borderColor+ %newline()
+  !endif
+  !if ($shadowing == "true")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "true" + %newline()
+  !endif
+  !if ($shadowing == "false")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "false" + %newline()
+  !endif
+  ' only rectangle supports shape(d corners), define both skinparam that overlays are working
+  !if ($shape!="" && $element == "rectangle")
+    !if ($shape == $ROUNDED_BOX)
+      !$elementSkin = $elementSkin + "    RoundCorner " + $ROUNDED_BOX_SIZE+ %newline()
+      !$elementSkin = $elementSkin + "    DiagonalCorner " + "0" + %newline()
+    !elseif ($shape == $EIGHT_SIDED)
+      !$elementSkin = $elementSkin + "    RoundCorner " + "0" + %newline()
+      !$elementSkin = $elementSkin + "    DiagonalCorner " + $EIGHT_SIDED_SIZE+ %newline()
+    !endif
+  !endif
+  !$elementSkin = $elementSkin + "}" + %newline()
+  !return $elementSkin
+!endfunction
+
+!unquoted procedure $defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  ' only rectangle supports shape(d corners)
+  !$tagSkin = $elementTagSkinparams("rectangle", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$tagSkin = $tagSkin + $elementTagSkinparams("database", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  !$tagSkin = $tagSkin + $elementTagSkinparams("queue", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  ' actor has style awesome, therefore $fontColor is ignored and text uses $bgColor too
+  !$tagSkin = $tagSkin + $elementTagSkinparams("actor", $tagStereo, $bgColor, $bgColor, $borderColor, $shadowing, "")
+  !$tagSkin = $tagSkin + $elementTagSkinparams("person", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  !if ($tagStereo == "boundary" && $bgColor!="")
+    !$tagSkin = $tagSkin + "skinparam package<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+    !$tagSkin = $tagSkin + "skinparam rectangle<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+  !endif
+$tagSkin
+!endprocedure
+
+' arrow colors cannot start with # (legend background has to start with #)
+!function $colorWithoutHash($c)
+  !if (%substr($c, 0, 1) == "#")
+    !$c = %substr($c,1)
+  !endif
+  !return $c
+!endfunction
+
+!unquoted procedure $defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle)
+  !$elementSkin = "skinparam arrow<<" + $tagStereo + ">> {" + %newline()
+  !$elementSkin = $elementSkin + "    Color "
+  !if ($lineColor!="")
+    !$elementSkin = $elementSkin + $colorWithoutHash($lineColor)
+  !endif
+  !if ($textColor!="")
+    !$elementSkin = $elementSkin + ";text:" + $colorWithoutHash($textColor)
+  !endif
+  !if ($lineStyle!="")
+    !$elementSkin = $elementSkin + ";line." + $lineStyle
+  !endif
+  !$elementSkin = $elementSkin + %newline()
+  !$elementSkin = $elementSkin + "}" + %newline()
+$elementSkin
+!endprocedure
+
+' %is_dark() requires PlantUML version >=1.2021.6
+!if (%function_exists("%is_dark"))
+  !$PlantUMLSupportsDynamicLegendColor = %true()
+!else
+  !$PlantUMLSupportsDynamicLegendColor = %false()
+  !log "dynamic undefined legend colors" requires PlantUML version >= 1.2021.6, therefore only static assigned colors are used
+!endif
+
+!unquoted function $contrastLegend($color)
+  !if (%is_dark($color))
+    !$value = $LEGEND_LIGHT_COLOR
+  !else
+    !$value = $LEGEND_DARK_COLOR
+  !endif
+  !return $value
+!endfunction
+
+!unquoted function $flatLegend($color)
+  !if (%is_dark($color))
+    !$value = $LEGEND_DARK_COLOR
+  !else
+    !$value = $LEGEND_LIGHT_COLOR
+  !endif
+  !return $value
+!endfunction
+
+' legend background has to start with #
+!function $colorWithHash($c)
+  !if (%substr($c, 0, 1) != "#")
+    !$c = "#" + $c
+  !endif
+  !return $c
+!endfunction
+
+!function $addMaskFlag($mask, $attr)
+  !if ($attr == "")
+    !$mask = $mask + "0"
+  !else
+    !$mask = $mask + "1"
+  !endif
+  !return $mask
+!endfunction
+
+!function $orFlags($flag1, $flag2)
+  !if ($flag1 == "0" && $flag2 == "0")
+    !return "0"
+  !endif
+  !return "1"
+!endfunction
+
+!function $tagLegendMask($bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$mask = ""
+  !$mask = $addMaskFlag($mask, $bgColor)
+  !$mask = $addMaskFlag($mask, $fontColor)
+  !$mask = $addMaskFlag($mask, $borderColor)
+  !$mask = $addMaskFlag($mask, $shadowing)
+  !$mask = $addMaskFlag($mask, $shape)
+  !return $mask
+!endfunction
+
+!function $resetMask()
+  !return "00000"
+!endfunction
+
+!function $combineMasks($mask1, $mask2)
+  !$mask = ""
+  !$mask = $mask + $orFlags(%substr($mask1, 0, 1), %substr($mask2, 0, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 1, 1), %substr($mask2, 1, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 2, 1), %substr($mask2, 2, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 3, 1), %substr($mask2, 3, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 4, 1), %substr($mask2, 4, 1))
+  !return $mask
+!endfunction
+
+!function $combineMaskWithTag($mask1, $tag)
+  !$mask2 = %get_variable_value("$" + $tag+ "LegendMask")
+  !if ($mask2=="")
+    ' !log combineMaskWithTag $mask1, $tag, ... only $mask1
+    !return $mask1
+  !endif
+
+  ' !log combineMaskWithTag $mask1, $tag, $mask2 ... $combineMasks($mask1, $mask2)
+  !return  $combineMasks($mask1, $mask2)
+!endfunction
+
+!function $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$bg = $bgColor
+  !$fo = $fontColor
+  !$bo = $borderColor
+
+  !if ($fo == "")
+    !if ($bg != "")
+!if ($PlantUMLSupportsDynamicLegendColor)
+      !$fo = $contrastLegend($bg)
+!else
+      !$fo = $LEGEND_DARK_COLOR
+!endif
+    !else
+      !if ($bo == "")
+        !$fo = $LEGEND_DARK_COLOR
+        !$bg = $LEGEND_LIGHT_COLOR
+      !else
+!if ($PlantUMLSupportsDynamicLegendColor)
+        !$fo = $flatLegend($bo)
+        !$bg = $contrastLegend($bo)
+!else
+        !$fo = $LEGEND_DARK_COLOR
+        !$bg = $LEGEND_LIGHT_COLOR
+!endif
+      !endif
+    !endif
+  !else
+    !if ($bg == "")
+!if ($PlantUMLSupportsDynamicLegendColor)
+      !$bg = $contrastLegend($fo)
+!else
+      !$bg = $LEGEND_LIGHT_COLOR
+!endif
+    !endif
+  !endif
+
+  !if ($bo == "")
+    !$bo = $bg
+  !endif
+
+  !$tagEntry = "|"
+  !$tagEntry = $tagEntry + "<" + $colorWithHash($bg) +">" 
+  ' <U+25AF> ..white rectangle
+  !$tagEntry = $tagEntry + "<color:"+$bo+"> <U+25AF></color> "
+  !$tagEntry = $tagEntry + "<color:"+$fo+">"
+  !$tagEntry = $tagEntry + " " + $tagStereo + " "
+  !if ($shadowing == "true")
+    !$tagEntry = $tagEntry + $LEGEND_SHADOW_TEXT
+  !endif
+  !if ($shadowing == "false")
+    !$tagEntry = $tagEntry + $LEGEND_NO_SHADOW_TEXT
+  !endif
+  !if ($shape == $ROUNDED_BOX)
+    !$tagEntry = $tagEntry + $LEGEND_ROUNDED_BOX
+  !endif
+  !if ($shape == $EIGHT_SIDED)
+    !$tagEntry = $tagEntry + $LEGEND_EIGHT_SIDED
+  !endif
+  !if ($fontColor == "" && $bgColor == "")
+      !$tagEntry = $tagEntry + $LEGEND_NO_FONT_BG_TEXT
+  !else 
+    !if ($fontColor == "")
+      !$tagEntry = $tagEntry + $LEGEND_NO_FONT_TEXT
+    !endif
+    !if ($bgColor == "")
+      !$tagEntry = $tagEntry + $LEGEND_NO_BG_TEXT
+    !endif
+  !endif
+  !$tagEntry = $tagEntry + "</color> "
+  !$tagEntry = $tagEntry + "|"
+  !return $tagEntry 
+!endfunction
+
+!function $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle)
+  !$tc = $textColor
+  !$lc = $lineColor
+
+  !if ($tc=="")
+!if ($PlantUMLSupportsDynamicLegendColor)
+    !$tc = $flatLegend($ARROW_COLOR)
+!else
+    !$tc = $LEGEND_DARK_COLOR
+!endif
+  !endif
+  !if ($lc=="")
+!if ($PlantUMLSupportsDynamicLegendColor)
+    !$lc = $flatLegend($ARROW_COLOR)
+!else
+    !$lc = $LEGEND_DARK_COLOR
+!endif
+  !endif
+
+  !$tagEntry = "|"
+  ' <U+2500> ..white line
+  !$tagEntry = $tagEntry + "<color:"+$lc+"> <U+2500></color> "
+  !$tagEntry = $tagEntry + "<color:"+$tc+">"
+  !$tagEntry = $tagEntry + " " + $tagStereo + " "
+  !if ($textColor == "")
+    !$tagEntry = $tagEntry + $LEGEND_NO_FONT_TEXT
+  !endif
+  !if ($lineColor == "")
+    !$tagEntry = $tagEntry + $LEGEND_NO_LINE_TEXT
+  !endif
+  !if ($lineStyle != "")
+    !if ($lineStyle == $DOTTED_LINE)
+      !$tagEntry = $tagEntry + $LEGEND_DOTTED_LINE
+    !elseif ($lineStyle == $DASHED_LINE)
+      !$tagEntry = $tagEntry + $LEGEND_DASHED_LINE
+    !elseif ($lineStyle == $BOLD_LINE)
+      !$tagEntry = $tagEntry + $LEGEND_BOLD_LINE
+    !else
+      !$tagEntry = $tagEntry + "(" + $lineStyle + ") "
+    !endif
+  !endif
+  !$tagEntry = $tagEntry + "</color> "
+  !$tagEntry = $tagEntry + "|"
+  !return $tagEntry 
+!endfunction
+
+!global $LEGEND_DOTTED_LINE = "(dotted) "
+!global $LEGEND_DASHED_LINE = "(dashed) "
+!global $LEGEND_BOLD_LINE = "(bold) "
+
+!unquoted procedure $addTagToLegend($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="", $shape="")
+'' if a combined element tag is defined (e.g. "v1.0&v1.1") then it is typically a merged color,
+'' like a new $fontColor="#fdae61" therefore it should be added to the legend 
+'' and the & combined tags will be not removed
+'  !if (%strpos($tagStereo, "&")<0)
+   !$tagEntry = $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $tagStereo + "LegendEntry", $tagEntry)
+    !$tagCustomLegend = $tagCustomLegend + $tagStereo + "\n"
+  !$tagMask = $tagLegendMask( $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $tagStereo + "LegendMask", $tagMask)
+'  !endif
+!endprocedure
+
+!unquoted procedure $addRelTagToLegend($tagStereo, $textColor="", $lineColor="", $lineStyle="")
+'' Arrows have a bug with stereotype/skinparams and cannot combine text colors of one stereotype
+'' and the line color of another stereotype. Therefore the text color of one tag and the line color 
+'' of another tag have to be combined via a "workaround" tag ("v1.0&v1.1").
+'' This workaround tag could be theoretically removed in the legend but after that there would 
+'' be an inconsistency between the element tags and the rel tags and therefore 
+'' & combined workaround tags are not removed too (and in unlikely cases the color itself could be changed)
+'  !if (%strpos($tagStereo, "&")<0)
+    !$tagEntry = $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle)
+%set_variable_value("$" + $tagStereo + "_LineLegendEntry", $tagEntry)
+    !$tagCustomLegend = $tagCustomLegend + $tagStereo + "_Line\n"
+'  !endif
+!endprocedure
+
+!procedure $showActiveLegendEntries($allDefined)
+  !$brPos = %strpos($allDefined, "\n")
+  !while ($brPos >= 0)
+    !$tagStereo = %substr($allDefined, 0, $brPos)
+    !$allDefined = %substr($allDefined, $brPos+2)
+    !$brPos = %strpos($allDefined, "\n")
+    !if (%variable_exists("$" + $tagStereo + "Legend"))
+%get_variable_value("$" + $tagStereo + "LegendEntry")
+    !endif
+  !endwhile
+  !if (%strlen($allDefined)>0)
+    !$tagStereo = $allDefined
+    !if (%variable_exists("$" + $tagStereo + "Legend"))
+%get_variable_value("$" + $tagStereo + "LegendEntry")
+    !endif
+  !endif
+!endprocedure
+
+!function RoundedBoxShape()
+!return $ROUNDED_BOX
+!endfunction
+
+!function EightSidedShape()
+!return $EIGHT_SIDED
+!endfunction
+
+!function DottedLine()
+!return $DOTTED_LINE
+!endfunction
+
+!function DashedLine()
+!return $DASHED_LINE
+!endfunction
+
+!function BoldLine()
+!return $BOLD_LINE
+!endfunction
+
+' used by new defined tags
+!unquoted procedure AddElementTag($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="", $shape="")
+$defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+$addTagToLegend($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+!endprocedure
+
+' used by new defined rel tags
+!unquoted procedure AddRelTag($tagStereo, $textColor="", $lineColor="", $lineStyle = "")
+$defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle)
+$addRelTagToLegend($tagStereo, $textColor, $lineColor, $lineStyle)
+!endprocedure
+
+' update the style of existing elements like person, ...
+!unquoted procedure UpdateElementStyle($elementName, $bgColor="", $fontColor="", $borderColor="", $shadowing="", $shape="")
+$defineSkinparams($elementName, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$tagEntry = $tagLegendEntry($elementName, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $elementName + "LegendEntry", $tagEntry)
+  ' default tags sets at least bgColor and fontColor
+  !$tagMask = $tagLegendMask("CHANGED", "CHANGED", $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $elementName + "LegendMask", $tagMask)
+!endprocedure
+
+/' @deprecated in favor of UpdateElementStyle '/
+!unquoted procedure UpdateSkinparamsAndLegendEntry($elementName, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
+UpdateElementStyle($elementName, $bgColor, $fontColor, $borderColor, $shadowing)
+!endprocedure
+
+' update the style of default relation, it has to set both properties (combined statement not working)
+!unquoted procedure UpdateRelStyle($textColor, $lineColor)
+  !$elementSkin = "skinparam arrow {" + %newline()
+  !$elementSkin = $elementSkin + "    Color " + $lineColor + %newline()
+  !$elementSkin = $elementSkin + "    FontColor " + $textColor + %newline()
+  !$elementSkin = $elementSkin + "}" + %newline()
+$elementSkin
+!endprocedure
+
+' tags/stereotypes have to be delimited with \n 
+!unquoted procedure SetDefaultLegendEntries($tagStereoEntries)
+  !$tagDefaultLegend = $tagStereoEntries
+!endprocedure
+
+' Links
+' ##################################
+
+!function $getLink($link)
+  !if ($link!="")
+    !return "[[" + $link + "]]"
+  !else
+    !return ""
+  !endif
+!endfunction
+
+' Line breaks
+' ##################################
+
+' PlantUML supports no DETERMINISTIC/automatic line breaks of "PlantUML line" (C4 Relashionships)
+' therefore Rel...() implements an automatic line break based on spaces (like in all other objects).
+' If a $type contains \n then these are used (and no automatic space based line breaks are done)
+' $REL_TECHN_MAX_CHAR_WIDTH defines the automatic line break position
+!global $REL_TECHN_MAX_CHAR_WIDTH = 35
+!global $REL_DESCR_MAX_CHAR_WIDTH = 32
+
+!unquoted function $breakDescr($descr, $widthStr)
+!$width = %intval($widthStr)
+!$multiLine = ""
+!if (%strpos($descr, "\n") >= 0)
+!else
+  !while (%strlen($descr)>$width)
+    !$brPos = $width 
+    !while ($brPos>0 && %substr($descr, $brPos, 1)!= ' ')
+      !$brPos = $brPos - 1
+    !endwhile
+
+    !if ($brPos < 1)
+      !$brPos = %strpos($descr, " ")
+    !else
+    !endif
+
+    !if ($brPos > 0)
+      !$multiLine = $multiLine + %substr($descr, 0, $brPos) + "\n"
+      !$descr = %substr($descr, $brPos + 1)
+    !else
+      !$multiLine = $multiLine+ $descr
+      !$descr = ""
+    !endif
+  !endwhile
+!endif
+!if (%strlen($descr)>0)
+  !$multiLine = $multiLine + $descr
+!endif
+!return $multiLine
+!endfunction
+
+' $breakTechn() supports //...//; $breakNode() in C4_Deployment supports no //....//
+!unquoted function $breakTechn($techn, $widthStr)
+!$width = %intval($widthStr)
+!$multiLine = ""
+!if (%strpos($techn, "\n") >= 0)
+  !while (%strpos($techn, "\n") >= 0)
+    !$brPos = %strpos($techn, "\n")
+    !$multiLine = $multiLine + %substr($techn, 0, $brPos) + '</size>//\n//<size:'+$TECHN_FONT_SIZE+'>'
+    !$techn = %substr($techn, $brPos+2)
+  !endwhile
+!else
+  !while (%strlen($techn)>$width)
+    !$brPos = $width
+    !while ($brPos>0 && %substr($techn, $brPos, 1)!= ' ')
+      !$brPos = $brPos - 1
+    !endwhile
+
+    !if ($brPos < 1)
+      !$brPos = %strpos($techn, " ")
+    !else
+    !endif
+
+    !if ($brPos > 0)
+      !$multiLine = $multiLine + %substr($techn, 0, $brPos) + '</size>//\n//<size:'+$TECHN_FONT_SIZE+'>'
+      !$techn = %substr($techn, $brPos + 1)
+    !else
+      !$multiLine = $multiLine+ $techn
+      !$techn = ""
+    !endif
+  !endwhile
+!endif
+!if (%strlen($techn)>0)
+  !$multiLine = $multiLine + $techn
+!endif
+!return $multiLine
+!endfunction
+
+' Element properties
+' ##################################
+
+' collect all defined properties as table rows
+!global $propTable = ""
+!global $propTableCaption = ""
+!global $propColCaption = "="
+
+!unquoted function SetPropertyHeader($col1Name, $col2Name, $col3Name = "", $col4Name = "")
+  !$propColCaption = ""
+  !$propTableCaption = "|= " + $col1Name + " |= " + $col2Name + " |"
+  !if ($col3Name != "")
+    !$propTableCaption = $propTableCaption + "= " + $col3Name + " |"
+  !endif
+  !if ($col4Name != "")
+    !$propTableCaption = $propTableCaption + "= " + $col4Name + " |"
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function WithoutPropertyHeader()
+  !$propTableCaption = ""
+  !$propColCaption = "="
+  !return ""
+!endfunction
+
+!unquoted function AddProperty($col1, $col2, $col3 = "", $col4 = "")
+  !if ($propTable == "")
+    !if ($propTableCaption != "")
+      !$propTable = $propTableCaption + "\n"
+    !endif
+  !else
+    !$propTable = $propTable + "\n"
+  !endif
+  !$propTable = $propTable + "| " + $col1 + " |" + $propColCaption + " " + $col2 + " |"
+  !if ($col3 != "")
+    !$propTable = $propTable + " " + $col3 + " |"
+  !endif
+  !if ($col4 != "")
+    !$propTable = $propTable + " " + $col4 + " |"
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function $getProps($alignedNL = "\n")
+  !if ($propTable != "")
+    !$retTable = $alignedNL + $propTable
+    !$propTable = ""
+    !return $retTable
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function $getProps_L()
+  !return $getProps("\l")
+!endfunction
+
+!unquoted function $getProps_R()
+  !return $getProps("\r")
+!endfunction
+
+SetPropertyHeader("Property","Value")
+
+' Layout
+' ##################################
+
+!procedure $getHideStereotype($hideStereotype) 
+!if ($hideStereotype=="true")
+hide stereotype
+!endif
+!endprocedure
+
+!procedure $getLegendTable() 
+<#00000000,#00000000>|<color:$LEGEND_TITLE_COLOR>**Legend**</color> |
+$showActiveLegendEntries($tagDefaultLegend)
+$showActiveLegendEntries($tagCustomLegend)
+!endprocedure
+
+!procedure $getLegendArea($areaAlias, $hideStereotype) 
+$getHideStereotype($hideStereotype)
+rectangle $areaAlias<<legendArea>> [
+$getLegendTable()
+]
+!endprocedure
+
+!procedure HIDE_STEREOTYPE()
+hide stereotype
+!endprocedure
+
+!procedure LAYOUT_AS_SKETCH()
+skinparam backgroundColor #EEEBDC
+skinparam handwritten true
+skinparam defaultFontName "Comic Sans MS"
+center footer <font color=red>Warning:</font> Created for discussion, needs to be validated
+!endprocedure
+
+!procedure LAYOUT_TOP_DOWN()
+top to bottom direction
+!endprocedure
+
+!procedure LAYOUT_LEFT_RIGHT() 
+left to right direction
+!endprocedure
+
+' has to be last call in diagram
+!unquoted procedure SHOW_LEGEND($hideStereotype="true")
+$getHideStereotype($hideStereotype)
+legend right
+$getLegendTable()
+endlegend
+!endprocedure
+
+/' @deprecated in favor of SHOW_LEGEND '/
+!unquoted procedure SHOW_DYNAMIC_LEGEND($hideStereotype="true")
+SHOW_LEGEND($hideStereotype)
+!endprocedure
+
+' legend is reserved and cannot be uses as alias of SHOW_FLOATING_LEGEND() therefore
+' LEGEND() is introduced. It returns the default name of the floating alias "floating_legend_alias"
+' and can be used in the Lay_Distance() calls
+!function LEGEND()
+!return "floating_legend_alias"
+!endfunction
+
+' enables that legend can be located in drawing area of the diagram. It has to be last call in diagram followed by Lay_Distance()
+!unquoted procedure SHOW_FLOATING_LEGEND($alias=LEGEND(), $hideStereotype="true")
+$getLegendArea($alias, $hideStereotype)
+!endprocedure
+
+' Boundaries
+' ##################################
+
+!function $getBoundary($label, $type)
+  !if ($type == "")
+    !return '==' + $label
+  !endif
+  !if (type != "")
+    !return '==' + $label + '\n<size:' + $TECHN_FONT_SIZE + '>[' + $type + ']</size>'
+  !endif
+!endfunction
+
+!unquoted procedure Boundary($alias, $label, $type="", $tags="", $link="")
+rectangle "$getBoundary($label, $type)" $toStereos("boundary", $tags) as $alias $getLink($link)
+!endprocedure
+
+' Relationship
+' ##################################
+
+!function $getRel($direction, $alias1, $alias2, $label, $techn, $descr, $sprite, $tags, $link)
+  !$rel = $alias1 + ' ' + $direction + ' ' + $alias2
+  !if ($tags != "")
+    !$rel = $rel + ' ' + $toStereos($tags)
+  !endif  
+  !$rel = $rel + ' : '
+  !if ($sprite != "")
+    ' if it starts with & it's a OpenIconic, details see https://useiconic.com/open/
+    !if (%substr($sprite, 0, 1) != "&")
+      !$rel = $rel + '<$'+$sprite+'> '
+    !else
+      !$rel = $rel + '<'+$sprite+'> '
+    !endif    
+  !endif  
+  !if ($link != "")
+    !$rel = $rel + '**[[' + $link + ' ' + $label + ']]**'
+  !else
+    !$rel = $rel + '**' + $label + '**'
+  !endif
+  !if ($techn != "")
+    ' line break is not deterministic, calculate it
+    !$rel = $rel + '\n//<size:' + $TECHN_FONT_SIZE + '>[' + $breakTechn($techn, $REL_TECHN_MAX_CHAR_WIDTH) + ']</size>//'
+  !endif
+  !if ($descr != "")
+    ' line break is not deterministic, calculate it
+    !$rel = $rel + '\n\n' + $breakDescr($descr, $REL_DESCR_MAX_CHAR_WIDTH)
+  !endif
+  !return $rel
+!endfunction
+
+!unquoted procedure Rel_($alias1, $alias2, $label, $direction)
+$alias1 $direction $alias2 : **$label**
+!endprocedure
+!unquoted procedure Rel_($alias1, $alias2, $label, $techn, $direction)
+$alias1 $direction $alias2 : **$label**\n//<size:$TECHN_FONT_SIZE>[$techn]</size>//
+!endprocedure
+
+!unquoted procedure Rel($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("- ->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<- ->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_Back($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<- -", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_Neighbor($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_Back_Neighbor($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_D($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Down($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_D($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Down($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_U($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Up($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_U($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Up($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_L($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Left($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_L($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Left($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_R($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Right($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_R($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Right($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+' Layout Helpers
+' ##################################
+
+!function $getHiddenLine($distance)
+  !return '-[hidden]' + %substr('- - - - - - - - - - - -', 0, %intval($distance) + 1)
+!endfunction
+
+!unquoted procedure Lay_D($from, $to)
+$from -[hidden]D- $to
+!endprocedure
+!unquoted procedure Lay_U($from, $to)
+$from -[hidden]U- $to
+!endprocedure
+!unquoted procedure Lay_R($from, $to)
+$from -[hidden]R- $to
+!endprocedure
+!unquoted procedure Lay_L($from, $to)
+$from -[hidden]L- $to
+!endprocedure
+
+' PlantUML bug: lines which does "not match" with the orientation/direction of the diagram
+' uses the same length therefore the method offers no direction at all.
+' If a direction is required the Lay_...() methods can be used
+!unquoted procedure Lay_Distance($from, $to, $distance="0")
+$from $getHiddenLine($distance) $to
+!endprocedure' Scope: A single software system.
+' Primary elements: The software system in scope.
+' Supporting elements: People and software systems directly connected to the software system in scope.
+' Intended audience: Everybody, both technical and non-technical people, inside and outside of the software development team.
+
+' Colors
+' ##################################
+
+!global $PERSON_BG_COLOR = "#08427B"
+!global $PERSON_BORDER_COLOR = "#073B6F"
+!global $EXTERNAL_PERSON_BG_COLOR = "#686868"
+!global $EXTERNAL_PERSON_BORDER_COLOR = "#8A8A8A"
+!global $SYSTEM_BG_COLOR = "#1168BD"
+!global $SYSTEM_BORDER_COLOR = "#3C7FC0"
+!global $EXTERNAL_SYSTEM_BG_COLOR = "#999999"
+!global $EXTERNAL_SYSTEM_BORDER_COLOR = "#8A8A8A"
+
+' Styling
+' ##################################
+
+UpdateElementStyle("person", $PERSON_BG_COLOR, $ELEMENT_FONT_COLOR, $PERSON_BORDER_COLOR)
+UpdateElementStyle("external_person", $EXTERNAL_PERSON_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_PERSON_BORDER_COLOR)
+UpdateElementStyle("system", $SYSTEM_BG_COLOR, $ELEMENT_FONT_COLOR, $SYSTEM_BORDER_COLOR)
+UpdateElementStyle("external_system", $EXTERNAL_SYSTEM_BG_COLOR, $ELEMENT_FONT_COLOR, $EXTERNAL_SYSTEM_BORDER_COLOR)
+
+
+' Sprites
+' ##################################
+
+sprite $person [48x48/16] {
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+0000000000000000000049BCCA7200000000000000000000
+0000000000000000006EFFFFFFFFB3000000000000000000
+00000000000000001CFFFFFFFFFFFF700000000000000000
+0000000000000001EFFFFFFFFFFFFFF80000000000000000
+000000000000000CFFFFFFFFFFFFFFFF6000000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
+0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
+0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
+0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
+00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+000000000000000BFFFFFFFFFFFFFFFF5000000000000000
+0000000000000001DFFFFFFFFFFFFFF70000000000000000
+00000000000000000BFFFFFFFFFFFF500000000000000000
+0000000000000000005DFFFFFFFFA1000000000000000000
+0000000000000000000037ABB96100000000000000000000
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+000000000000025788300000000005886410000000000000
+000000000007DFFFFFFD9643347BFFFFFFFB400000000000
+0000000004EFFFFFFFFFFFFFFFFFFFFFFFFFFB1000000000
+000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFD200000000
+00000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE10000000
+0000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB0000000
+000000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5000000
+000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD000000
+000009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF200000
+00000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF600000
+00000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF800000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+00001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA00000
+00000EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF700000
+000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
+0000008FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD3000000
+000000014555555555555555555555555555555300000000
+000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000
+}
+
+sprite $person2 [48x48/16] {
+0000000000000000000049BCCA7200000000000000000000
+0000000000000000006EFFFFFFFFB3000000000000000000
+00000000000000001CFFFFFFFFFFFF700000000000000000
+0000000000000001EFFFFFFFFFFFFFF80000000000000000
+000000000000000CFFFFFFFFFFFFFFFF6000000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+00000000000001FFFFFFFFFFFFFFFFFFF900000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFF00000000000000
+0000000000000BFFFFFFFFFFFFFFFFFFFF40000000000000
+0000000000000EFFFFFFFFFFFFFFFFFFFF70000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000FFFFFFFFFFFFFFFFFFFFF80000000000000
+0000000000000DFFFFFFFFFFFFFFFFFFFF60000000000000
+0000000000000AFFFFFFFFFFFFFFFFFFFF40000000000000
+00000000000006FFFFFFFFFFFFFFFFFFFE00000000000000
+00000000000000EFFFFFFFFFFFFFFFFFF800000000000000
+000000000000007FFFFFFFFFFFFFFFFFF100000000000000
+000000000000000BFFFFFFFFFFFFFFFF5000000000000000
+0000000000000001DFFFFFFFFFFFFFF70000000000000000
+00000000000000000BFFFFFFFFFFFF500000000000000000
+0000000000000000005DFFFFFFFFA1000000000000000000
+0000000000000000000037ABB96100000000000000000000
+000000000002578888300000000005888864100000000000
+0000000007DFFFFFFFFD9643347BFFFFFFFFFB4000000000
+00000004EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB10000000
+0000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD2000000
+000006FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE100000
+00003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB00000
+0000BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF50000
+0003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD0000
+0009FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB000
+001FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA000
+000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8000
+000DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6000
+0009FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFF2000
+0003FFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFFD0000
+0000BFFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFF50000
+00003FFFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFFB00000
+000006FFFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFFE100000
+0000007FFFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFFD2000000
+00000004EFFF8FFFFFFFFFFFFFFFFFFFFFF8FFFB10000000
+0000000007DF8FFFFFFFFFFFFFFFFFFFFFF8FB4000000000
+000000000002578888888888888888888864100000000000
+}
+
+' Layout
+' ##################################
+
+SetDefaultLegendEntries("person\nsystem\nexternal_person\nexternal_system")
+
+!procedure LAYOUT_WITH_LEGEND()
+hide stereotype
+legend right
+|<color:$LEGEND_TITLE_COLOR>**Legend**</color> |
+|<$PERSON_BG_COLOR> person |
+|<$SYSTEM_BG_COLOR> system|
+|<$EXTERNAL_PERSON_BG_COLOR> external person |
+|<$EXTERNAL_SYSTEM_BG_COLOR> external system |
+endlegend
+!endprocedure
+
+!global $defaultPersonSprite = "person"
+!global $portraitPerson = "false"
+
+!procedure HIDE_PERSON_SPRITE()
+  !$defaultPersonSprite = ""
+  !$portraitPerson = "false"
+!endprocedure
+
+!unquoted procedure SHOW_PERSON_SPRITE($sprite="")
+  !if ($sprite == "")
+    !$defaultPersonSprite = "person"
+  !else
+    !$defaultPersonSprite = $sprite
+  !endif
+  !$portraitPerson = "false"
+!endprocedure
+
+!unquoted procedure SHOW_PERSON_PORTRAIT()
+  !$defaultPersonSprite = ""
+  !$portraitPerson = "portrait"
+!endprocedure
+
+!unquoted procedure SHOW_PERSON_OUTLINE()
+  !$defaultPersonSprite = ""
+  !$portraitPerson = "outline"
+!endprocedure
+
+' Elements
+' ##################################
+
+!function $getPerson($label, $descr, $sprite)
+!if ($sprite == "") && ($defaultPersonSprite!="")
+  !$sprite = $defaultPersonSprite
+!endif
+!if ($descr == "") && ($sprite == "")
+  !return '=='+$label
+!endif
+!if ($descr == "") && ($sprite != "")
+  !return '<$'+$sprite+'>\n=='+$label
+!endif
+!if ($descr != "") && ($sprite == "")
+  !return '=='+$label+'\n\n '+$descr
+!endif
+!if ($descr != "") && ($sprite != "")
+  !return '<$'+$sprite+'>\n=='+$label+'\n\n '+$descr
+!endif
+!endfunction
+
+!function $getSystem($label, $descr, $sprite)
+!if ($descr == "") && ($sprite == "")
+!return '=='+$label
+!endif
+!if ($descr == "") && ($sprite != "")
+!return '<$'+$sprite+'>\n=='+$label
+!endif
+!if ($descr != "") && ($sprite == "")
+!return '=='+$label+'\n\n '+$descr
+!endif
+!if ($descr != "") && ($sprite != "")
+!return '<$'+$sprite+'>\n=='+$label+'\n\n '+$descr
+!endif
+!endfunction
+
+!unquoted procedure Person($alias, $label, $descr="", $sprite="", $tags="", $link="")
+!if ($portraitPerson == "portrait") && ($sprite == "")
+actor "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("person", $tags) as $alias $getLink($link)
+!elseif ($portraitPerson == "outline") && ($sprite == "")
+person "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("person", $tags) as $alias $getLink($link)
+!else
+rectangle "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("person", $tags) as $alias $getLink($link)
+!endif
+!endprocedure
+
+!unquoted procedure Person_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
+!if ($portraitPerson == "portrait") && ($sprite == "")
+actor "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("external_person", $tags) as $alias $getLink($link)
+!elseif ($portraitPerson == "outline") && ($sprite == "")
+person "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("external_person", $tags) as $alias $getLink($link)
+!else
+rectangle "$getPerson($label, $descr, $sprite)$getProps()" $toStereos("external_person", $tags) as $alias $getLink($link)
+!endif
+!endprocedure
+
+!unquoted procedure System($alias, $label, $descr="", $sprite="", $tags="", $link="")
+rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
+!endprocedure
+
+!unquoted procedure System_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
+rectangle "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
+!endprocedure
+
+!unquoted procedure SystemDb($alias, $label, $descr="", $sprite="", $tags="", $link="")
+database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
+!endprocedure
+
+!unquoted procedure SystemQueue($alias, $label, $descr="", $sprite="", $tags="", $link="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("system", $tags) as $alias $getLink($link)
+!endprocedure
+
+!unquoted procedure SystemDb_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
+database "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
+!endprocedure
+
+!unquoted procedure SystemQueue_Ext($alias, $label, $descr="", $sprite="", $tags="", $link="")
+queue "$getSystem($label, $descr, $sprite)$getProps()" $toStereos("external_system", $tags) as $alias $getLink($link)
+!endprocedure
+
+' Boundaries
+' ##################################
+
+!unquoted procedure Enterprise_Boundary($alias, $label, $tags="", $link="")
+Boundary($alias, $label, "Enterprise", $tags, $link)
+!endprocedure
+
+!unquoted procedure System_Boundary($alias, $label, $tags="", $link="")
+Boundary($alias, $label, "System", $tags, $link)
+!endprocedure
+!else
+' convert it with additional command line argument -DRELATIVE_INCLUDE="." to use locally
+!if %variable_exists("RELATIVE_INCLUDE")
+' C4-PlantUML
+' https://github.com/plantuml-stdlib/C4-PlantUML/tree/v2.3.0
+
+' Colors
+' ##################################
+
+!global $ELEMENT_FONT_COLOR = "#FFFFFF"
+
+!global $ARROW_COLOR = "#666666"
+
+!global $BOUNDARY_COLOR = "#444444"
+!global $BOUNDARY_BG_COLOR = "transparent"
+
+!global $LEGEND_FONT_COLOR = "#FFFFFF"
+!global $LEGEND_TITLE_COLOR = "#000000"
+' %darken(darkkhaki,50), #khaki
+!global $LEGEND_DARK_COLOR = "#66622E"
+!global $LEGEND_LIGHT_COLOR = "#khaki"
+
+' Labels
+' ##################################
+
+!global $LEGEND_SHADOW_TEXT = "(shadow) "
+!global $LEGEND_NO_SHADOW_TEXT = "(no shadow) "
+!global $LEGEND_NO_FONT_BG_TEXT = "(no text, no back color) "
+!global $LEGEND_NO_FONT_TEXT = "(no text color) "
+!global $LEGEND_NO_BG_TEXT = "(no back color) "
+!global $LEGEND_NO_LINE_TEXT = "(no line color) "
+!global $LEGEND_ROUNDED_BOX = "(rounded box) "
+!global $LEGEND_EIGHT_SIDED = "(eight sided) "
+!global $LEGEND_DOTTED_LINE = "(dotted) "
+!global $LEGEND_DASHED_LINE = "(dashed) "
+!global $LEGEND_BOLD_LINE = "(bold) "
+
+' Styling
+' ##################################
+
+!global $TECHN_FONT_SIZE = 12
+!global $ROUNDED_BOX_SIZE = 25
+!global $EIGHT_SIDED_SIZE = 18
+
+!global $ROUNDED_BOX = "roundedBox"
+!global $EIGHT_SIDED = "eightSided"
+
+!global $DOTTED_LINE = "dotted"
+!global $DASHED_LINE = "dashed"
+!global $BOLD_LINE = "bold"
+
+skinparam defaultTextAlignment center
+
+skinparam wrapWidth 200
+skinparam maxMessageSize 150
+
+skinparam LegendBorderColor transparent
+skinparam LegendBackgroundColor transparent
+skinparam LegendFontColor $LEGEND_FONT_COLOR
+
+skinparam shadowing<<legendArea>> false
+' #00000000 is transparent
+skinparam rectangle<<legendArea>> {
+    backgroundcolor #00000000
+    bordercolor #00000000
+}
+
+skinparam rectangle {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam database {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam queue {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam arrow {
+    Color $ARROW_COLOR
+    FontColor $ARROW_COLOR
+    FontSize 12
+}
+
+skinparam actor {
+    StereotypeFontSize 12
+    shadowing false
+    style awesome
+}
+
+skinparam person {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+' Some boundary skinparams have to be set as package skinparams too (PlantUML uses internal packages)
+skinparam package {
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontStyle plain
+    BackgroundColor $BOUNDARY_BG_COLOR
+}
+
+skinparam rectangle<<boundary>> {
+    Shadowing false
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontColor $BOUNDARY_COLOR
+    BorderColor $BOUNDARY_COLOR
+    BackgroundColor $BOUNDARY_BG_COLOR
+    BorderStyle dashed
+}
+
+' Legend and Tags
+' ##################################
+!global $tagDefaultLegend = ""
+!global $tagCustomLegend = ""
+
+' rel specific
+!unquoted function $toStereos($tags)
+  !if (%strlen($tags) == 0)
+    !return ''
+  !endif
+  !$stereos = ''
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$stereos = $stereos + '<<' + $tag + '>>'
+%set_variable_value("$" + $tag + "_LineLegend", %true())
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags)>0)
+    !$stereos = $stereos + '<<' + $tags + '>>'
+%set_variable_value("$" + $tags + "_LineLegend", %true())
+  !endif
+  !return $stereos
+!endfunction
+
+' element specific (unused are hidden based on mask)
+!unquoted function $toStereos($elementType, $tags)
+  !if (%strlen($tags) == 0)
+    !$stereos = '<<' + $elementType + '>>'
+%set_variable_value("$" + $elementType + "Legend", %true())
+    !return $stereos
+  !endif
+  !$stereos = ''
+  !$mask = $resetMask()
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$stereos = $stereos + '<<' + $tag + '>>'
+    !$mergedMask = $combineMaskWithTag($mask, $tag)
+    !if ($mergedMask != $mask)
+%set_variable_value("$" + $tag + "Legend", %true())
+      !$mask = $mergedMask
+    !endif
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags)>0)
+    !$stereos = $stereos + '<<' + $tags + '>>'
+    !$mergedMask = $combineMaskWithTag($mask, $tags)
+    !if ($mergedMask != $mask)
+%set_variable_value("$" + $tags + "Legend", %true())
+      !$mask = $mergedMask
+    !endif
+  !endif
+  ' has to be last, otherwise PlantUML overwrites all tag specific skinparams
+  !$stereos = $stereos + '<<' + $elementType + '>>'
+  !$mergedMask = $combineMaskWithTag($mask, $elementType)
+  !if ($mergedMask != $mask)
+%set_variable_value("$" + $elementType + "Legend", %true())
+    !$mask = $mergedMask
+  !endif
+  !return $stereos
+!endfunction
+
+!function $elementTagSkinparams($element, $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$elementSkin = "skinparam " + $element +"<<" + $tagStereo + ">> {" + %newline()
+  !if ($fontColor!="")
+    !if ($tagStereo != "boundary")
+      !$elementSkin = $elementSkin + "    StereotypeFontColor " + $fontColor + %newline()
+    !endif
+    !$elementSkin = $elementSkin + "    FontColor " + $fontColor + %newline()
+  !endif
+  !if ($bgColor!="")
+    !$elementSkin = $elementSkin + "    BackgroundColor " + $bgColor + %newline()
+  !endif
+  !if ($borderColor!="")
+    !$elementSkin = $elementSkin + "    BorderColor " + $borderColor+ %newline()
+  !endif
+  !if ($shadowing == "true")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "true" + %newline()
+  !endif
+  !if ($shadowing == "false")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "false" + %newline()
+  !endif
+  ' only rectangle supports shape(d corners), define both skinparam that overlays are working
+  !if ($shape!="" && $element == "rectangle")
+    !if ($shape == $ROUNDED_BOX)
+      !$elementSkin = $elementSkin + "    RoundCorner " + $ROUNDED_BOX_SIZE+ %newline()
+      !$elementSkin = $elementSkin + "    DiagonalCorner " + "0" + %newline()
+    !elseif ($shape == $EIGHT_SIDED)
+      !$elementSkin = $elementSkin + "    RoundCorner " + "0" + %newline()
+      !$elementSkin = $elementSkin + "    DiagonalCorner " + $EIGHT_SIDED_SIZE+ %newline()
+    !endif
+  !endif
+  !$elementSkin = $elementSkin + "}" + %newline()
+  !return $elementSkin
+!endfunction
+
+!unquoted procedure $defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  ' only rectangle supports shape(d corners)
+  !$tagSkin = $elementTagSkinparams("rectangle", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$tagSkin = $tagSkin + $elementTagSkinparams("database", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  !$tagSkin = $tagSkin + $elementTagSkinparams("queue", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  ' actor has style awesome, therefore $fontColor is ignored and text uses $bgColor too
+  !$tagSkin = $tagSkin + $elementTagSkinparams("actor", $tagStereo, $bgColor, $bgColor, $borderColor, $shadowing, "")
+  !$tagSkin = $tagSkin + $elementTagSkinparams("person", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  !if ($tagStereo == "boundary" && $bgColor!="")
+    !$tagSkin = $tagSkin + "skinparam package<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+    !$tagSkin = $tagSkin + "skinparam rectangle<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+  !endif
+$tagSkin
+!endprocedure
+
+' arrow colors cannot start with # (legend background has to start with #)
+!function $colorWithoutHash($c)
+  !if (%substr($c, 0, 1) == "#")
+    !$c = %substr($c,1)
+  !endif
+  !return $c
+!endfunction
+
+!unquoted procedure $defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle)
+  !$elementSkin = "skinparam arrow<<" + $tagStereo + ">> {" + %newline()
+  !$elementSkin = $elementSkin + "    Color "
+  !if ($lineColor!="")
+    !$elementSkin = $elementSkin + $colorWithoutHash($lineColor)
+  !endif
+  !if ($textColor!="")
+    !$elementSkin = $elementSkin + ";text:" + $colorWithoutHash($textColor)
+  !endif
+  !if ($lineStyle!="")
+    !$elementSkin = $elementSkin + ";line." + $lineStyle
+  !endif
+  !$elementSkin = $elementSkin + %newline()
+  !$elementSkin = $elementSkin + "}" + %newline()
+$elementSkin
+!endprocedure
+
+' %is_dark() requires PlantUML version >=1.2021.6
+!if (%function_exists("%is_dark"))
+  !$PlantUMLSupportsDynamicLegendColor = %true()
+!else
+  !$PlantUMLSupportsDynamicLegendColor = %false()
+  !log "dynamic undefined legend colors" requires PlantUML version >= 1.2021.6, therefore only static assigned colors are used
+!endif
+
+!unquoted function $contrastLegend($color)
+  !if (%is_dark($color))
+    !$value = $LEGEND_LIGHT_COLOR
+  !else
+    !$value = $LEGEND_DARK_COLOR
+  !endif
+  !return $value
+!endfunction
+
+!unquoted function $flatLegend($color)
+  !if (%is_dark($color))
+    !$value = $LEGEND_DARK_COLOR
+  !else
+    !$value = $LEGEND_LIGHT_COLOR
+  !endif
+  !return $value
+!endfunction
+
+' legend background has to start with #
+!function $colorWithHash($c)
+  !if (%substr($c, 0, 1) != "#")
+    !$c = "#" + $c
+  !endif
+  !return $c
+!endfunction
+
+!function $addMaskFlag($mask, $attr)
+  !if ($attr == "")
+    !$mask = $mask + "0"
+  !else
+    !$mask = $mask + "1"
+  !endif
+  !return $mask
+!endfunction
+
+!function $orFlags($flag1, $flag2)
+  !if ($flag1 == "0" && $flag2 == "0")
+    !return "0"
+  !endif
+  !return "1"
+!endfunction
+
+!function $tagLegendMask($bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$mask = ""
+  !$mask = $addMaskFlag($mask, $bgColor)
+  !$mask = $addMaskFlag($mask, $fontColor)
+  !$mask = $addMaskFlag($mask, $borderColor)
+  !$mask = $addMaskFlag($mask, $shadowing)
+  !$mask = $addMaskFlag($mask, $shape)
+  !return $mask
+!endfunction
+
+!function $resetMask()
+  !return "00000"
+!endfunction
+
+!function $combineMasks($mask1, $mask2)
+  !$mask = ""
+  !$mask = $mask + $orFlags(%substr($mask1, 0, 1), %substr($mask2, 0, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 1, 1), %substr($mask2, 1, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 2, 1), %substr($mask2, 2, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 3, 1), %substr($mask2, 3, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 4, 1), %substr($mask2, 4, 1))
+  !return $mask
+!endfunction
+
+!function $combineMaskWithTag($mask1, $tag)
+  !$mask2 = %get_variable_value("$" + $tag+ "LegendMask")
+  !if ($mask2=="")
+    ' !log combineMaskWithTag $mask1, $tag, ... only $mask1
+    !return $mask1
+  !endif
+
+  ' !log combineMaskWithTag $mask1, $tag, $mask2 ... $combineMasks($mask1, $mask2)
+  !return  $combineMasks($mask1, $mask2)
+!endfunction
+
+!function $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$bg = $bgColor
+  !$fo = $fontColor
+  !$bo = $borderColor
+
+  !if ($fo == "")
+    !if ($bg != "")
+!if ($PlantUMLSupportsDynamicLegendColor)
+      !$fo = $contrastLegend($bg)
+!else
+      !$fo = $LEGEND_DARK_COLOR
+!endif
+    !else
+      !if ($bo == "")
+        !$fo = $LEGEND_DARK_COLOR
+        !$bg = $LEGEND_LIGHT_COLOR
+      !else
+!if ($PlantUMLSupportsDynamicLegendColor)
+        !$fo = $flatLegend($bo)
+        !$bg = $contrastLegend($bo)
+!else
+        !$fo = $LEGEND_DARK_COLOR
+        !$bg = $LEGEND_LIGHT_COLOR
+!endif
+      !endif
+    !endif
+  !else
+    !if ($bg == "")
+!if ($PlantUMLSupportsDynamicLegendColor)
+      !$bg = $contrastLegend($fo)
+!else
+      !$bg = $LEGEND_LIGHT_COLOR
+!endif
+    !endif
+  !endif
+
+  !if ($bo == "")
+    !$bo = $bg
+  !endif
+
+  !$tagEntry = "|"
+  !$tagEntry = $tagEntry + "<" + $colorWithHash($bg) +">" 
+  ' <U+25AF> ..white rectangle
+  !$tagEntry = $tagEntry + "<color:"+$bo+"> <U+25AF></color> "
+  !$tagEntry = $tagEntry + "<color:"+$fo+">"
+  !$tagEntry = $tagEntry + " " + $tagStereo + " "
+  !if ($shadowing == "true")
+    !$tagEntry = $tagEntry + $LEGEND_SHADOW_TEXT
+  !endif
+  !if ($shadowing == "false")
+    !$tagEntry = $tagEntry + $LEGEND_NO_SHADOW_TEXT
+  !endif
+  !if ($shape == $ROUNDED_BOX)
+    !$tagEntry = $tagEntry + $LEGEND_ROUNDED_BOX
+  !endif
+  !if ($shape == $EIGHT_SIDED)
+    !$tagEntry = $tagEntry + $LEGEND_EIGHT_SIDED
+  !endif
+  !if ($fontColor == "" && $bgColor == "")
+      !$tagEntry = $tagEntry + $LEGEND_NO_FONT_BG_TEXT
+  !else 
+    !if ($fontColor == "")
+      !$tagEntry = $tagEntry + $LEGEND_NO_FONT_TEXT
+    !endif
+    !if ($bgColor == "")
+      !$tagEntry = $tagEntry + $LEGEND_NO_BG_TEXT
+    !endif
+  !endif
+  !$tagEntry = $tagEntry + "</color> "
+  !$tagEntry = $tagEntry + "|"
+  !return $tagEntry 
+!endfunction
+
+!function $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle)
+  !$tc = $textColor
+  !$lc = $lineColor
+
+  !if ($tc=="")
+!if ($PlantUMLSupportsDynamicLegendColor)
+    !$tc = $flatLegend($ARROW_COLOR)
+!else
+    !$tc = $LEGEND_DARK_COLOR
+!endif
+  !endif
+  !if ($lc=="")
+!if ($PlantUMLSupportsDynamicLegendColor)
+    !$lc = $flatLegend($ARROW_COLOR)
+!else
+    !$lc = $LEGEND_DARK_COLOR
+!endif
+  !endif
+
+  !$tagEntry = "|"
+  ' <U+2500> ..white line
+  !$tagEntry = $tagEntry + "<color:"+$lc+"> <U+2500></color> "
+  !$tagEntry = $tagEntry + "<color:"+$tc+">"
+  !$tagEntry = $tagEntry + " " + $tagStereo + " "
+  !if ($textColor == "")
+    !$tagEntry = $tagEntry + $LEGEND_NO_FONT_TEXT
+  !endif
+  !if ($lineColor == "")
+    !$tagEntry = $tagEntry + $LEGEND_NO_LINE_TEXT
+  !endif
+  !if ($lineStyle != "")
+    !if ($lineStyle == $DOTTED_LINE)
+      !$tagEntry = $tagEntry + $LEGEND_DOTTED_LINE
+    !elseif ($lineStyle == $DASHED_LINE)
+      !$tagEntry = $tagEntry + $LEGEND_DASHED_LINE
+    !elseif ($lineStyle == $BOLD_LINE)
+      !$tagEntry = $tagEntry + $LEGEND_BOLD_LINE
+    !else
+      !$tagEntry = $tagEntry + "(" + $lineStyle + ") "
+    !endif
+  !endif
+  !$tagEntry = $tagEntry + "</color> "
+  !$tagEntry = $tagEntry + "|"
+  !return $tagEntry 
+!endfunction
+
+!global $LEGEND_DOTTED_LINE = "(dotted) "
+!global $LEGEND_DASHED_LINE = "(dashed) "
+!global $LEGEND_BOLD_LINE = "(bold) "
+
+!unquoted procedure $addTagToLegend($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="", $shape="")
+'' if a combined element tag is defined (e.g. "v1.0&v1.1") then it is typically a merged color,
+'' like a new $fontColor="#fdae61" therefore it should be added to the legend 
+'' and the & combined tags will be not removed
+'  !if (%strpos($tagStereo, "&")<0)
+   !$tagEntry = $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $tagStereo + "LegendEntry", $tagEntry)
+    !$tagCustomLegend = $tagCustomLegend + $tagStereo + "\n"
+  !$tagMask = $tagLegendMask( $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $tagStereo + "LegendMask", $tagMask)
+'  !endif
+!endprocedure
+
+!unquoted procedure $addRelTagToLegend($tagStereo, $textColor="", $lineColor="", $lineStyle="")
+'' Arrows have a bug with stereotype/skinparams and cannot combine text colors of one stereotype
+'' and the line color of another stereotype. Therefore the text color of one tag and the line color 
+'' of another tag have to be combined via a "workaround" tag ("v1.0&v1.1").
+'' This workaround tag could be theoretically removed in the legend but after that there would 
+'' be an inconsistency between the element tags and the rel tags and therefore 
+'' & combined workaround tags are not removed too (and in unlikely cases the color itself could be changed)
+'  !if (%strpos($tagStereo, "&")<0)
+    !$tagEntry = $tagRelLegendEntry($tagStereo, $textColor, $lineColor, $lineStyle)
+%set_variable_value("$" + $tagStereo + "_LineLegendEntry", $tagEntry)
+    !$tagCustomLegend = $tagCustomLegend + $tagStereo + "_Line\n"
+'  !endif
+!endprocedure
+
+!procedure $showActiveLegendEntries($allDefined)
+  !$brPos = %strpos($allDefined, "\n")
+  !while ($brPos >= 0)
+    !$tagStereo = %substr($allDefined, 0, $brPos)
+    !$allDefined = %substr($allDefined, $brPos+2)
+    !$brPos = %strpos($allDefined, "\n")
+    !if (%variable_exists("$" + $tagStereo + "Legend"))
+%get_variable_value("$" + $tagStereo + "LegendEntry")
+    !endif
+  !endwhile
+  !if (%strlen($allDefined)>0)
+    !$tagStereo = $allDefined
+    !if (%variable_exists("$" + $tagStereo + "Legend"))
+%get_variable_value("$" + $tagStereo + "LegendEntry")
+    !endif
+  !endif
+!endprocedure
+
+!function RoundedBoxShape()
+!return $ROUNDED_BOX
+!endfunction
+
+!function EightSidedShape()
+!return $EIGHT_SIDED
+!endfunction
+
+!function DottedLine()
+!return $DOTTED_LINE
+!endfunction
+
+!function DashedLine()
+!return $DASHED_LINE
+!endfunction
+
+!function BoldLine()
+!return $BOLD_LINE
+!endfunction
+
+' used by new defined tags
+!unquoted procedure AddElementTag($tagStereo, $bgColor="", $fontColor="", $borderColor="", $shadowing="", $shape="")
+$defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+$addTagToLegend($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+!endprocedure
+
+' used by new defined rel tags
+!unquoted procedure AddRelTag($tagStereo, $textColor="", $lineColor="", $lineStyle = "")
+$defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle)
+$addRelTagToLegend($tagStereo, $textColor, $lineColor, $lineStyle)
+!endprocedure
+
+' update the style of existing elements like person, ...
+!unquoted procedure UpdateElementStyle($elementName, $bgColor="", $fontColor="", $borderColor="", $shadowing="", $shape="")
+$defineSkinparams($elementName, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$tagEntry = $tagLegendEntry($elementName, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $elementName + "LegendEntry", $tagEntry)
+  ' default tags sets at least bgColor and fontColor
+  !$tagMask = $tagLegendMask("CHANGED", "CHANGED", $borderColor, $shadowing, $shape)
+%set_variable_value("$" + $elementName + "LegendMask", $tagMask)
+!endprocedure
+
+/' @deprecated in favor of UpdateElementStyle '/
+!unquoted procedure UpdateSkinparamsAndLegendEntry($elementName, $bgColor="", $fontColor="", $borderColor="", $shadowing="")
+UpdateElementStyle($elementName, $bgColor, $fontColor, $borderColor, $shadowing)
+!endprocedure
+
+' update the style of default relation, it has to set both properties (combined statement not working)
+!unquoted procedure UpdateRelStyle($textColor, $lineColor)
+  !$elementSkin = "skinparam arrow {" + %newline()
+  !$elementSkin = $elementSkin + "    Color " + $lineColor + %newline()
+  !$elementSkin = $elementSkin + "    FontColor " + $textColor + %newline()
+  !$elementSkin = $elementSkin + "}" + %newline()
+$elementSkin
+!endprocedure
+
+' tags/stereotypes have to be delimited with \n 
+!unquoted procedure SetDefaultLegendEntries($tagStereoEntries)
+  !$tagDefaultLegend = $tagStereoEntries
+!endprocedure
+
+' Links
+' ##################################
+
+!function $getLink($link)
+  !if ($link!="")
+    !return "[[" + $link + "]]"
+  !else
+    !return ""
+  !endif
+!endfunction
+
+' Line breaks
+' ##################################
+
+' PlantUML supports no DETERMINISTIC/automatic line breaks of "PlantUML line" (C4 Relashionships)
+' therefore Rel...() implements an automatic line break based on spaces (like in all other objects).
+' If a $type contains \n then these are used (and no automatic space based line breaks are done)
+' $REL_TECHN_MAX_CHAR_WIDTH defines the automatic line break position
+!global $REL_TECHN_MAX_CHAR_WIDTH = 35
+!global $REL_DESCR_MAX_CHAR_WIDTH = 32
+
+!unquoted function $breakDescr($descr, $widthStr)
+!$width = %intval($widthStr)
+!$multiLine = ""
+!if (%strpos($descr, "\n") >= 0)
+!else
+  !while (%strlen($descr)>$width)
+    !$brPos = $width 
+    !while ($brPos>0 && %substr($descr, $brPos, 1)!= ' ')
+      !$brPos = $brPos - 1
+    !endwhile
+
+    !if ($brPos < 1)
+      !$brPos = %strpos($descr, " ")
+    !else
+    !endif
+
+    !if ($brPos > 0)
+      !$multiLine = $multiLine + %substr($descr, 0, $brPos) + "\n"
+      !$descr = %substr($descr, $brPos + 1)
+    !else
+      !$multiLine = $multiLine+ $descr
+      !$descr = ""
+    !endif
+  !endwhile
+!endif
+!if (%strlen($descr)>0)
+  !$multiLine = $multiLine + $descr
+!endif
+!return $multiLine
+!endfunction
+
+' $breakTechn() supports //...//; $breakNode() in C4_Deployment supports no //....//
+!unquoted function $breakTechn($techn, $widthStr)
+!$width = %intval($widthStr)
+!$multiLine = ""
+!if (%strpos($techn, "\n") >= 0)
+  !while (%strpos($techn, "\n") >= 0)
+    !$brPos = %strpos($techn, "\n")
+    !$multiLine = $multiLine + %substr($techn, 0, $brPos) + '</size>//\n//<size:'+$TECHN_FONT_SIZE+'>'
+    !$techn = %substr($techn, $brPos+2)
+  !endwhile
+!else
+  !while (%strlen($techn)>$width)
+    !$brPos = $width
+    !while ($brPos>0 && %substr($techn, $brPos, 1)!= ' ')
+      !$brPos = $brPos - 1
+    !endwhile
+
+    !if ($brPos < 1)
+      !$brPos = %strpos($techn, " ")
+    !else
+    !endif
+
+    !if ($brPos > 0)
+      !$multiLine = $multiLine + %substr($techn, 0, $brPos) + '</size>//\n//<size:'+$TECHN_FONT_SIZE+'>'
+      !$techn = %substr($techn, $brPos + 1)
+    !else
+      !$multiLine = $multiLine+ $techn
+      !$techn = ""
+    !endif
+  !endwhile
+!endif
+!if (%strlen($techn)>0)
+  !$multiLine = $multiLine + $techn
+!endif
+!return $multiLine
+!endfunction
+
+' Element properties
+' ##################################
+
+' collect all defined properties as table rows
+!global $propTable = ""
+!global $propTableCaption = ""
+!global $propColCaption = "="
+
+!unquoted function SetPropertyHeader($col1Name, $col2Name, $col3Name = "", $col4Name = "")
+  !$propColCaption = ""
+  !$propTableCaption = "|= " + $col1Name + " |= " + $col2Name + " |"
+  !if ($col3Name != "")
+    !$propTableCaption = $propTableCaption + "= " + $col3Name + " |"
+  !endif
+  !if ($col4Name != "")
+    !$propTableCaption = $propTableCaption + "= " + $col4Name + " |"
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function WithoutPropertyHeader()
+  !$propTableCaption = ""
+  !$propColCaption = "="
+  !return ""
+!endfunction
+
+!unquoted function AddProperty($col1, $col2, $col3 = "", $col4 = "")
+  !if ($propTable == "")
+    !if ($propTableCaption != "")
+      !$propTable = $propTableCaption + "\n"
+    !endif
+  !else
+    !$propTable = $propTable + "\n"
+  !endif
+  !$propTable = $propTable + "| " + $col1 + " |" + $propColCaption + " " + $col2 + " |"
+  !if ($col3 != "")
+    !$propTable = $propTable + " " + $col3 + " |"
+  !endif
+  !if ($col4 != "")
+    !$propTable = $propTable + " " + $col4 + " |"
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function $getProps($alignedNL = "\n")
+  !if ($propTable != "")
+    !$retTable = $alignedNL + $propTable
+    !$propTable = ""
+    !return $retTable
+  !endif
+  !return ""
+!endfunction
+
+!unquoted function $getProps_L()
+  !return $getProps("\l")
+!endfunction
+
+!unquoted function $getProps_R()
+  !return $getProps("\r")
+!endfunction
+
+SetPropertyHeader("Property","Value")
+
+' Layout
+' ##################################
+
+!procedure $getHideStereotype($hideStereotype) 
+!if ($hideStereotype=="true")
+hide stereotype
+!endif
+!endprocedure
+
+!procedure $getLegendTable() 
+<#00000000,#00000000>|<color:$LEGEND_TITLE_COLOR>**Legend**</color> |
+$showActiveLegendEntries($tagDefaultLegend)
+$showActiveLegendEntries($tagCustomLegend)
+!endprocedure
+
+!procedure $getLegendArea($areaAlias, $hideStereotype) 
+$getHideStereotype($hideStereotype)
+rectangle $areaAlias<<legendArea>> [
+$getLegendTable()
+]
+!endprocedure
+
+!procedure HIDE_STEREOTYPE()
+hide stereotype
+!endprocedure
+
+!procedure LAYOUT_AS_SKETCH()
+skinparam backgroundColor #EEEBDC
+skinparam handwritten true
+skinparam defaultFontName "Comic Sans MS"
+center footer <font color=red>Warning:</font> Created for discussion, needs to be validated
+!endprocedure
+
+!procedure LAYOUT_TOP_DOWN()
+top to bottom direction
+!endprocedure
+
+!procedure LAYOUT_LEFT_RIGHT() 
+left to right direction
+!endprocedure
+
+' has to be last call in diagram
+!unquoted procedure SHOW_LEGEND($hideStereotype="true")
+$getHideStereotype($hideStereotype)
+legend right
+$getLegendTable()
+endlegend
+!endprocedure
+
+/' @deprecated in favor of SHOW_LEGEND '/
+!unquoted procedure SHOW_DYNAMIC_LEGEND($hideStereotype="true")
+SHOW_LEGEND($hideStereotype)
+!endprocedure
+
+' legend is reserved and cannot be uses as alias of SHOW_FLOATING_LEGEND() therefore
+' LEGEND() is introduced. It returns the default name of the floating alias "floating_legend_alias"
+' and can be used in the Lay_Distance() calls
+!function LEGEND()
+!return "floating_legend_alias"
+!endfunction
+
+' enables that legend can be located in drawing area of the diagram. It has to be last call in diagram followed by Lay_Distance()
+!unquoted procedure SHOW_FLOATING_LEGEND($alias=LEGEND(), $hideStereotype="true")
+$getLegendArea($alias, $hideStereotype)
+!endprocedure
+
+' Boundaries
+' ##################################
+
+!function $getBoundary($label, $type)
+  !if ($type == "")
+    !return '==' + $label
+  !endif
+  !if (type != "")
+    !return '==' + $label + '\n<size:' + $TECHN_FONT_SIZE + '>[' + $type + ']</size>'
+  !endif
+!endfunction
+
+!unquoted procedure Boundary($alias, $label, $type="", $tags="", $link="")
+rectangle "$getBoundary($label, $type)" $toStereos("boundary", $tags) as $alias $getLink($link)
+!endprocedure
+
+' Relationship
+' ##################################
+
+!function $getRel($direction, $alias1, $alias2, $label, $techn, $descr, $sprite, $tags, $link)
+  !$rel = $alias1 + ' ' + $direction + ' ' + $alias2
+  !if ($tags != "")
+    !$rel = $rel + ' ' + $toStereos($tags)
+  !endif  
+  !$rel = $rel + ' : '
+  !if ($sprite != "")
+    ' if it starts with & it's a OpenIconic, details see https://useiconic.com/open/
+    !if (%substr($sprite, 0, 1) != "&")
+      !$rel = $rel + '<$'+$sprite+'> '
+    !else
+      !$rel = $rel + '<'+$sprite+'> '
+    !endif    
+  !endif  
+  !if ($link != "")
+    !$rel = $rel + '**[[' + $link + ' ' + $label + ']]**'
+  !else
+    !$rel = $rel + '**' + $label + '**'
+  !endif
+  !if ($techn != "")
+    ' line break is not deterministic, calculate it
+    !$rel = $rel + '\n//<size:' + $TECHN_FONT_SIZE + '>[' + $breakTechn($techn, $REL_TECHN_MAX_CHAR_WIDTH) + ']</size>//'
+  !endif
+  !if ($descr != "")
+    ' line break is not deterministic, calculate it
+    !$rel = $rel + '\n\n' + $breakDescr($descr, $REL_DESCR_MAX_CHAR_WIDTH)
+  !endif
+  !return $rel
+!endfunction
+
+!unquoted procedure Rel_($alias1, $alias2, $label, $direction)
+$alias1 $direction $alias2 : **$label**
+!endprocedure
+!unquoted procedure Rel_($alias1, $alias2, $label, $techn, $direction)
+$alias1 $direction $alias2 : **$label**\n//<size:$TECHN_FONT_SIZE>[$techn]</size>//
+!endprocedure
+
+!unquoted procedure Rel($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("- ->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<- ->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_Back($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<- -", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_Neighbor($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_Back_Neighbor($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_D($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Down($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_D($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Down($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-DOWN->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_U($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Up($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_U($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Up($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-UP->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_L($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Left($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_L($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Left($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-LEFT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure Rel_R($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure Rel_Right($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+!unquoted procedure BiRel_R($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+!unquoted procedure BiRel_Right($from, $to, $label, $techn="", $descr="", $sprite="", $tags="", $link="")
+$getRel("<<-RIGHT->>", $from, $to, $label, $techn, $descr, $sprite, $tags, $link)
+!endprocedure
+
+' Layout Helpers
+' ##################################
+
+!function $getHiddenLine($distance)
+  !return '-[hidden]' + %substr('- - - - - - - - - - - -', 0, %intval($distance) + 1)
+!endfunction
+
+!unquoted procedure Lay_D($from, $to)
+$from -[hidden]D- $to
+!endprocedure
+!unquoted procedure Lay_U($from, $to)
+$from -[hidden]U- $to
+!endprocedure
+!unquoted procedure Lay_R($from, $to)
+$from -[hidden]R- $to
+!endprocedure
+!unquoted procedure Lay_L($from, $to)
+$from -[hidden]L- $to
+!endprocedure
+
+' PlantUML bug: lines which does "not match" with the orientation/direction of the diagram
+' uses the same length therefore the method offers no direction at all.
+' If a direction is required the Lay_...() methods can be used
+!unquoted procedure Lay_Distance($from, $to, $distance="0")
+$from $getHiddenLine($distance) $to
+!endprocedure
+!else
+' C4-PlantUML
+
+'Version
+' ##################################
+!function C4Version()
+  !return "2.4.0"
+!end function
+
+!procedure C4VersionDetails()
+rectangle C4VersionDetailsArea <<legendArea>> [
+| PlantUML | **%version()** |
+| C4-PlantUML | **C4Version()** |
+]
+!end procedure
+
+' Colors
+' ##################################
+
+!global $ELEMENT_FONT_COLOR = "#FFFFFF"
+
+!global $ARROW_COLOR = "#666666"
+
+!global $BOUNDARY_COLOR = "#444444"
+!global $BOUNDARY_BG_COLOR = "transparent"
+
+!global $LEGEND_FONT_COLOR = "#FFFFFF"
+!global $LEGEND_TITLE_COLOR = "#000000"
+' %darken(darkkhaki,50), #khaki
+!global $LEGEND_DARK_COLOR = "#66622E"
+!global $LEGEND_LIGHT_COLOR = "#khaki"
+
+' Labels
+' ##################################
+
+!global $LEGEND_SHADOW_TEXT = "(shadow) "
+!global $LEGEND_NO_SHADOW_TEXT = "(no shadow) "
+!global $LEGEND_NO_FONT_BG_TEXT = "(no text, no back color) "
+!global $LEGEND_NO_FONT_TEXT = "(no text color) "
+!global $LEGEND_NO_BG_TEXT = "(no back color) "
+!global $LEGEND_NO_LINE_TEXT = "(no line color) "
+!global $LEGEND_ROUNDED_BOX = "(rounded box) "
+!global $LEGEND_EIGHT_SIDED = "(eight sided) "
+!global $LEGEND_DOTTED_LINE = "(dotted) "
+!global $LEGEND_DASHED_LINE = "(dashed) "
+!global $LEGEND_BOLD_LINE = "(bold) "
+
+' Styling
+' ##################################
+
+!global $TECHN_FONT_SIZE = 12
+!global $ROUNDED_BOX_SIZE = 25
+!global $EIGHT_SIDED_SIZE = 18
+
+!global $ROUNDED_BOX = "roundedBox"
+!global $EIGHT_SIDED = "eightSided"
+
+!global $DOTTED_LINE = "dotted"
+!global $DASHED_LINE = "dashed"
+!global $BOLD_LINE = "bold"
+
+skinparam defaultTextAlignment center
+
+skinparam wrapWidth 200
+skinparam maxMessageSize 150
+
+skinparam LegendBorderColor transparent
+skinparam LegendBackgroundColor transparent
+skinparam LegendFontColor $LEGEND_FONT_COLOR
+
+skinparam shadowing<<legendArea>> false
+' #00000000 is transparent
+skinparam rectangle<<legendArea>> {
+    backgroundcolor #00000000
+    bordercolor #00000000
+}
+
+skinparam rectangle {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam database {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam queue {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+skinparam arrow {
+    Color $ARROW_COLOR
+    FontColor $ARROW_COLOR
+    FontSize 12
+}
+
+skinparam actor {
+    StereotypeFontSize 12
+    shadowing false
+    style awesome
+}
+
+skinparam person {
+    StereotypeFontSize 12
+    shadowing false
+}
+
+' Some boundary skinparams have to be set as package skinparams too (PlantUML uses internal packages)
+skinparam package {
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontStyle plain
+    BackgroundColor $BOUNDARY_BG_COLOR
+}
+
+skinparam rectangle<<boundary>> {
+    Shadowing false
+    StereotypeFontSize 6
+    StereotypeFontColor $BOUNDARY_BG_COLOR
+    FontColor $BOUNDARY_COLOR
+    BorderColor $BOUNDARY_COLOR
+    BackgroundColor $BOUNDARY_BG_COLOR
+    BorderStyle dashed
+}
+
+' Legend and Tags
+' ##################################
+!global $tagDefaultLegend = ""
+!global $tagCustomLegend = ""
+
+' rel specific
+!unquoted function $toStereos($tags)
+  !if (%strlen($tags) == 0)
+    !return ''
+  !endif
+  !$stereos = ''
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$stereos = $stereos + '<<' + $tag + '>>'
+%set_variable_value("$" + $tag + "_LineLegend", %true())
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags) > 0)
+    !$stereos = $stereos + '<<' + $tags + '>>'
+%set_variable_value("$" + $tags + "_LineLegend", %true())
+  !endif
+  !return $stereos
+!endfunction
+
+' if $sprite/$techn is an empty argument, try to calculate it via the defined $tag 
+!unquoted function $toRelArg($arg, $tags, $varPostfix)
+  !if ($arg > "")
+    !return $arg
+  !endif
+
+  !if (%strlen($tags) == 0)
+       !return $arg
+  !endif
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$newArg = %get_variable_value("$" + $tag + $varPostfix)
+    !if ($newArg > "")
+       !return $newArg
+    !endif
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags) > 0)
+    !$newArg = %get_variable_value("$" + $tags + $varPostfix)
+    !if ($newArg > "")
+       !return $newArg
+    !endif
+  !endif
+  !return $arg
+!endfunction
+
+' element specific (unused are hidden based on mask)
+!unquoted function $toStereos($elementType, $tags)
+  !if (%strlen($tags) == 0)
+    !$stereos = '<<' + $elementType + '>>'
+%set_variable_value("$" + $elementType + "Legend", %true())
+    !return $stereos
+  !endif
+  !$stereos = ''
+  !$mask = $resetMask()
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$stereos = $stereos + '<<' + $tag + '>>'
+    !$mergedMask = $combineMaskWithTag($mask, $tag)
+    !if ($mergedMask != $mask)
+%set_variable_value("$" + $tag + "Legend", %true())
+      !$mask = $mergedMask
+    !endif
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags) > 0)
+    !$stereos = $stereos + '<<' + $tags + '>>'
+    !$mergedMask = $combineMaskWithTag($mask, $tags)
+    !if ($mergedMask != $mask)
+%set_variable_value("$" + $tags + "Legend", %true())
+      !$mask = $mergedMask
+    !endif
+  !endif
+  ' has to be last, otherwise PlantUML overwrites all tag specific skinparams
+  !$stereos = $stereos + '<<' + $elementType + '>>'
+  !$mergedMask = $combineMaskWithTag($mask, $elementType)
+  !if ($mergedMask != $mask)
+%set_variable_value("$" + $elementType + "Legend", %true())
+    !$mask = $mergedMask
+  !endif
+  !return $stereos
+!endfunction
+
+' if $sprite/$techn is an empty argument, try to calculate it via the defined $tag 
+!unquoted function $toElementArg($arg, $tags, $varPostfix, $elementType)
+  !if ($arg > "")
+    !return $arg
+  !endif
+
+  !if (%strlen($tags) == 0)
+    !$newArg = %get_variable_value("$" + $elementType + $varPostfix)
+    !if ($newArg > "")
+       !return $newArg
+    !else
+       !return $arg
+    !endif
+  !endif
+  !$brPos = %strpos($tags, "+")
+  !while ($brPos >= 0)
+    !$tag = %substr($tags, 0, $brPos)
+    !$newArg = %get_variable_value("$" + $tag + $varPostfix)
+    !if ($newArg > "")
+       !return $newArg
+    !endif
+    !$tags = %substr($tags, $brPos+1)
+    !$brPos = %strpos($tags, "+")
+  !endwhile
+  !if (%strlen($tags) > 0)
+    !$newArg = %get_variable_value("$" + $tags + $varPostfix)
+    !if ($newArg > "")
+       !return $newArg
+    !endif
+    !$newArg = %get_variable_value("$" + $elementType + $varPostfix)
+    !if ($newArg > "")
+       !return $newArg
+    !endif
+  !endif
+  !return $arg
+!endfunction
+
+!function $elementTagSkinparams($element, $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$elementSkin = "skinparam " + $element + "<<" + $tagStereo + ">> {" + %newline()
+  !if ($fontColor != "")
+    !if ($tagStereo != "boundary")
+      !$elementSkin = $elementSkin + "    StereotypeFontColor " + $fontColor + %newline()
+    !endif
+    !$elementSkin = $elementSkin + "    FontColor " + $fontColor + %newline()
+  !endif
+  !if ($bgColor != "")
+    !$elementSkin = $elementSkin + "    BackgroundColor " + $bgColor + %newline()
+  !endif
+  !if ($borderColor != "")
+    !$elementSkin = $elementSkin + "    BorderColor " + $borderColor+ %newline()
+  !endif
+  !if ($shadowing == "true")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "true" + %newline()
+  !endif
+  !if ($shadowing == "false")
+    !$elementSkin = $elementSkin + "    Shadowing<<" + $tagStereo + ">> " + "false" + %newline()
+  !endif
+  ' only rectangle supports shape(d corners), define both skinparam that overlays are working
+  !if ($shape != "" && $element == "rectangle")
+    !if ($shape == $ROUNDED_BOX)
+      !$elementSkin = $elementSkin + "    RoundCorner " + $ROUNDED_BOX_SIZE+ %newline()
+      !$elementSkin = $elementSkin + "    DiagonalCorner " + "0" + %newline()
+    !elseif ($shape == $EIGHT_SIDED)
+      !$elementSkin = $elementSkin + "    RoundCorner " + "0" + %newline()
+      !$elementSkin = $elementSkin + "    DiagonalCorner " + $EIGHT_SIDED_SIZE+ %newline()
+    !endif
+  !endif
+  !$elementSkin = $elementSkin + "}" + %newline()
+  !return $elementSkin
+!endfunction
+
+!unquoted procedure $defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  ' only rectangle supports shape(d corners)
+  !$tagSkin = $elementTagSkinparams("rectangle", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
+  !$tagSkin = $tagSkin + $elementTagSkinparams("database", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  !$tagSkin = $tagSkin + $elementTagSkinparams("queue", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  ' actor has style awesome, therefore $fontColor is ignored and text uses $bgColor too
+  !$tagSkin = $tagSkin + $elementTagSkinparams("actor", $tagStereo, $bgColor, $bgColor, $borderColor, $shadowing, "")
+  !$tagSkin = $tagSkin + $elementTagSkinparams("person", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  !if ($tagStereo == "boundary" && $bgColor != "")
+    !$tagSkin = $tagSkin + "skinparam package<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+    !$tagSkin = $tagSkin + "skinparam rectangle<<boundary>>StereotypeFontColor " + $bgColor + %newline()
+  !endif
+$tagSkin
+!endprocedure
+
+' arrow colors cannot start with # (legend background has to start with #)
+!function $colorWithoutHash($c)
+  !if (%substr($c, 0, 1) == "#")
+    !$c = %substr($c,1)
+  !endif
+  !return $c
+!endfunction
+
+!unquoted procedure $defineRelSkinparams($tagStereo, $textColor, $lineColor, $lineStyle)
+  !$elementSkin = "skinparam arrow<<" + $tagStereo + ">> {" + %newline()
+  !$elementSkin = $elementSkin + "    Color "
+  !if ($lineColor != "")
+    !$elementSkin = $elementSkin + $colorWithoutHash($lineColor)
+  !endif
+  !if ($textColor != "")
+    !$elementSkin = $elementSkin + ";text:" + $colorWithoutHash($textColor)
+  !endif
+  !if ($lineStyle != "")
+    !$elementSkin = $elementSkin + ";line." + $lineStyle
+  !endif
+  !$elementSkin = $elementSkin + %newline()
+  !$elementSkin = $elementSkin + "}" + %newline()
+$elementSkin
+!endprocedure
+
+' %is_dark() requires PlantUML version >= 1.2021.6
+!if (%function_exists("%is_dark"))
+  !$PlantUMLSupportsDynamicLegendColor = %true()
+!else
+  !$PlantUMLSupportsDynamicLegendColor = %false()
+  !log "dynamic undefined legend colors" requires PlantUML version >= 1.2021.6, therefore only static assigned colors are used
+!endif
+
+!unquoted function $contrastLegend($color)
+  !if (%is_dark($color))
+    !$value = $LEGEND_LIGHT_COLOR
+  !else
+    !$value = $LEGEND_DARK_COLOR
+  !endif
+  !return $value
+!endfunction
+
+!unquoted function $flatLegend($color)
+  !if (%is_dark($color))
+    !$value = $LEGEND_DARK_COLOR
+  !else
+    !$value = $LEGEND_LIGHT_COLOR
+  !endif
+  !return $value
+!endfunction
+
+' legend background has to start with #
+!function $colorWithHash($c)
+  !if (%substr($c, 0, 1) != "#")
+    !$c = "#" + $c
+  !endif
+  !return $c
+!endfunction
+
+!function $addMaskFlag($mask, $attr)
+  !if ($attr == "")
+    !$mask = $mask + "0"
+  !else
+    !$mask = $mask + "1"
+  !endif
+  !return $mask
+!endfunction
+
+!function $orFlags($flag1, $flag2)
+  !if ($flag1 == "0" && $flag2 == "0")
+    !return "0"
+  !endif
+  !return "1"
+!endfunction
+
+!function $tagLegendMask($bgColor, $fontColor, $borderColor, $shadowing, $shape, $sprite)
+  !$mask = ""
+  !$mask = $addMaskFlag($mask, $bgColor)
+  !$mask = $addMaskFlag($mask, $fontColor)
+  !$mask = $addMaskFlag($mask, $borderColor)
+  !$mask = $addMaskFlag($mask, $shadowing)
+  !$mask = $addMaskFlag($mask, $shape)
+  !$mask = $addMaskFlag($mask, $sprite)
+  !return $mask
+!endfunction
+
+!function $resetMask()
+  !return "000000"
+!endfunction
+
+!function $combineMasks($mask1, $mask2)
+  !$mask = ""
+  !$mask = $mask + $orFlags(%substr($mask1, 0, 1), %substr($mask2, 0, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 1, 1), %substr($mask2, 1, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 2, 1), %substr($mask2, 2, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 3, 1), %substr($mask2, 3, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 4, 1), %substr($mask2, 4, 1))
+  !$mask = $mask + $orFlags(%substr($mask1, 5, 1), %substr($mask2, 5, 1))
+  !return $mask
+!endfunction
+
+!function $combineMaskWithTag($mask1, $tag)
+  !$mask2 = %get_variable_value("$" + $tag+ "LegendMask")
+  !if ($mask2 == "")
+    ' !log combineMaskWithTag $mask1, $tag, ... only $mask1
+    !return $mask1
+  !endif
+
+  ' !log combineMaskWithTag $mask1, $tag, $mask2 ... $combineMasks($mask1, $mask2)
+  !return  $combineMasks($mask1, $mask2)
+!endfunction
+
+' element symbols typically 4 times too big in legend
+!function $smallVersionSprite($sprite)
+  ' ,scale= ... has to be first (...,color=black,scale=0.25... is invalid too)
+  !if (%strpos($sprite, "=") < 0)
+    !if (%substr($sprite, 0, 4) == "img:")
+      !$smallSprite = $sprite + "{scale=0.25}"
+    !else
+      !$smallSprite = $sprite + ",scale=0.25"
+    !endif
+  !else
+    !$smallSprite = $sprite
+  !endif
+  !return $smallSprite
+!endfunction
+
+' format sprite that it can be used in diagram
+!function $getSprite($sprite)
+  ' if it starts with & it's a OpenIconic, details see https://useiconic.com/open/
+  ' if it starts with img: it's an image, details see https://plantuml.com/creole
+  !if (%substr($sprite, 0, 1) != "&" && %substr($sprite, 0, 4) != "img:")
+    !$formatted = "<$" + $sprite + ">"
+  !else
+    !$formatted = "<" + $sprite + ">"
+  !endif
+  !return $formatted
+!endfunction
+
+!function $tagLegendEntry($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape, $legendText, $legendSprite)
+  !$bg = $bgColor
+  !$fo = $fontColor
+  !$bo = $borderColor
+
+  !if ($fo == "")
+    !if ($bg != "")
+!if ($PlantUMLSupportsDynamicLegendColor)
+      !$fo = $contrastLegend($bg)
+!else
+      !$fo = $LEGEND_DARK_COLOR
+!endif
+    !else
+      !if ($bo == "")
+        !$fo = $LEGEND_DARK_COLOR
+        !$bg = $LEGEND_LIGHT_COLOR
+      !else
+!if ($PlantUMLSupportsDynamicLegendColor)
+        !$fo = $flatLegend($bo)
+        !$bg = $contrastLegend($bo)
+!else
+        !$fo = $LEGEND_DARK_COLOR
+        !$bg = $LEGEND_LIGHT_COLOR
+!endif
+      !endif
+    !endif
+  !else
+    !if ($bg == "")
+!if ($PlantUMLSupportsDynamicLegendColor)
+      !$bg = $contrastLegend($fo)
+!else
+      !$bg = $LEGEND_LIGHT_COLOR
+!endif
+    !endif
+  !endif
+
+  !if ($bo == "")
+    !$bo = $bg
+  !endif
+
+  !$tagEntry = "|"
+  !$tagEntry = $tagEntry + "<" + $colorWithHash($bg) +">"
+  ' <U+25AF> ..white rectangle
+  !$tagEntry = $tagEntry + "<color:"+$bo+"> <U+25AF></color> "
+  !$tagEntry = $tagEntry + "<color:"+$fo+">"
+  !if ($legendSprite != "")
+    !$tagEntry = $tagEntry + $getSprite($legendSprite) + " "
+  !endif
+  !if ($legendText == "")
+    !$tagEntry = $tagEntry + " " + $tagStereo + " "
+    !if ($shadowing == "true")
+      !$tagEntry = $tagEntry + $LEGEND_SHADOW_TEXT
+    !endif
+    !if ($shadowing == "false")
+      !$tagEntry = $tagEntry + $LEGEND_NO_SHADOW_TEXT
+    !endif
+    !if ($shape == $ROUNDED_BOX)
+      !$tagEntry = $tagEntry + $LEGEND_ROUNDED_BOX
+    !endif
+    !if ($shape == $EIGHT_SIDED)
+      !$tagEntry = $tagEntry + $LEGEND_EIGHT_SIDED
+    !endif
+    !if ($fontColor == "" && $bgColor == "")
+        !$tagEntry = $tagEntry + $LEGEND_NO_FONT_BG_TEXT
+    !else 
+      !if ($fontColor == "")
+        !$tagEntry = $tagEntry + $LEGEND_NO_FONT_TEXT
+      !endif
+      !if ($bgColor == "")
+        !$tagEntry = $tagEntry + $LEGEND_NO_BG_TEXT
+      !endif
+    !endif
+  !else
+    !$tagEntry = $tagEntry + " " + $legendText + " "
+  !endif
+
... 403983 lines suppressed ...