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 2017/09/25 06:47:08 UTC

[isis] branch master updated: ISIS-1712 - updates docs, replace references to isisaddons and catalog.incode.org with platform.incode.org

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d9e3e03  ISIS-1712 - updates docs, replace references to isisaddons and catalog.incode.org with platform.incode.org
d9e3e03 is described below

commit d9e3e03d24b9c538a7a8ef0ecec1b65a6f637541
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 25 07:42:52 2017 +0100

    ISIS-1712 - updates docs, replace references to isisaddons and catalog.incode.org with platform.incode.org
---
 .../src/main/asciidoc/documentation.adoc           |   5 +-
 .../documentation/src/main/asciidoc/downloads.adoc |  16 +-
 .../cgcom/_cgcom_post-release-successful.adoc      | 227 +--------------------
 .../asciidoc/guides/dg/_dg_asciidoc-templates.adoc |  69 -------
 ...s-and-tips_how-run-fixtures-on-app-startup.adoc |   3 +-
 .../main/asciidoc/guides/dg/_dg_ide_intellij.adoc  |   3 +-
 .../guides/dg/_dg_working-with-many-repos.adoc     |   3 +-
 .../guides/rgant/_rgant-Action_command.adoc        |   2 +-
 .../guides/rgant/_rgant-CollectionLayout.adoc      |   2 +-
 .../rgant/_rgant-CollectionLayout_defaultView.adoc |   3 +-
 .../guides/rgant/_rgant-Discriminator.adoc         |   2 +-
 .../rgant/_rgant-DomainObject_objectType.adoc      |   2 +-
 .../_rgant-DomainServiceLayout_menuOrder.adoc      |  19 +-
 .../guides/rgant/_rgant-DomainService_nature.adoc  |   4 +-
 .../main/asciidoc/guides/rgant/_rgant-Inject.adoc  |   3 +-
 .../guides/rgant/_rgant-ParameterLayout_named.adoc |  11 +-
 .../guides/rgant/_rgant-Parameter_fileAccept.adoc  |   2 +-
 .../guides/rgant/_rgant-Parameter_maxLength.adoc   |   2 +-
 .../guides/rgant/_rgant-PersistenceCapable.adoc    |   2 +-
 .../guides/rgant/_rgant-ViewModel_objectType.adoc  |   2 +-
 .../guides/rgcfg/_rgcfg_configuring-core.adoc      |   2 +-
 .../_rgcms_classes_AppManifest-bootstrapping.adoc  |   4 +-
 ...rgcms_classes_contributee_HasTransactionId.adoc |   9 +-
 .../_rgcms_classes_contributee_HasUserName.adoc    |  13 +-
 .../_rgcms_classes_super_AbstractSubscriber.adoc   |   8 +-
 .../main/asciidoc/guides/rgcms/_rgcms_schema.adoc  |   6 +-
 .../guides/rgfis/_rgfis_application-layer.adoc     |   5 +-
 .../guides/rgfis/_rgfis_persistence-layer.adoc     |   5 +-
 .../guides/rgfis/_rgfis_presentation-layer.adoc    |   5 +-
 .../guides/rgsvc/_rgsvc_application-layer-api.adoc |   3 +-
 ...vc_application-layer-api_BackgroundService.adoc |  13 +-
 ...ication-layer-api_BackgroundService_Quartz.adoc |   3 +-
 ...rgsvc_application-layer-api_CommandContext.adoc |  12 +-
 ...c_application-layer-api_InteractionContext.adoc |   3 +-
 .../guides/rgsvc/_rgsvc_application-layer-spi.adoc |   3 +-
 ...ication-layer-spi_BackgroundCommandService.adoc |  16 +-
 ...rgsvc_application-layer-spi_CommandService.adoc |  11 +-
 .../guides/rgsvc/_rgsvc_bootstrapping-spi.adoc     |   3 +-
 .../guides/rgsvc/_rgsvc_core-domain-api.adoc       |   3 +-
 .../_rgsvc_core-domain-api_EventBusService.adoc    |   6 +-
 .../guides/rgsvc/_rgsvc_integration-api.adoc       |   3 +-
 .../_rgsvc_integration-api_BookmarkService.adoc    |  16 +-
 .../main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc   |  11 +-
 .../asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc |   3 +-
 ..._metadata-api_ApplicationFeatureRepository.adoc |   3 +-
 .../guides/rgsvc/_rgsvc_persistence-layer-api.adoc |   3 +-
 .../guides/rgsvc/_rgsvc_persistence-layer-spi.adoc |   3 +-
 ...rgsvc_persistence-layer-spi_AuditerService.adoc |  12 +-
 ...gsvc_persistence-layer-spi_AuditingService.adoc |   9 +-
 ...gsvc_persistence-layer-spi_EventSerializer.adoc |   8 +-
 ...svc_persistence-layer-spi_PublisherService.adoc |  30 +--
 ...vc_persistence-layer-spi_PublishingService.adoc |  23 +--
 ...sistence-layer-spi_UserRegistrationService.adoc |   6 +-
 .../rgsvc/_rgsvc_presentation-layer-spi.adoc       |   3 +-
 ...esentation-layer-spi_SessionLoggingService.adoc |   2 +-
 .../main/asciidoc/guides/rgsvc/_rgsvc_testing.adoc |   6 +-
 ...gbtb_deployment_externalized-configuration.adoc |   2 +-
 ...headless-access_BackgroundCommandExecution.adoc |   2 +-
 .../ugbtb/_ugbtb_hints-and-tips_multi-tenancy.adoc |   5 +-
 .../ugfun/_ugfun_available-domain-services.adoc    |   3 +-
 ...n_available-domain-services_incode-catalog.adoc |  31 ---
 ..._available-domain-services_incode-platform.adoc |  30 +++
 ...gfun_available-domain-services_isis-addons.adoc |  41 ----
 .../_ugfun_building-blocks_events_ui-events.adoc   |   2 +-
 .../ugfun/_ugfun_building-blocks_modules.adoc      |   2 +-
 ...ks_types-of-domain-objects_domain-services.adoc |   2 +-
 ...ore-concepts_apache-isis-vs_event-sourcing.adoc |   2 +-
 ...un_core-concepts_apache-isis-vs_metawidget.adoc |   2 +-
 ...re-concepts_apache-isis-vs_mvc-server-side.adoc |   8 +-
 .../_ugfun_core-concepts_deployment-options.adoc   |   2 +-
 .../ugfun/_ugfun_core-concepts_philosophy_aop.adoc |   4 +-
 ...-concepts_philosophy_naked-objects-pattern.adoc |   2 +-
 ...ugfun_core-concepts_principles_lego-blocks.adoc |   2 +-
 .../ugfun/_ugfun_programming-model_actions.adoc    |   2 +-
 ...fun_programming-model_domain-services_menu.adoc |   2 +-
 ...amming-model_view-models_dto_dto-consumers.adoc |   2 +-
 .../_ugfun_ui-hints_names-and-descriptions.adoc    |   2 +-
 .../asciidoc/guides/ugodn/_ugodn_db-schemas.adoc   |   2 +-
 ..._hints-and-tips_overriding-jdo-annotations.adoc |   2 +-
 .../guides/ugsec/_ugsec_api-for-applications.adoc  |   4 +-
 ...entations_isisaddons-security-module-realm.adoc |   9 +-
 ...sec_shiro-realm-implementations_jdbc-realm.adoc |   2 +-
 .../guides/ugsec/_ugsec_usage-by-isis-viewers.adoc |   2 +-
 .../src/main/asciidoc/guides/ugsec/ugsec.adoc      |   6 +-
 .../_ugtst_fixture-scripts_api-and-usage.adoc      |   6 +-
 .../asciidoc/guides/ugtst/_ugtst_overview.adoc     |   4 +-
 ...t-test-support_soap-fake-server-junit-rule.adoc |   2 +-
 .../ugvw/_ugvw_customisation_auto-refresh.adoc     |   3 +-
 ...extending_login-via-query-args-prototyping.adoc |   2 +-
 .../_ugvw_extending_replacing-page-elements.adoc   |  14 +-
 .../ugvw/_ugvw_features_user-registration.adoc     |   4 +-
 .../guides/ugvw/_ugvw_incode-platform.adoc         |  37 ++++
 .../asciidoc/guides/ugvw/_ugvw_isis-addons.adoc    |  36 ----
 .../guides/ugvw/_ugvw_layout_application-menu.adoc |  12 +-
 .../src/main/asciidoc/guides/ugvw/ugvw.adoc        |   4 +-
 .../_migration-notes_1.12.0-to-1.13.0.adoc         |   6 +-
 .../_migration-notes_1.14.0-to-1.15.0.adoc         |   2 +-
 .../_migration-notes_1.6.0-to-1.7.0.adoc           |   3 +-
 ...0-to-1.9.0_bootstrapping-using-AppManifest.adoc |   5 +-
 ...on-notes_1.8.0-to-1.9.0_upgrading-to-java8.adoc |   2 +-
 .../_migration-notes_1.9.0-to-1.10.0.adoc          |   3 +-
 .../pages/common-use-cases/common-use-cases.adoc   |   3 +-
 .../pages/isis-in-pictures/isis-in-pictures.adoc   |  29 ++-
 .../pages/powered-by/_powered-by_commapp.adoc      |  32 ++-
 .../pages/powered-by/_powered-by_estatio.adoc      |  22 +-
 .../powered-by/_powered-by_gesconsultor-grc.adoc   |  38 ++--
 .../powered-by/_powered-by_transport-planner.adoc  |   6 +-
 .../pages/screencasts/screencasts-older.adoc       |  10 +-
 .../asciidoc/pages/screencasts/screencasts.adoc    |  16 +-
 .../tg/_tg_stop-scaffolding-start-coding.adoc      |  24 ++-
 .../release-notes/_release-notes_1.10.0.adoc       |   4 +-
 .../release-notes/_release-notes_1.12.0.adoc       |   2 +-
 .../release-notes/_release-notes_1.13.0.adoc       |   5 +-
 .../release-notes/_release-notes_1.13.2.adoc       |   4 +-
 .../release-notes/_release-notes_1.15.0.adoc       |   6 +-
 .../release-notes/_release-notes_1.7.0.adoc        |   2 +-
 116 files changed, 403 insertions(+), 778 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index d7b0ef5..c66c4e4 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -45,10 +45,9 @@ pass:[<br/>]
 * *link:pages/cheat-sheet/cheat-sheet.html[Cheat Sheet^]*
 * link:pages/icons/icons.html[Icons^]
 
-*3rd-party add-ons (not ASF)*
+*3rd-party modules (not ASF)*
 
-* http://www.isisaddons.org[Isis addons^]
-* http://catalog.incode.org[Incode Catalog^]
+* http://platform.incode.org[Incode Platform^]
 
 
 |===
diff --git a/adocs/documentation/src/main/asciidoc/downloads.adoc b/adocs/documentation/src/main/asciidoc/downloads.adoc
index 86fde3f..438c2ac 100644
--- a/adocs/documentation/src/main/asciidoc/downloads.adoc
+++ b/adocs/documentation/src/main/asciidoc/downloads.adoc
@@ -102,12 +102,18 @@ See link:https://gitbox.apache.org/setup/[gitbox setup] for more details on how
 
 
 
-== Isis add-ons & Incode Catalog
+== Incode Platform
 
-There are also a number of (open source, but not ASF) supporting modules and extensions for you to use:
+The link:http://platform.incode.org[Incode Platform^] provides a number of (open source, but not ASF) supporting modules and extensions for you to use:
 
-* the link:http://www.isisaddons.org/[Isis Add-ons] provide technical extensions, such as security, commands, auditing and feature toggles
+* technical libraries, such as excel, word and freemarker
 
-* the link:http://catalog.incode.org[Incode Catalog] provides business modules, such as documents, notes and communications.
+* SPI implementations, such as security, commands, auditing and publishing
 
-Each module is in a separate github repo, with a demo app to illustrate the module's functionality.
+* framework extensions, such as flyway, quartz and feature toggles
+
+* wicket components, such as maps, calendars and PDF viewer
+
+* business modules, such as documents, notes and communications.
+
+Each module can be used independently or combined, and the Incode Platform also provides a quickstart application to get you started quickly.
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
index 82675d0..bfccad6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
@@ -449,230 +449,5 @@ git push
 [[__cgcom_post-release-successful_release-non-asf-modules]]
 == Release (non-ASF) Modules
 
-There are two libraries of modules, both non-ASF but open source, that should be released.
-
-* link:http://www.isisaddons.org[Isis Addons] - modules addressing technical concerns
-* link:http://catalog.incode.org[Incode Catalog] - modules for various generic business subdomains
-
-These each use a common parent, `org.incode:incode-parent`.
-This must be released first, then both set of modules afterwards.
-
-
-[[__cgcom_post-release-successful_release-non-asf-modules_prereqs]]
-=== Prereqs
-
-Save this link:https://gist.github.com/danhaywood/e80daf6d25f5c1fb1093effba85d088a[gist] as `last_modified.sh` in an appropriate parent directory of both sets of repos.
-
-For example, if the isisaddons modules are cloned to `/c/github/isisaddons/isis-module-xxx` and the incode catalog modules are cloned to `/c/github/incodehq/incode-module-xxx`, then save in `/c/github`.
-
-
-
-[[__cgcom_post-release-successful_release-non-asf-modules_incode-parent]]
-=== Release `incode-parent`
-
-[NOTE]
-====
-TODO: need to rework this and the following two sections to instead just release the incode-catalog (`1.16.0-SNAPSHOT`).
-
-This incorporates all of `incode-parent`, isisaddons.org` and `catalog.incode.org`.
-====
-
-
-The `org.incode:incode-parent` Maven module is used as a parent for both sets of modules:
-
-* update its dependency on Apache Isis to reference the newly released version: +
-+
-[source,bash]
-----
-sh bumpver_isis.sh 1.16.0
-----
-
-* update the README
-
-** replace each version with next (ie the "How to Configure/Use" section, and the "Release to Maven Central" section at the end):
-
-*** replace 1.16.0-SNAPSHOT with 1.17.0-SNAPSHOT
-*** replace 1.15.0          with 1.16.0
-
-** update the "Change Log" section
-
-* Release using: +
-+
-[source,bash]
-----
-sh release.sh "1.16.0" "1.17.0-SNAPSHOT" "dan@haywood-associates.co.uk" "this is not really my password"
-----
-
-
-
-[[__cgcom_post-release-successful_release-non-asf-modules_isisaddons]]
-=== Release Isis Addons
-
-Once the Apache Isis release is available, all of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] should also be released.
-
-Using this link:https://gist.github.com/danhaywood/21b5b885433fd8bc440da3fab88c91cb[gist] to invoke operations across all (or selected) addons:
-
-* update its dependency on Apache Isis to reference the newly released version: +
-+
-[source,bash]
-----
-foreach -g isisaddons sh bumpver_isis.sh 1.16.0
-----
-+
-and use: +
-+
-[source,bash]
-----
-foreach -g isisaddons git diff HEAD^ HEAD
-----
-+
-and: +
-+
-[source,bash]
-----
-foreach -g isisaddons git status --branch --porcelain
-----
-+
-to review changes made.
-
-* update the README for each repository.
-
-** if using Windows, then: +
-+
-[source,bash]
-----
-"C:\Program Files (x86)\Notepad++\notepad++.exe" isisaddons/isis-m*/README.adoc  isisaddons/isis-w*/README.adoc
-----
-
-** replace each version with next (ie the "How to Configure/Use" section, and the "Release to Maven Central" section at the end):
-
-*** replace `1.16.0` with `1.17.0`
-*** replace `1.15.1` with `1.16.0` as necessary (pretty much everywhere apart from the "Change Log")
-
-** update the "Change Log" section
-
-* release the metamodel/module/wicket modules to mvn central (contains a sanity check before hand that everything compiles): +
-+
-[source,bash]
-----
-foreach -g isisaddons/isis-[mw] sh release.sh "1.16.0" "1.17.0-SNAPSHOT" "dan@haywood-associates.co.uk" \"this is not really my password\"
-----
-
-* In the parent directory where the `last_modified.sh` script has been saved (see xref:../cgcom/cgcom.adoc#__cgcom_post-release-successful_release-non-asf-modules_prereqs[above]), use to check that all modules were released successfully: +
-+
-[source,bash]
-----
-foreach -g isisaddons/isis-[mw] sh ../../last-modified.sh 1.16.0
-----
-+
-[IMPORTANT]
-====
-Wait at least 10 minutes to check; sync'ing to Maven central from the Sonatype OSS repository isn't instaneous.
-====
-
-* Assuming everything did get published ok, then push branch and tag: +
-+
-[source,bash]
-----
-foreach -g isisaddons/isis-[mw] "git push origin master && git push origin 1.16.0"
-----
-
-
-[[__cgcom_post-release-successful_release-non-asf-modules_incode-catalog]]
-=== Release Incode Catalog Modules
-
-Similarly, all of the (non-ASF) link:http://catalog.incode.org[Incode Catalog] modules should also be released.
-
-Using this link:https://gist.github.com/danhaywood/21b5b885433fd8bc440da3fab88c91cb[gist] to invoke operations across all (or selected) addons:
-
-* update its dependency on Apache Isis to reference the newly released version: +
-+
-[source,bash]
-----
-foreach -g incodehq/incode-module sh bumpver_isis.sh 1.16.0
-----
-
-* update the README for each repository. +
-+
-eg if using Windows, then:
-+
-[source,bash]
-----
-"C:\Program Files (x86)\Notepad++\notepad++.exe" incodehq/incode-*/README.adoc
-----
-
-** Replace each version with next (ie the "How to Configure/Use" section, and the "Release to Maven Central" section at the end):
-
-*** replace `1.16.0` with `1.17.0`
-*** replace `1.15.1` with `1.16.0` as necessary (pretty much everywhere apart from the "Change Log")
-
-** update the "Change Log" section
-
-* update cross-module dependencies +
-+
-Some of the incode catalog modules depend on isisaddons modules, and also on each other. +
-+
-eg if using Windows, then: +
-+
-[source,bash]
-----
-"C:\Program Files (x86)\Notepad++\notepad++.exe" incodehq/incode-module*/pom.xml  incodehq/incode-module-*/dom/pom.xml incodehq/incode-module-*/module/pom.xml
-----
-+
-[TIP]
-====
-See xref:../cgcom/cgcom.adoc#__cgcom_post-release-successful_release-non-asf-modules_incode-catalog_cross-module-dependencies[below] for a list of the dependencies to update.
-====
-
-* If necessary, adjust the `_repos.txt` file (used by `foreach` function) so that repositories are released in the correct sequence (with respect to their mutual dependencies).
-For example, `incode-module-base` must be released prior to `incode-module-alias`.
-
-* release the `incode-module-???` modules to mvn central (contains a sanity check before hand that everything compiles): +
-+
-[source,bash]
-----
-foreach -g incodehq/incode-module-[a-w] sh release.sh "1.16.0" "1.17.0-SNAPSHOT" "dan@haywood-associates.co.uk" \"this is not really my password\"
-----
-
-* In the parent directory where the `last_modified.sh` script has been saved (see xref:../cgcom/cgcom.adoc#__cgcom_post-release-successful_release-non-asf-modules_prereqs[above]), use to check that all modules were released successfully: +
-+
-[source,bash]
-----
-foreach -g incodehq/incode-module-[a-w] sh ../../last-modified.sh 1.16.0
-----
-+
-[IMPORTANT]
-====
-Wait at least 10 minutes to check; sync'ing to Maven central from the Sonatype OSS repository isn't instaneous.
-====
-
-* Assuming everything did get published ok, then push branch and tag: +
-+
-[source,bash]
-----
-foreach -g incodehq/incode-module-[a-w] "git push origin master && git push origin 1.16.0"
-----
-
-
-[[__cgcom_post-release-successful_release-non-asf-modules_incode-catalog_cross-module-dependencies]]
-==== Cross-module dependencies
-
-As of v1.16.0, the list of dependencies that needed to be updated (across all modules) were:
-
-** `<isis-module-fakedata.version>1.16.0</isis-module-fakedata.version>`
-** `<isis-module-freemarker.version>1.16.0</isis-module-freemarker.version>`
-** `<isis-wicket-fullcalendar2-cpt.version>1.16.0</isis-wicket-fullcalendar2-cpt.version>`
-** `<isis-wicket-gmap3-cpt.version>1.16.0</isis-wicket-gmap3-cpt.version>`
-** `<isis-module-poly.version>1.16.0</isis-module-poly.version>`
-** `<isis-module-security.version>1.16.0</isis-module-security.version>`
-** `<incode-module-base.version>1.16.0</incode-module-base.version>`
-** `<incode-module-fixturesupport.version>1.16.0</incode-module-fixturesupport.version>`
-** `<incode-module-unittestsupport.version>1.16.0</incode-module-unittestsupport.version>`
-** `<incode-module-integtestsupport.version>1.16.0</incode-module-integtestsupport.version>`
-** `<incode-module-country.version>1.16.0</incode-module-country.version>`
-** `<incode-module-document.version>1.16.0</incode-module-document.version>`
-** `<incode-module-docrendering-freemarker.version>1.16.0</incode-module-docrendering-freemarker.version>`
-** `<incode-module-docrendering-stringinterpolator.version>1.16.0</incode-module-docrendering-stringinterpolator.version>`
-** `<incode-module-docrendering-xdocreport.version>1.16.0</incode-module-docrendering-xdocreport.version>`
-
+The (non-ASF) link:http://platform.incode.org[Incode Platform^] should also be released, as per their link:http://platform.incode.org/pages/committers-guide/committers-guide.html#_release_to_maven_central[release guide].
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
index fb7bff8..e2a10a1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
@@ -391,75 +391,6 @@ for example:
 
 
 
-== Link to Isis Addons
-
-Links to (non-ASF) link:http://www.isisaddons.org[Isis Addons]
-
-[cols="1,4a,2a", options="header"]
-|===
-| Abbrev.
-| Produces
-| Example
-
-
-|`adlinkaddons`
-|`(non-ASF) \link:\http://www.isisaddons.org[[Isis Addons]]`
-
-link to the Isis Addons website.
-
-|(non-ASF) link:http://www.isisaddons.org[Isis Addons]
-
-
-
-|`adlinkaddonsapp`
-|`(non-ASF) \link:\http://github.com/isisaddons/isis-app-xxx[[Isis addons' xxx]]`
-
-link to the github repo for an example app from the Isis addons; where:
-
-* `xxx` is the name of the example app being linked to
-
-for example:
-
-pass:[<pre>(non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]`
-
-|(non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]
-
-
-
-|`adlinkaddonsmodule`
-|`(non-ASF) \http://github.com/isisaddons/isis-module-xxx[[Isis addons' xxx]] module`
-
-link to the github repo for a module from the Isis addons; where:
-
-* `xxx` is the name of the module being linked to
-
-for example:
-
-`(non-ASF) \http://github.com/isisaddons/isis-module-security[[Isis addons' security]] module`
-
-|(non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module
-
-
-
-|`adlinkaddonswicket`
-|`(non-ASF) \http://github.com/isisaddons/isis-wicket-xxx[[Isis addons' xxx]] wicket extension`
-
-link to the github repo for a wicket UI component from the Isis addons; where:
-
-* `xxx` is the name of the wicket UI component being linked to
-
-for example:
-
-`(non-ASF) \http://github.com/isisaddons/isis-wicket-gmap3[[Isis addons' gmap3]] wicket extension`
-
-
-|(non-ASF) http://github.com/isisaddons/isis-wicket-gmap3[Isis addons' gmap3 ] wicket extension
-
-|===
-
-
-
-
 == Source code
 
 [cols="1,4a,2a", options="header"]
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
index 3969c81..3990150 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
@@ -18,6 +18,7 @@ These can be run in on start-up typically by being specified in the xref:../rgcm
 
 Alternatively just set `isis.fixtures` and `isis.persistor.datanucleus.install-fixtures` properties.
 
-In terms of implementations, you might also want to check out the (non-ASF) http://github.com/isisaddons/isis-module-excel[Isis addons' excel] module, by using link:https://github.com/isisaddons/isis-module-excel/blob/master/dom/src/main/java/org/isisaddons/module/excel/dom/ExcelFixture.java[`ExcelFixture`] and overriding `ExcelFixtureRowHandler` (same package).
+In terms of implementations, you might also want to check out the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s excel module, by using `ExcelFixture` and overriding `ExcelFixtureRowHandler`.
+
 An example can be found in this (non ASF) link:https://github.com/incodehq/contactapp[contactapp], see link:https://github.com/incodehq/contactapp/blob/master/backend/fixture/src/main/java/org/incode/eurocommercial/contactapp/fixture/scenarios/demo/ContactImport.java[`ContactRowHandler`].
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
index e494a6f..fb52b57 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
@@ -699,8 +699,7 @@ image::{_imagesdir}intellij-idea/070-advanced/040-dcevm-run-configuration.png[wi
 
 === Setting up JRebel
 
-See the repo for the (non-ASF) link:https://github.com/isisaddons/isis-jrebel-plugin[Isis JRebel] plugin.  With some
-modification, this should work for IntelliJ too.
+See the repo for the (non-ASF) link:https://github.com/isisaddons/isis-jrebel-plugin[Isis JRebel] plugin.
 
 Note that JRebel is a commercial product, requiring a license.  At the time of writing there is also currently a
 non-commercial free license (though note this comes with some usage conditions).
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
index dc57c02..5259a2f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
@@ -6,7 +6,8 @@
 :toc: right
 
 
-Applications built with Apache Isis often (should) consist of multiple modules, each in separate git repositories.  For example, there are the various (non-ASF) link:http://www.isisaddons.org[Isis Addons] that provide various cross-cutting concerns/technical services (security, mail-merge etc), as well the modules eg as provided by the (non-ASF) link:http://catalog.incode.org[Incode Catalog], which provides generic business subdomains (communication channels, documents etc).
+Applications built with Apache Isis often (should) consist of multiple modules.
+For example, there are the various modules that make up the (non-ASF) link:http://platform.incode.org[Incode Platform^] that provide various technical/cross-cutting concerns and generic business functionality.
 
 In addition, your own application may well be structured as a number of distinct modules (probably with the entities in each module being mapped to a different schema), and using such techniques as the xref:../ugfun/ugfun.adoc#_ugfun_building-blocks_events_domain-events[event bus] and xref:../ugfun/ugfun.adoc#_ugfun_building-blocks_types-of-domain-objects_mixins[mixins] so that these modules are decoupled from each other.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
index 1c4bcc0..2441a32 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
@@ -19,7 +19,7 @@ Each action invocation is reified by the xref:../rgsvc/rgsvc.adoc#_rgsvc_applica
 
 If an appropriate `CommandService` is configured (for example using (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module), then the `Command` itself is persisted.
 
-By default, actions are invoked in directly in the thread of the invocation.   If there is an implementation of `BackgroundCommandService` (as the http://github.com/isisaddons/isis-module-command[Isis addons' command] module does provide), then this means in turn that the `BackgroundService` can be used by the domain object code to programmatically create background ``Command``s.
+By default, actions are invoked in directly in the thread of the invocation.   If there is an implementation of `BackgroundCommandService` (as the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module does provide), then this means in turn that the `BackgroundService` can be used by the domain object code to programmatically create background ``Command``s.
 
 [NOTE]
 ====
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
index e0403a1..14b3e99 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
@@ -28,7 +28,7 @@ The table below summarizes the annotation's attributes.
 |`table`, `excel`, `calendar`, `map`, ...
 |Which view is selected by default, if multiple views are available.
 
-See (non-ASF) link:http://www.isisaddons.org[Isis Addons] for further views.
+See the (non-ASF) link:http://platform.incode.org[Incode Platform^] for further Wicket components providing views.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
index b5339b8..b2c58c3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
@@ -5,7 +5,8 @@
 :_imagesdir: images/
 
 
-The xref:../ugvw/ugvw.adoc#[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the (non-ASF) (non-ASF) link:http://www.isisaddons.org[Isis Addons]' (non-ASF) http://github.com/isisaddons/isis-wicket-excel[excel] view, the http://github.com/isisaddons/isis-wicket-fullcalendar2[fullcalendar2] view, and the http://github.com/isisaddons/isis-wicket-gmap3[gmap3] view.  If the objects to be rendered have the correct " [...]
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the excel, fullcalendar2 and gmap3 provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^].
+If the objects to be rendered have the correct "shape", then the appropriate view will be made available.  For example, objects with a date can be rendered using `calendar`; objects with locations can be rendered using `map`.
 
 The `defaultView()` attribute is used to select which of these views should be used by default for a given collection.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
index e0b29ec..ebe4ec4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
@@ -22,7 +22,7 @@ This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
  (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
- ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
+ ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
index f922b54..0d0aff2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
@@ -12,7 +12,7 @@ This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
  (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
- ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
+ ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc
index 60e5c2f..dcc08aa 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc
@@ -45,23 +45,18 @@ public class DemoDomainEventSubscriptions {
 <3> by convention (nothing more) the `@MemberOrder#sequence()` attribute continues the same Dewey decimal sequence format (a simple string "1" could in fact have been used instead)
 
 
-while another comes from the (non-ASF) http://github.com/isisaddons/isis-module-devutils[Isis addons' devutils] module:
+while others come from services provided by Apache Isis itself, eg:
 
 [source,java]
 ----
 @DomainServiceLayout(
-    menuBar = MenuBar.SECONDARY,
-    named = "Prototyping",                    // <1>
-    menuOrder = "500.600"                     // <2>
+        named = "Prototyping",              // <1>
+        menuBar = MenuBar.SECONDARY,
+        menuOrder = "500.500"               // <2>
 )
-public class DeveloperUtilitiesServiceMenu {
-    @MemberOrder( sequence = "500.600.1" )    // <3>
-    public Clob downloadMetaModel() { ... }
-    @MemberOrder( sequence = "500.600.2" )
-    public Blob downloadLayouts() { ... }
-    @ActionLayout(named = "Rebuild Services Meta Model")
-    @MemberOrder( sequence = "500.600.3")
-    public void refreshServices() { ... }
+public class MetaModelServicesMenu {
+    @MemberOrder(sequence="500.500.1")      // <3>
+    public Clob downloadMetaModel( ... ) { ... }
     ...
 }
 ----
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
index f97bf6d..568303b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
@@ -32,7 +32,9 @@ The service's actions are intended only to be listed in the REST API exposed by
 The service and its actions are only intended to be invoked programmatically; they are a domain layer responsibility.
 
 
-The actual class name of the domain service is only rendered for the `VIEW`, `VIEW_MENU_ONLY` and `VIEW_REST_ONLY` natures.  Thus, you might also want to adopt naming conventions for your domain classes so you can infer the nature from the class.  For example, the naming convention adopted (by and large) by the (non-ASF) link:http://www.isisaddons.org[Isis Addons] is `ProgrammaticServices` or `Repository` as a suffix for `DOMAIN` services, and `Contributions` as a suffix for `VIEW_CONTRI [...]
+The actual class name of the domain service is only rendered for the `VIEW`, `VIEW_MENU_ONLY` and `VIEW_REST_ONLY` natures.
+Thus, you might also want to adopt naming conventions for your domain classes so you can infer the nature from the class.
+For example, the naming convention adopted (by and large) by the (non-ASF) link:http://platform.incode.org[Incode Platform^] is `ProgrammaticServices` or `Repository` as a suffix for `DOMAIN` services, and `Contributions` as a suffix for `VIEW_CONTRIBUTIONS_ONLY` services.
 
 For example:
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
index 2b34bd4..c994540 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
@@ -95,7 +95,8 @@ public class Customer {
 [NOTE]
 ====
 An alternative and almost equivalent design would be to publish an event using the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and implement the domain services as subscribers to
-the event.  This alternative design is used in the (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module, for example.
+the event.
+This alternative design is used in the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module, for example.
 ====
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
index 8070b24..8ec32c9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
@@ -8,15 +8,20 @@
 
 The `named()` attribute explicitly specifies the action parameter's name. This attribute can also be specified for xref:../rgant/rgant.adoc#_rgant-ActionLayout_named[actions], xref:../rgant/rgant.adoc#_rgant-CollectionLayout_named[collections], xref:../rgant/rgant.adoc#_rgant-PropertyLayout_named[properties], xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_named[domain objects], xref:../rgant/rgant.adoc#_rgant-ViewModelLayout_named[view models] and xref:../rgant/rgant.adoc#_rgant-Doma [...]
 
-Unlike most other aspects of the Apache Isis metamodel, the name of method parameters cannot (prior to Java 8, at least) be inferred from the Java source code.  Without other information, Apache Isis uses the object's type (`int`, `String` etc) as the name instead.  This can be sufficient for application-specific reference types (eg `ToDoItem`) but is generally not sufficient for primitives and other value types.
+Unlike most other aspects of the Apache Isis metamodel, the name of method parameters cannot (prior to Java 8, at least) be inferred from the Java source code.
+Without other information, Apache Isis uses the object's type (`int`, `String` etc) as the name instead.
+This can be sufficient for application-specific reference types (eg `ToDoItem`) but is generally not sufficient for primitives and other value types.
 
 The `named()` attribute (or the xref:../rgant/rgant.adoc#_rgant-aaa_deprecated[deprecated `@Named`] annotation) is therefore often required to specify the parameter name.
 
-As of Java 8, the Java reflection API has been extended.  The (non-ASF) http://github.com/isisaddons/isis-metamodel-paraname8[Isis addons' paraname8] metamodel extension provides support for this.  Note that your application must (obviously) be running on Java 8, and be compiled with the `-parameters` compile flag for javac.
+As of Java 8, the Java reflection API has been extended.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension provides support for this.
+Note that your application must (obviously) be running on Java 8, and be compiled with the `-parameters` compile flag for javac.
 
 
 
-By default the name is HTML escaped.  To allow HTML markup, set the related `namedEscaped()` attribute to `false`.
+By default the name is HTML escaped.
+To allow HTML markup, set the related `namedEscaped()` attribute to `false`.
 
 For example:
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_fileAccept.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_fileAccept.adoc
index e309616..1518d28 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_fileAccept.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_fileAccept.adoc
@@ -26,7 +26,7 @@ public class Scanner {
 <1> as per link:http://www.w3schools.com/tags/att_input_accept.asp[reference docs], either a media type (such as
 `image/*`) or a file type extension (such as `.png`).
 <2> the `@ParameterLayout(named=...)` attribute is required for Java 7; for Java 8 it can be omitted if the
-(non-ASF) http://github.com/isisaddons/isis-metamodel-paraname8[Isis addons' paraname8] metamodel extension is used.
+(non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension is used.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_maxLength.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_maxLength.adoc
index 5baa3e4..08bf48d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_maxLength.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Parameter_maxLength.adoc
@@ -24,7 +24,7 @@ public class CustomerRepository {
     }
 }
 ----
-<1> the `@ParameterLayout(named=...)` attribute is required for Java 7; for Java 8 it can be omitted if the (non-ASF) http://github.com/isisaddons/isis-metamodel-paraname8[Isis addons' paraname8] metamodel extension is used.
+<1> the `@ParameterLayout(named=...)` attribute is required for Java 7; for Java 8 it can be omitted if the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension is used.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
index 0ac5778..53b0eaa 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
@@ -23,7 +23,7 @@ This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
  (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
- ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
+ ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
index 1eb6b10..baf9c56 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
@@ -12,7 +12,7 @@ This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
  (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
- ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
+ ** and thus in the "table-of-two-halves" pattern, as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
index 62f7c3e..7b3cf1e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
@@ -788,7 +788,7 @@ If an parent object has a (scalar) reference some other object to which the user
 +
 If an object is returned in a list of choices or within an auto-complete list, and the user does not have access, then it is excluded from the rendered list.
 
-The original motivation for this feature was to transparently support such features as multi-tenancy (as per the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module).
+The original motivation for this feature was to transparently support such features as multi-tenancy (as per the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module).
 That is, if an entity is logically "owned" by a user, then the multi-tenancy support can be arranged to prevent some other user from viewing that object.
 
 By default this configuration property is enabled.  To disable the visibility filtering, set the appropriate configuration property to `false`:
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
index 17b1a8b..987c4d4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
@@ -88,7 +88,7 @@ public List<Class<?>> getModules() {
 }
 ----
 
-As can be seen, the various (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules also each provide a module class that can be easily referenced.
+As can be seen, the various (non-ASF) link:http://platform.incode.org[Incode Platform^] modules also each provide a module class that can be easily referenced.
 
 
 [[__rgcms_classes_AppManifest-bootstrapping_api_getAdditionalServices]]
@@ -97,7 +97,7 @@ As can be seen, the various (non-ASF) link:http://www.isisaddons.org[Isis Addons
 We normally we recommend that services are defined exclusively through `getModules()`, and that this method should therefore return an empty list.
 However, there are certain use cases where the a service must be explicitly specified either because the service required does not (for whatever reason) have a xref:../rgant/rgant.adoc#_rgant-DomainService[`@DomainService`] annotation.
 
-For example, the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module (v1.9.0) allows the policy to evaluate conflicting permissions to be specified by explicitly registering either the `PermissionsEvaluationServiceAllowBeatsVeto` domain service or the `PermissionsEvaluationServiceVetoBeatsAllow` domain service:
+For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module allows the policy to evaluate conflicting permissions to be specified by explicitly registering either the `PermissionsEvaluationServiceAllowBeatsVeto` domain service or the `PermissionsEvaluationServiceVetoBeatsAllow` domain service:
 
 [source,java]
 ----
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasTransactionId.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasTransactionId.adoc
index caaf3bc..c80a0b6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasTransactionId.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasTransactionId.adoc
@@ -26,11 +26,10 @@ public interface HasTransactionId {
 <1> unique identifier (a GUID) of this request/interaction.
 
 
-Modules that either have domain entity that implement and/or services that contribute this interface are:
+Modules in the (non-ASF) link:http://platform.incode.org[Incode Platform^] that either have domain entity that implement and/or services that contribute this interface are:
 
-* (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' audit] module (`AuditEntry` entity, `AuditingServiceContributions` service)
-* (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module (`CommandJdo` entity, `CommandServiceJdoContributions` service)
-* (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing] module (`PublishedEvent` entity, `PublishingServiceContributions`)
-* (non-ASF) http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module (`PublishedEvent` entity)
+* audit module: `AuditEntry` entity, `AuditingServiceContributions` service
+* command module: `CommandJdo` entity, `CommandServiceJdoContributions` service
+* publishmq module: `PublishedEvent` entity
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasUserName.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasUserName.adoc
index 293b746..66fe03d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasUserName.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_contributee_HasUserName.adoc
@@ -17,12 +17,11 @@ public interface HasUsername {
 }
 ----
 
-Modules that either have domain entity that implement and/or services that contribute this interface are:
+Modules in the (non-ASF) link:http://platform.incode.org[Incode Platform^] that either have domain entity that implement and/or services that contribute this interface are:
 
-* (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module ( `ApplicationUser` entity, `HasUsernameContributions` service)
-* (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' audit] module (`AuditEntry` entity,
-* (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module's `CommandJdo` entity, `HasUsernameContributions` service)
-* (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing] module (`PublishedEvent` entity)
-* (non-ASF) http://github.com/isisaddons/isis-module-sessionlogger[Isis addons' sessionlogger] module (`SessionLogEntry` entity, `HasUsernameContributions` service)
-* (non-ASF) http://github.com/isisaddons/isis-module-settings[Isis addons' settings] module (`UserSettingJdo` entity)
+* security module: `ApplicationUser` entity, `HasUsernameContributions` service
+* audit module: `AuditEntry` entity
+* command module: `CommandJdo` entity, `HasUsernameContributions` service
+* sessionlogger module: `SessionLogEntry` entity, `HasUsernameContributions` service
+* settings module: `UserSettingJdo` entity
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractSubscriber.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractSubscriber.adoc
index f5475a7..303ecaf 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractSubscriber.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_AbstractSubscriber.adoc
@@ -6,12 +6,10 @@
 
 
 This is a convenience superclass for creating subscriber domain services on the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`].
-It uses xref:../rgant/rgant.adoc#_rgant-PostConstruct[`@PostConstruct`] and xref:../rgant/rgant.adoc#_rgant-PreDestroy[`@PreDestroy`] callbacks to automatically register/unregister itself
-with the `EventBusService`.
+It uses xref:../rgant/rgant.adoc#_rgant-PostConstruct[`@PostConstruct`] and xref:../rgant/rgant.adoc#_rgant-PreDestroy[`@PreDestroy`] callbacks to automatically register/unregister itself with the `EventBusService`.
 
-It's important that subscribers register before any domain services that might emit events on the
-xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`].
-For example, the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module provides a domain service that automatically seeds certain domain entities; these will generate xref:../rgcms/rgcms.adoc#_rgcms_classes_lifecycleevent[lifecycle events] and so any subscribers must be registered before such seed services.
+It's important that subscribers register before any domain services that might emit events on the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`].
+For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^] security module provides a domain service that automatically seeds certain domain entities; these will generate xref:../rgcms/rgcms.adoc#_rgcms_classes_lifecycleevent[lifecycle events] and so any subscribers must be registered before such seed services.
 The easiest way to do this is to use the xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] attribute.
 
 As a convenience, the `AbstractSubscriber` specifies this attribute.
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_schema.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_schema.adoc
index 831dd26..359ce8f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_schema.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_schema.adoc
@@ -23,10 +23,8 @@ either "cmd" or "ixn"), which allows action invocations to be captured and reifi
 These each use XSD types defined by the xref:../rgcms/rgcms.adoc#_rgcms_schema-common[common schema] (most notably the `oidDto`
 complex type which identifies a domain object).
 
-The (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] and
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] modules uses these schemas to reify
-corresponding applib objects (`Command`, `Interaction.Execution` and `PublishedObjects`), either to persist or
-publishing using an link:http://activemq.apache.org[Apache ActiveMQ] message queue.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command and publishmq modules use these schemas to reify
+corresponding applib objects (`Command`, `Interaction.Execution` and `PublishedObjects`), either to persist or publishing using an link:http://activemq.apache.org[Apache ActiveMQ] message queue.
 
 The sections below discuss these schemas in more detail.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_application-layer.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_application-layer.adoc
index 7d2b719..699f9a8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_application-layer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_application-layer.adoc
@@ -8,9 +8,8 @@
 
 These domain services are internal to the framework, controlling various aspects of the application layer.
 
-The table below summarizes the application layer internal SPIs defined by Apache Isis.  It also lists their
-corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the
-(non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the application layer internal SPIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer.adoc
index 959e852..63a6be5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer.adoc
@@ -9,9 +9,8 @@
 These domain services are internal to the framework, controlling various aspects of the persistence layer.
 
 
-The table below summarizes the persistence layer internal SPIs defined by Apache Isis.  It also lists their
-corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the
-(non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the persistence layer internal SPIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer.adoc
index cfe6da2..f0a4b34 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer.adoc
@@ -10,9 +10,8 @@ These domain services are internal to the framework, controlling various aspects
 
 
 
-The table below summarizes the presentation layer internal SPIs defined by Apache Isis.  It also lists their
-corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the
-(non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the presentation layer internal SPIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api.adoc
index 2e67116..819c98b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api.adoc
@@ -9,7 +9,8 @@
 Domain service APIs for the application layer allow the domain objects to control aspects of the application layer, such as sending info messages back to the end-user.
 
 
-The table below summarizes the application layer APIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the application layer APIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 .Application Layer API
 [cols="2,4a,1,1", options="header"]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService.adoc
index 1f71b37..9382728 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService.adoc
@@ -80,9 +80,12 @@ For the end-user, executing an action that delegates work off to the `Background
 
 One option is for the background jobs to take responsibility to notify the user themselves. In the above example, this would be the `submitInvoice()` method called upon each customer. One could imagine more complex designs where only the final command executed notifies the user.
 
-However, an alternative is to rely on the fact that the `BackgroundService` will automatically hint that the `Command` representing the original interaction (to `submitCustomerInvoices()` in the example above) should be persisted. This will be available if the related xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`] and xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] domain services are configured, and the `Comm [...]
+However, an alternative is to rely on the fact that the `BackgroundService` will automatically hint that the `Command` representing the original interaction (to `submitCustomerInvoices()` in the example above) should be persisted.
+This will be available if the related xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`] and xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] domain services are configured, and the `CommandService` supports persistent commands.
+Note that (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module does indeed provide such an implementation of `CommandService` (as well as of the required `BackgroundCommandService`).
 
-Thus, the original action can run a query to obtain it corresponding `Command`, and return this to the user. The upshot is that the child ``Command``s created by the `BackgroundService` will then be associated with `Command` for the original action.
+Thus, the original action can run a query to obtain it corresponding `Command`, and return this to the user.
+The upshot is that the child ``Command``s created by the `BackgroundService` will then be associated with `Command` for the original action.
 
 We could if we wanted write the above example as follows:
 
@@ -123,10 +126,10 @@ This service is closely related to the xref:../rgsvc/rgsvc.adoc#_rgsvc_applicati
 
 The `CommandContext` service is responsible for providing a parent `Command` with which the background ``Command``s can then be associated as children, while the `CommandService` is responsible for persisting those parent `Command`s. The latter is analogous to the way in which the `BackgroundCommandService` persists the child background `Command`s.
 
-The implementations of `CommandService` and `BackgroundCommandService` go together; typically both parent `Command`s and child background `Command`s will be persisted in the same way. The (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module provides implementations of both (see xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] and xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`Backgro [...]
+The implementations of `CommandService` and `BackgroundCommandService` go together; typically both parent `Command`s and child background `Command`s will be persisted in the same way. The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module provides implementations of both (see xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] and xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandS [...]
 
-The xref:../rgfis/rgfis.adoc#_rgfis_application-layer_CommandDtoServiceInternal[`CommandDtoServiceInternal`] is used to obtain
-a memento of the command such that it can be persisted.  (In earlier versions, xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_MementoService[`MementoService`] was used for this purpose).
+The xref:../rgfis/rgfis.adoc#_rgfis_application-layer_CommandDtoServiceInternal[`CommandDtoServiceInternal`] is used to obtain a memento of the command such that it can be persisted.
+(In earlier versions, xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_MementoService[`MementoService`] was used for this purpose).
 
 
 include::_rgsvc_application-layer-api_BackgroundService_BackgroundCommandExecution.adoc[leveloffset=+1]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService_Quartz.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService_Quartz.adoc
index e7e99bf..6ec749f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService_Quartz.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_BackgroundService_Quartz.adoc
@@ -8,7 +8,8 @@
 
 The last part of the puzzle is to actually run the (appropriate implementation of) `BackgroundCommandExecution).  This could be run in a batch job overnight, or run continually by, say, the http://quartz-scheduler.org[Quartz] scheduler or by http://camel.apache.org]Apache Camel].  This section looks at configuring Quartz.
 
-If using (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module, then note that this already provides a suitable concrete implementation, namely `org.isisaddons.module.command.dom.BackgroundCommandExecutionFromBackgroundCommandServiceJdo`.  We therefore just need to schedule this to run as a Quartz job.
+If using (non-ASF) link:http://platform.incode.org[Incode Platform^]'scommand module, then note that this already provides a suitable concrete implementation, namely `org.isisaddons.module.command.dom.BackgroundCommandExecutionFromBackgroundCommandServiceJdo`.
+We therefore just need to schedule this to run as a Quartz job.
 
 
 First, we need to define a Quartz job, for example:
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc
index 9ea4b53..74f2c59 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_CommandContext.adoc
@@ -9,12 +9,9 @@
 The `CommandContext` service is a xref:../rgant/rgant.adoc#_rgant-RequestScoped[request-scoped] service that reifies the invocation of an action on a domain object into an object itself. This reified information is encapsulated within the `Command` object.
 
 By default, the `Command` is held in-memory only; once the action invocation has completed, the `Command` object is gone. The optional
- supporting xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] enables the implementation of `Command` to be pluggable. With an appropriate implementation (eg as provided by the (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module's xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`]) the `Command` may then be persisted.
+ supporting xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] enables the implementation of `Command` to be pluggable. With an appropriate implementation (eg as provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module's xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`]) the `Command` may then be persisted.
 
-As of `1.13.0`, the primary use case for persistent ``Command``s is in support of background commands; they
-act as a parent to any background commands that can be persisted either explicitly using the
-xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_BackgroundService[`BackgroundService`], or implicitly by way of the
-xref:../rgant/rgant.adoc#_rgant-Action_command[`@Action#command()`] annotation.
+As of `1.13.0`, the primary use case for persistent ``Command``s is in support of background commands; they act as a parent to any background commands that can be persisted either explicitly using the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_BackgroundService[`BackgroundService`], or implicitly by way of the xref:../rgant/rgant.adoc#_rgant-Action_command[`@Action#command()`] annotation.
 
 In previous versions of the framework, persistent ``Command``s also supported a number of other use cases:
 
@@ -23,8 +20,7 @@ In previous versions of the framework, persistent ``Command``s also supported a
 * if a xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuderService[`AuditerService`] or xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditService[`AuditingService`] (the latter now deprecated) is configured, they provide better audit information, since the `Command` (the 'cause' of an action) can be correlated to the audit records (the "effect" of the action) through the `transactionId` GUID
 
 As of `1.13.0`, these other uses cases are now more fully supported through the
-xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] service and persistent implementations of the ``Interaction`` object, eg as provided by the (non-ASF)
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module.
+xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] service and persistent implementations of the ``Interaction`` object, eg as provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module.
 
 
 
@@ -151,7 +147,7 @@ public class ToDoItem ... {
 
 When a background command is invoked, the user is returned the command object itself (to provide a handle to the command being invoked).
 
-This requires that an implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] that persists the commands (such as the (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module's `CommandService`) is configured. It also requires that a scheduler is configured to execute the background commands, see xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`]).
+This requires that an implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] that persists the commands (such as the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module's `CommandService`) is configured. It also requires that a scheduler is configured to execute the background commands, see xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`]).
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc
index 23d704c..55af30a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-api_InteractionContext.adoc
@@ -19,8 +19,7 @@ xref:../rgant/rgant.adoc#_rgant-Action_invokeOn[`@Action#invokeOn()`]), then thi
 per selected object (not one `Interaction` with multiple top-level ``Execution``s).
 
 
-It is possible for ``Interaction.Execution``s to be persisted; this is supported by the (non-ASF)
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module, for example.  Persistent
+It is possible for ``Interaction.Execution``s to be persisted; this is supported by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module, for example.  Persistent
 ``Interaction``s support several use cases:
 
 * they enable profiling of the running application (which actions are invoked then most often, what is their response
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi.adoc
index 54a5fdf..691a01f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi.adoc
@@ -8,7 +8,8 @@
 Domain service SPIs influence how the framework handles application layer concerns, for example which home page to render to the end-user.
 
 
-The table below summarizes the application layer SPIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the application layer SPIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 .Application Layer SPI
 [cols="2,4a,1,1", options="header"]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_BackgroundCommandService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_BackgroundCommandService.adoc
index 16102d3..83678b7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_BackgroundCommandService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_BackgroundCommandService.adoc
@@ -75,7 +75,8 @@ The developer is required to implement this hook method in a subclass.
 
 == Implementation
 
-The (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module provides an implementation (`org.isisaddons.module.command.dom.BackgroundCommandServiceJdo`) that persists ``Command``s using the JDO/DataNucleus object store.  It further provides a number of supporting services:
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module provides an implementation (`org.isisaddons.module.command.dom.BackgroundCommandServiceJdo`) that persists ``Command``s using the JDO/DataNucleus object store.
+It further provides a number of supporting services:
 
 * `org.isisaddons.module.command.dom.BackgroundCommandServiceJdoRepository` is a repository to search for persisted background ``Command``s
 
@@ -104,17 +105,14 @@ The imperative approach involves explicitly calling the xref:../rgsvc/rgsvc.adoc
 
 == Registering the Services
 
-The (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module provides an implementation
-of this service (`BackgroundCommandService`), and also provides a number of related domain services
-(`BackgroundCommandServiceJdo`, `BackgroundCommandJdoRepository` and `BackgroundCommandServiceJdoContributions`).  This
-module also provides service implementations of the
-xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`].
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module provides an implementation
+of this service (`BackgroundCommandService`), and also provides a number of related domain services (`BackgroundCommandServiceJdo`, `BackgroundCommandJdoRepository` and `BackgroundCommandServiceJdoContributions`).
+This module also provides service implementations of the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`].
 
 Assuming that an `AppManifest` is being used to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app])
 then this can be activated by updating the `pom.xml` and updating the `AppManifest#getModules()` method.
 
-If contributions are not required in the UI, these can be suppressed either using security or by implementing a
-xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
+If contributions are not required in the UI, these can be suppressed either using security or by implementing a xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
 
 
 
@@ -126,7 +124,7 @@ As discussed above, this service supports the xref:../rgsvc/rgsvc.adoc#_rgsvc_ap
 
 There is also a tie-up with the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`] and its supporting xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] domain service. The `CommandContext` service is responsible for providing a parent `Command` with which the background `Command`s can then be associated as children, while the `CommandService` is responsible for persisting those parent `Command`s (analogous to the wa [...]
 
-What that means is that the implementations of `CommandService` and `BackgroundCommandService` go together, hence both implemented in the (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module.).
+What that means is that the implementations of `CommandService` and `BackgroundCommandService` go together, hence both implemented in the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s  command module.).
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc
index a822fa3..57920ea 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_application-layer-spi_CommandService.adoc
@@ -28,8 +28,7 @@ the action) through the `transactionId` GUID
 
 As of `1.13.0`, these other uses cases are now more fully supported through the
 xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] service and persistent implementations of the
-``Interaction`` object, eg as provided by the (non-ASF)
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module.
+``Interaction`` object, eg as provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module.
 
 
 
@@ -74,7 +73,7 @@ The framework will automatically have set the `completedAt` property of the `Com
 
 == Implementation
 
-The (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module provides an implementation (`org.isisaddons.module.command.dom.CommandServiceJdo`) that persists ``Command``s using the JDO/DataNucleus object store.  It further provides a number of supporting services:
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module provides an implementation (`org.isisaddons.module.command.dom.CommandServiceJdo`) that persists ``Command``s using the JDO/DataNucleus object store.  It further provides a number of supporting services:
 
 * `org.isisaddons.module.command.dom.CommandServiceJdoRepository` is a repository to search for persisted ``Command``s
 
@@ -91,10 +90,8 @@ The typical way to indicate that an action should be reified into a `Command` is
 
 == Registering the Services
 
-The (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module provides an implementation
-of this service (`CommandService`), and also provides a number of related domain services
-(`CommandJdoRepository` and `CommandServiceJdoContributions`).  This
-module also provides service implementations of the
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module provides an implementation of this service (`CommandService`), and also provides a number of related domain services (`CommandJdoRepository` and `CommandServiceJdoContributions`).
+This module also provides service implementations of the
 xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`BackgroundCommandService`].
 
 Assuming that an `AppManifest` is being used to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app])
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi.adoc
index ffe748d..ab8b920 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_bootstrapping-spi.adoc
@@ -8,7 +8,8 @@
 Bootstrapping SPIs influence how the framework locates the components that make up the running application.
 
 
-The table below summarizes the bootstrapping SPI defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the bootstrapping SPI defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 .Bootstrapping SPI
 [cols="2,4a,1,1", options="header"]
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api.adoc
index b353cf2..374d593 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api.adoc
@@ -8,7 +8,8 @@
 The core/domain APIs provide general-purpose services to the domain objects, for example obtaining the current time or user, or instantiating domain objects.
 
 
-The table below summarizes the core/domain APIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the core/domain APIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Core/Domain Layer API
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc
index a6244df..82c0fd2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_EventBusService.adoc
@@ -76,10 +76,8 @@ public class MySubscribingDomainService {
 ----
 <1> subscribers are typically not visible in the UI, so specify a `DOMAIN` nature
 <2> It's important that subscribers register before any domain services that might emit events on the event bus service.
-For example, the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module provides a
-domain service that automatically seeds certain domain entities; these will generate
-xref:../rgcms/rgcms.adoc#_rgcms_classes_lifecycleevent[lifecycle events] and so any subscribers must be registered before such seed
-services.  The easiest way to do this is to use the xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] attribute.
+For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module provides a domain service that automatically seeds certain domain entities; these will generate xref:../rgcms/rgcms.adoc#_rgcms_classes_lifecycleevent[lifecycle events] and so any subscribers must be registered before such seed services.
+The easiest way to do this is to use the xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] attribute.
 <3> register with the event bus service during xref:../rgant/rgant.adoc#_rgant-PostConstruct[`@PostConstruct`]
     initialization
 <4> corresponding deregister when shutting down
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc
index b0e0ef1..a53aa09 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api.adoc
@@ -8,7 +8,8 @@
 The integration APIs provide functionality to the domain objects to integrate with other bounded contexts, for example sending an email or serializing an object out to XML.
 
 
-The table below summarizes the integration APIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the integration APIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Integration API
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
index b441536..e4f288c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
@@ -22,14 +22,12 @@ For example, a `Bookmark` could be converted into a barcode, and then this used
 ====
 
 ``Bookmark``s are used by several other domain services as a means of storing areference to an arbitrary object
-(a polymorphic relationship).  For example, the (non-ASF)
-http://github.com/isisaddons/isis-module-audit[Isis addons' auditing] module's implementation of
-xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] uses bookmarks to capture the object
-that is being audited.
+(a polymorphic relationship).  For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s auditing module's implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] uses bookmarks to capture the object that is being audited.
 
 [TIP]
 ====
-One downside of using ``Bookmark``s is that there is no way for the JDO/DataNucleus objectstore to enforce any kind of referental integrity.  However, the (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module describes and supports a design pattern to address this requirement.
+One downside of using ``Bookmark``s is that there is no way for the JDO/DataNucleus objectstore to enforce any kind of referental integrity.
+However, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s poly module describes and supports a design pattern to address this requirement.
 ====
 
 
@@ -99,13 +97,9 @@ A more sophisticated implementation could look inside the passed `ev` argument a
 
 == Usage by other services
 
-Bookmarks are used by the (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module's
-implementation of  xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BackgroundCommandService[`BackgroundCommandService`], which uses a
-bookmark to capture the target object on which an action will be invoked subsequently.
+Bookmarks are used by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module's implementation of  xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BackgroundCommandService[`BackgroundCommandService`], which uses a bookmark to capture the target object on which an action will be invoked subsequently.
 
-Bookmarks are also used by the (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing]
-module's implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`], and by the
-(non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' auditing] module's implementation of
+Bookmarks are also used by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s auditing module's implementation of
 xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`].
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc
index a0da15a..c63386f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_intro.adoc
@@ -242,10 +242,7 @@ Likewise, the `PublishedObjects` class passed to the `PublisherService` at the e
 `PublishedObjects#getDto()` method which returns a `ChangesDto` instance.  This can be converted into XML using the
 `ChangesDtoUtils` utility class.
 
-One final point: multiple xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`] implementations are supported
-because different implementations may have different responsibilities.  For example, the (non-ASF)
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module is responsible for publishing
-messages onto an ActiveMQ event bus, for inter-system communication.  However, the SPI can also be used for profiling;
-each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that
-execution, and thus could be used for application profiling.  The framework provides a default
-`PublisherServiceLogging` implementation that logs this using SLF4J.
+One final point: multiple xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`] implementations are supported because different implementations may have different responsibilities.
+For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module is responsible for publishing messages onto an ActiveMQ event bus, for inter-system communication.
+However, the SPI can also be used for profiling; each execution within the call-graph contains metrics of the number of objects loaded or modified as a result of that execution, and thus could be used for application profiling.
+The framework provides a default `PublisherServiceLogging` implementation that logs this using SLF4J.
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc
index 60c8715..02564ef 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api.adoc
@@ -7,7 +7,8 @@
 
 The metadata APIs provide access to the framework's internal metamodel.  These are generally of use to support development-time activities, for example creating custom UIs through Swagger.
 
-The table below summarizes the metadata APIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the metadata APIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Metadata API
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc
index e82cbbc..7be0555 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc
@@ -11,8 +11,7 @@ class members (collectively: "application features") of the domain classes withi
 
 [TIP]
 ====
-This functionality was originally implemented as part of (non-ASF) link:http://www.isisaddons.org[Isis Addons] security
-module, where the string representations of the various features are used to represent permissions.
+This functionality was originally implemented as part of (non-ASF) link:http://platform.incode.org[Incode Platform^] security module, where the string representations of the various features are used to represent permissions.
 ====
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api.adoc
index 3b3eb73..d484585 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-api.adoc
@@ -9,7 +9,8 @@
 The persistence layer APIs provide domain objects with tools to manage the interactions with the persistence layer, for example adding on-the-fly caching to queries that are called many times within a loop.
 
 
-The table below summarizes the persistence layer APIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the persistence layer APIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Persistence Layer API
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc
index e23b201..3234c27 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi.adoc
@@ -9,7 +9,8 @@
 The persistence layer SPIs influence how the framework persists domain objects, for example controlling how to create an audit log of changes to domain objects.
 
 
-The table below summarizes the persistence layer SPIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the persistence layer SPIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Persistence Layer SPI
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc
index 15aedee..9daa73d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditerService.adoc
@@ -72,9 +72,8 @@ log4j.additivity.org.apache.isis.applib.services.audit.AuditerServiceLogging=fal
 ----
 
 
-The (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' Audit module] also provides an
-implementation, `org.isisaddons.module.audit.dom.AuditerServiceUsingJdo`.  This creates an audit record for each
-changed property (ie every time that `AuditerService#audit(...)` is called.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module also provides an implementation, `org.isisaddons.module.audit.dom.AuditerServiceUsingJdo`.
+This creates an audit record for each changed property (ie every time that `AuditerService#audit(...)` is called.
 
 The module also provides:
 
@@ -101,15 +100,12 @@ The typical way to indicate that an object should be audited is to annotate it w
 
 == Registering the Services
 
-The (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' audit] module provides an implementation of
-this service (`AuditerService`), and also provides a number of related domain services (`AuditingServiceMenu`,
-`AuditingServiceRepository` and `AuditingServiceContributions`).
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module provides an implementation of this service (`AuditerService`), and also provides a number of related domain services (`AuditingServiceMenu`, `AuditingServiceRepository` and `AuditingServiceContributions`).
 
 Assuming that an `AppManifest` is being used to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app])
 then this can be activated by updating the `pom.xml` and updating the `AppManifest#getModules()` method.
 
-If menu items or contributions are not required in the UI, these can be suppressed either using security or by
-implementing a xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
+If menu items or contributions are not required in the UI, these can be suppressed either using security or by implementing a xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc
index 83a0963..76f204e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_AuditingService.adoc
@@ -38,15 +38,18 @@ The framework will call this for each and every domain object property that is m
 
 == Implementation
 
-The most full-featured available implementation is the (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' Audit module].  This creates an audit records for each changed property (ie every time that `AuditingService3#audit(...)` is called.  The implementation is `org.isisaddons.module.audit.dom.AuditingService`.
+The most full-featured available implementation is the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module.  This creates an audit records for each changed property (ie every time that `AuditingService3#audit(...)` is called.
+The implementation is `org.isisaddons.module.audit.dom.AuditingService`.
 
 The module also provides:
 
 * `AuditingServiceMenu` service which provides actions to search for ``AuditEntry``s, underneath an 'Activity' menu on the secondary menu bar.
 
-* `AuditingServiceRepository` service to to search for persisted `AuditEntry``s.  None of its actions are visible in the user interface (they are all `@Programmatic`).
+* `AuditingServiceRepository` service to to search for persisted `AuditEntry``s.
+None of its actions are visible in the user interface (they are all `@Programmatic`).
 
-* `AuditingServiceContributions` which contrbutes collections to the xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins_HasTransactionId[ `HasTransactionId`] interface. This will therefore display all audit entries that occurred in a given transaction, in other words whenever a command, a published event or another audit entry is displayed.
+* `AuditingServiceContributions` which contrbutes collections to the xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins_HasTransactionId[ `HasTransactionId`] interface.
+This will therefore display all audit entries that occurred in a given transaction, in other words whenever a command, a published event or another audit entry is displayed.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_EventSerializer.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_EventSerializer.adoc
index d240862..dea6d50 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_EventSerializer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_EventSerializer.adoc
@@ -42,7 +42,7 @@ It's important to make sure that the publishing service implementation is able t
 
 == Implementation
 
-The (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing] module provides an implementation (`org.isisaddons.module.publishing.dom.eventserializer.RestfulObjectsSpecEventSerializer`) that represents the event payload using the representation defined by the link:http://restfulobjects.org[Restful Objects spec] of (transient) objects, grafting on the metadata as additional JSON nodes.
+The (obsolete) http://github.com/isisaddons-legacy/isis-module-publishing[Isis addons' publishing] module provides an implementation (`org.isisaddons.module.publishing.dom.eventserializer.RestfulObjectsSpecEventSerializer`) that represents the event payload using the representation defined by the link:http://restfulobjects.org[Restful Objects spec] of (transient) objects, grafting on the metadata as additional JSON nodes.
 
 For example, this is the JSON generated on an action invocation:
 
@@ -63,8 +63,7 @@ You could if you wish change the representation by registering your own implemen
 
 There is no default implementation of this service provided by the core Apache Isis framework.
 
-The (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing] module provides an
-implementation of this service (`RestfulObjectsSpecEventSerializer`) that serializes action invocations and published
+The (obsolete) http://github.com/isisaddons-legacy/isis-module-publishing[Isis addons' publishing] module provides an implementation of this service (`RestfulObjectsSpecEventSerializer`) that serializes action invocations and published
 objects into a format based on the Restful Objects specification.  It also (as you might imagine) provides an
 implementation of the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`].
 
@@ -75,6 +74,5 @@ then this can be activated by updating the `pom.xml` and updating the `AppManife
 
 == Related Services
 
-This service is intended (though not mandated) to be used by implementations of xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`].  The (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing] module does use it (though the (non-ASF)
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module does not).
+This service is intended (though not mandated) to be used by implementations of xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`].  The (non-ASF) http://github.com/isisaddons-legacy/isis-module-publishing[Isis addons' publishing] module does use it (though the (non-ASF) link:http://platform.incode.org[Incode Platform^] publishmq module does not).
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublisherService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublisherService.adoc
index 2b9e605..0053f18 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublisherService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublisherService.adoc
@@ -90,37 +90,29 @@ log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging
 ----
 
 
-The (non-ASF) http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module also provides an
-implementation (`o.ia.m.publishmq.dom.servicespi.PublishingServiceUsingActiveMq`).  This implementation publishes each
-member execution as an event on an link:http://activemq.apache.org[ActiveMQ] message queue.  It also persists each
-execution as a `PublishedEvent` entity, allowing the event to be republished if necessary.  The implementation also
-provides the ability to log additional `StatusMessage` entities, correlated on the transactionId, useful for diagnosing
-and monitoring the activity of subscribers of said message queues.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module also provides an implementation (`o.ia.m.publishmq.dom.servicespi.PublishingServiceUsingActiveMq`).
+This implementation publishes each member execution as an event on an link:http://activemq.apache.org[ActiveMQ] message queue.
+It also persists each execution as a `PublishedEvent` entity, allowing the event to be republished if necessary.
+The implementation also provides the ability to log additional `StatusMessage` entities, correlated on the transactionId, useful for diagnosing and monitoring the activity of subscribers of said message queues.
 
 
 == Usage
 
-To indicate that an action invocation should be published, annotate it with the
-xref:../rgant/rgant.adoc#_rgant-Action_publishing[`@Action#publishing()`] annotation.
+To indicate that an action invocation should be published, annotate it with the xref:../rgant/rgant.adoc#_rgant-Action_publishing[`@Action#publishing()`] annotation.
 
-To indicate that an property edit should be published, annotate it with the
-xref:../rgant/rgant.adoc#_rgant-Property_publishing[`@Property#publishing()`] annotation.
+To indicate that an property edit should be published, annotate it with the xref:../rgant/rgant.adoc#_rgant-Property_publishing[`@Property#publishing()`] annotation.
 
-To indicate that a changed object should be published is to annotate it with the
-xref:../rgant/rgant.adoc#_rgant-DomainObject_publishing[`@DomainObject#publishing()`] annotation.
+To indicate that a changed object should be published is to annotate it with the xref:../rgant/rgant.adoc#_rgant-DomainObject_publishing[`@DomainObject#publishing()`] annotation.
 
 
 
 == Registering the Services
 
-The (non-ASF) Isis addons' http://github.com/isisaddons/isis-module-publishmq[publishmq] module provides an
-implementation of this service. Assuming that an `AppManifest` is being used to
-xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) then this can be activated by updating
-the `pom.xml` and updating the `AppManifest#getModules()` method.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^];s publishmq module provides an implementation of this service.
+Assuming that an `AppManifest` is being used to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) then this can be activated by updating the `pom.xml` and updating the `AppManifest#getModules()` method.
 
-The module also provide services that contribute to the UI.  If contributions are not required in the UI, these can be
-suppressed either using security or by implementing a
-xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
+The module also provide services that contribute to the UI.
+If contributions are not required in the UI, these can be suppressed either using security or by implementing a xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublishingService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublishingService.adoc
index fd0d3ed..da4230d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublishingService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_PublishingService.adoc
@@ -50,17 +50,15 @@ The serialized form returned by `EventSerializer` must be in a form that the `Pu
 
 == Implementation
 
-The (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing] module provides an
-implementation (`org.isisaddons.module.publishing.dom.PublishingService`) that persists each
-event as a `PublishedEvent` entity.  This holds the serialized form of the event metadata and payload as translated
-into a string by the injected `EventSerializer`.  The module also provides its own implementation of `EventSerializer`,
+The (obsolete) http://github.com/isisaddons-legacy/isis-module-publishing[Isis addons' publishing] module provides an implementation (`org.isisaddons.module.publishing.dom.PublishingService`) that persists each event as a `PublishedEvent` entity.
+This holds the serialized form of the event metadata and payload as translated into a string by the injected `EventSerializer`.  The module also provides its own implementation of `EventSerializer`,
 namely `RestfulObjectsSpecEventSerializer`, which represents the event payload using the representation defined by the
 link:http://restfulobjects.org[Restful Objects spec] of (transient) objects, grafting on the metadata as additional
 JSON nodes.
 
-The `PublishedEvent` entity also has a `state` field taking the values either "QUEUED" or "PROCESSED".  The intention
-here is that an event bus can poll this table to grab pending events and dispatch them to downstream systems.  When
-``PublishedEvent``s are persisted initially they always take the value "QUEUED".
+The `PublishedEvent` entity also has a `state` field taking the values either "QUEUED" or "PROCESSED".
+The intention here is that an event bus can poll this table to grab pending events and dispatch them to downstream systems.
+When ``PublishedEvent``s are persisted initially they always take the value "QUEUED".
 
 The framework provides no default implementations of this service.
 
@@ -153,14 +151,11 @@ public class ToDoItemChangedPayloadFactory implements PublishingPayloadFactoryFo
 
 There is no default implementation of this service provided by the core Apache Isis framework.
 
-The (non-ASF) Isis addons' http://github.com/isisaddons/isis-module-publishing[publishing] module provides an
-implementation of this service. Assuming that an `AppManifest` is being used to
-xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) then this can be activated by updating
-the `pom.xml` and updating the `AppManifest#getModules()` method.
+The (obsolete) Isis addons' http://github.com/isisaddons-legacy/isis-module-publishing[publishing] module provides an implementation of this service.
+Assuming that an `AppManifest` is being used to xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) then this can be activated by updating the `pom.xml` and updating the `AppManifest#getModules()` method.
 
-The module also provides services that contribute to the UI.  If contributions are not required in the UI, these can be
-suppressed either using security or by implementing a
-xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
+The module also provides services that contribute to the UI.
+If contributions are not required in the UI, these can be suppressed either using security or by implementing a xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_UserRegistrationService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_UserRegistrationService.adoc
index c8c80ef..be42bcc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_UserRegistrationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_persistence-layer-spi_UserRegistrationService.adoc
@@ -60,10 +60,8 @@ This is needed so that the self-registered users are assigned automatically to y
 
 There is no default implementation of this service provided by the core Apache Isis framework.
 
-If using the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module) for
-authentication and authorization, then note that it provides an adapter class,
-`SecurityModuleAppUserRegistrationServiceAbstract`, that provides most of the implementation.  You are still required
-to implement a subclass and register.
+If using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module) for authentication and authorization, then note that it provides an adapter class, `SecurityModuleAppUserRegistrationServiceAbstract`, that provides most of the implementation.
+You are still required to implement a subclass and register.
 
 For example:
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc
index 18219ee..9edb262 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi.adoc
@@ -8,7 +8,8 @@
 
 Domain service SPIs for the presentation layer influence how the Apache Isis viewers behave.
 
-The table below summarizes the presentation layer SPIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the presentation layer SPIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Presentation Layer SPI
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc
index 2c5ea92..88481ee 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_presentation-layer-spi_SessionLoggingService.adoc
@@ -37,5 +37,5 @@ public interface SessionLoggingService {
 The framework provides an implementation, `SessionLoggingService.Stderr` that just prints out to standard error.
 This is not registered by default, but can be easily registered manually using `AppManifestAbstract.Builder#withAdditionalServices(...)`.
 
-The (non-ASF) http://github.com/isisaddons/isis-module-sessionlogger[Sessionlogger module] provides an implementation that logs each session as a JDO entity.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s sessionlogger module provides an implementation that logs each session as a JDO entity.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing.adoc
index 1a87c3e..0b27a32 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing.adoc
@@ -11,7 +11,8 @@ The testing APIs provide functionality to domain objects for use when testing or
 The testing SPIs allow the framework to provide supporting functionality for use when testing or demoing an application.
 
 
-The table below summarizes the testing APIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the testing APIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Testing API
@@ -84,7 +85,8 @@ SpecificationProvider`].
 
 
 
-The table below summarizes the testing SPIs defined by Apache Isis.  It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the in (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules.
+The table below summarizes the testing SPIs defined by Apache Isis.
+It also lists their corresponding implementation, either a default implementation provided by Apache Isis itself, or provided by one of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules.
 
 
 .Testing SPI
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_deployment_externalized-configuration.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_deployment_externalized-configuration.adoc
index 3cd2e05..71ab4ec 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_deployment_externalized-configuration.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_deployment_externalized-configuration.adoc
@@ -126,7 +126,7 @@ Further details an be found in the link:https://logging.apache.org/log4j/1.2/man
 == Spring Config
 
 Although Apache Isis does not use Spring, it's possible that your app may use other components that do use Spring.
-For example, the (non-ASF) http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module uses ActiveMQ and Camel to support publishing; both of these leverage Spring.
+For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module uses ActiveMQ and Camel to support publishing; both of these leverage Spring.
 
 There are several ways to externalized Spring config, but the mechanism described here is similar in nature to those that we use for externalizing Apache Isis' and Shiro's configuration.
 In your `web.xml`, you will probably load the Spring application context using code such as:
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_headless-access_BackgroundCommandExecution.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_headless-access_BackgroundCommandExecution.adoc
index edcecc6..5151a86 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_headless-access_BackgroundCommandExecution.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_headless-access_BackgroundCommandExecution.adoc
@@ -36,7 +36,7 @@ image::{_imagesdir}headless-access/BackgroundCommandExecution.png[width="400px",
 
 The `BackgroundCommandExecutionFromBackgroundCommandServiceJdo` is a concrete subclass of `BackgroundCommandExecution` (see the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_BackgroundService[`BackgroundCommandService`]), the intended use being for the class to be instantiated regularly (eg every 10 seconds) by a scheduler such as http://quartz-scheduler.org[Quartz]) to poll for ``Command``s to be executed, and then execute them.
 
-This implementation queries for ``Command``s persisted by the link:http://www.github.com/isisaddons/isis-module-command[Isis addons Command Module]'s  implementations of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] and xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`] using the `BackgroundCommandServiceJdoRepository`.
+This implementation queries for ``Command``s persisted by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module's  implementations of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] and xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`] using the `BackgroundCommandServiceJdoRepository`.
 
 The diagram below (link:http://yuml.me/edit/25343da1[yuml.me/25343da1]) shows the inheritance hierarchy for this class:
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_multi-tenancy.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_multi-tenancy.adoc
index 3922514..0744626 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_multi-tenancy.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_multi-tenancy.adoc
@@ -5,9 +5,10 @@
 :_imagesdir: images/
 
 
-Of the various Isis Addons, the https://github.com/isisaddons/isis-module-security[security module] has the most features. One significant feature is the ability to associate users and objects with a "tenancy".
+Of the various modules provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^], the security module has the most features.
+One significant feature is the ability to associate users and objects with a "tenancy".
 
 
-For more details, see the https://github.com/isisaddons/isis-module-security[security module] README.
+For more details, see the link:http://platform.incode.org[Incode Platform^]'s security module README.
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services.adoc
index 1331977..c4e60fc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services.adoc
@@ -12,7 +12,6 @@ This chapter surveys some of the domain services currently available.
 
 
 include::_ugfun_available-domain-services_framework-provided.adoc[leveloffset=+1]
-include::_ugfun_available-domain-services_isis-addons.adoc[leveloffset=+1]
-include::_ugfun_available-domain-services_incode-catalog.adoc[leveloffset=+1]
+include::_ugfun_available-domain-services_incode-platform.adoc[leveloffset=+1]
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc
deleted file mode 100644
index 50bc834..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc
+++ /dev/null
@@ -1,31 +0,0 @@
-[[_ugfun_available-domain-services_incode-catalog]]
-= Incode Catalog
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:_basedir: ../../
-:_imagesdir: images/
-
-
-The link:http://catalog.incode.org[Incode Catalog] website also provides a number of reusable modules, focusing on business logic for generic subdomains.
-
-This section surveys the functionality available.
-
-
-[WARNING]
-====
-Note that the Incode Catalog, although maintained by Apache Isis committers, are not part of the ASF.
-====
-
-
-
-The modules themselves fall into a number of broader groups:
-
-* modules that provide standalone domain entities (and supporting services) for a particular subdomain +
-+
-The http://github.com/incodehq/incode-module-alias[alias], http://github.com/incodehq/incode-module-classification[classification], http://github.com/incodehq/incode-module-commchannel[commchannel], http://github.com/incodehq/incode-module-communications[communications], http://github.com/incodehq/incode-module-country[country], http://github.com/incodehq/incode-module-docfragment[docfragment],
-http://github.com/incodehq/incode-module-document[document] and http://github.com/incodehq/incode-module-document[note] modules fall into this category.
-
-* modules that provide developer/testing utilities +
-+
-The http://github.com/incodehq/incode-module-fixturesupport[fixturesupport], http://github.com/incodehq/incode-module-integtestsupport[integtestsupport] and http://github.com/incodehq/incode-module-unittestsupport[unittestsupport] modules fall into this category.
-
-Each of the modules has a full README and demo application demonstrating their usage.  The sections below briefly outline the capabilities of these modules.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc
new file mode 100644
index 0000000..7dbd64e
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc
@@ -0,0 +1,30 @@
+[[_ugfun_available-domain-services_incode-platform]]
+= Incode Platform
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+:_basedir: ../../
+:_imagesdir: images/
+
+
+The (non-ASF) link:http://platform.incode.org[Incode Platform^] provides a number of reusable modules for Apache Isis, focusing either on specific technologies, technical cross-cutting concerns, or providing business logic for generic subdomains.
+Some of these modules implement SPIs defined by the framework.
+
+
+[WARNING]
+====
+Note that the Incode Platform, although maintained by Apache Isis committers, are not part of the ASF.
+====
+
+
+The modules themselves fall into a number of broader groups:
+
+* technical libraries, such as excel, word and freemarker
+
+* SPI implementations, such as security, commands, auditing and publishing
+
+* framework extensions, such as flyway, quartz and feature toggles
+
+* wicket components, such as maps, calendars and PDF viewer
+
+* business modules, such as documents, notes and communications.
+
+Each module can be used independently or combined, and the Incode Platform also provides a quickstart application to get you started quickly.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc
deleted file mode 100644
index d7906a3..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc
+++ /dev/null
@@ -1,41 +0,0 @@
-[[_ugfun_available-domain-services_isis-addons]]
-= Isis Add-ons
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:_basedir: ../../
-:_imagesdir: images/
-
-
-The link:http://www.isisaddons.org[Isis Addons] website provides a number of reusable modules for Apache Isis, focusing either on specific technologies or in technical cross-cutting concerns.
-Some of these modules implement SPIs defined by the framework.
-
-
-[WARNING]
-====
-Note that Isis Addons, although maintained by Apache Isis committers, are not part of the ASF.
-====
-
-
-
-The modules themselves fall into a number of broader groups:
-
-* modules that provide an implementations of SPI defined by Apache Isis +
-+
-where Apache Isis has hooks to use the service if defined by provides no implementations of its own. +
-+
-The http://github.com/isisaddons/isis-module-command[command], http://github.com/isisaddons/isis-module-audit[auditer], http://github.com/isisaddons/isis-module-publishmq[publisher], http://github.com/isisaddons/isis-module-security[security]  and http://github.com/isisaddons/isis-module-sessionlogger[sessionlogger] modules fall into this category.  Typically the domain objects themselves wouldn't interact with these services
-
-* modules that provide standalone domain services with their own API and implementation +
-+
-These are simply intended to be used by domain objects. +
-+
-The http://github.com/isisaddons/isis-module-docx[docx], http://github.com/isisaddons/isis-module-excel[excel], http://github.com/isisaddons/isis-module-freemarker[freemarker], http://github.com/isisaddons/isis-module-pdfbox[pdfbox], http://github.com/isisaddons/isis-module-settings[settings], http://github.com/isisaddons/isis-module-servletapi[servletapi], http://github.com/isisaddons/isis-module-stringinterpolator[stringinterpolator] and http://github.com/isisaddons/isis-module-xdocrep [...]
-
-* modules that provide standalone domain entities (and supporting services) for a particular subdomain +
-+
-The http://github.com/isisaddons/isis-module-tags[tags] module falls into this category
-
-* modules that provide developer/testing utilities +
-+
-The http://github.com/isisaddons/isis-module-fakedata[fakedata] module provides fakedata for unit- and integration testing.
-
-Each of the modules has a full README and demo application demonstrating their usage.  The sections below briefly outline the capabilities of these modules.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_events_ui-events.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_events_ui-events.adoc
index f52fbe2..54a5bae 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_events_ui-events.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_events_ui-events.adoc
@@ -17,6 +17,6 @@ If annotated with xref:../rgant/rgant.adoc#_rgant_DomainObjectLayout_titleUiEven
 This can be particularly useful for xref:../ugfun/ugfun.adoc#_ugfun_programming-model_view-models_jaxb[JAXB-style view models] which are used as DTOs and so must have no dependencies on the rest of the Apache Isis framework.
 
 It can also be more generally useful to allow one module to influence/fine-tune the title of entities provided by some other module.
-The obvious use case is when reusing library modules, eg as provided by (non-ASF) link:http://catalog.incode.org[Incode Catalog] modules.
+The obvious use case is when reusing library modules, eg as provided by (non-ASF) link:http://platform.incode.org[Incode Platform^].
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_modules.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_modules.adoc
index dfe956e..4c4783b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_modules.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_modules.adoc
@@ -8,7 +8,7 @@
 We tend to use Maven modules as a way to group related domain objects together; we can then reason about all the classes in that module as a single unit.
 By convention there will be a single top-level package corresponding to the module.
 
-For example, the (non-ASF) link:https://github.com/incodehq/incode-module-document[Document module] (part of the link:http://catalog.incode.org[Incode Catalog]) has a top-level package of `org.incode.module.document`.
+For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s document module has a top-level package of `org.incode.module.document`.
 Within the module there may be various subpackages, but its the module defines the namespace.
 
 The bootstrapping of Apache Isis also relies on module classes.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc
index b13731e..4eadae6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc
@@ -59,7 +59,7 @@ It's worth extending the xref:../ugfun/ugfun.adoc#_ugfun_core-concepts_philosoph
 .The hexagonal architecture with Isis addons
 image::{_imagesdir}core-concepts/philosophy/hexagonal-architecture-addons.png[width="700px"]
 
-The (non-ASF) link:http://www.isisaddons.org[Isis Addons] provide SPI implementations of the common cross-cutting concerns.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^] provide SPI implementations of the common cross-cutting concerns.
 They also provide a number of APIs for domain objects to invoke (not shown in the diagram).
 You can also write your own domain services as well, for example to interface with some external CMS system, say.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc
index 95a67cd..ef5660f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc
@@ -24,6 +24,6 @@ CQRS/event sourcing advocates point out -- correctly -- that this is just how th
 
 In Apache Isis every business action (and indeed, property and collection) emits domain events through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`], and can optionally also be published through the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`].
 The former are dispatched and consumed in-process and within the same transaction, and for this reason the xref:../rgcms/rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscribers] can also veto the events.
-The latter are intended for out-of-process consumption; the (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing] and http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] modules provide implementations for dispatching either through a RDBMS database table, or directly through to an link:http://camel.apache.org[ActiveMQ] message queue (eg wired up to link:http://camel.apache.org[Apache Camel] event bus).
+The latter are intended for out-of-process consumption; the (obsolete) http://github.com/isisaddons-legacy/isis-module-publishing[Isis addons' publishing] and the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq modules provide implementations for dispatching either through a RDBMS database table, or directly through to an link:http://camel.apache.org[ActiveMQ] message queue (eg wired up to link:http://camel.apache.org[Apache Camel] event bus).
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_metawidget.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_metawidget.adoc
index 5eaa883..a2e5c70 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_metawidget.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_metawidget.adoc
@@ -11,7 +11,7 @@ And like Apache Isis, MetaWidget builds its own metamodel of the domain objects
 However, there is a difference in philosophy in that MW is not a full-stack framework and does not (in their words) try to "own the UI".
 Rather they support a huge variety of UI technologies and allow the domain object to be rendered in any of them.
 
-In contrast, Apache Isis is full-stack and does generate a complete UI; we then allow you to customize or extend this UI (as per the various link:http://www.isisaddons.org[Isis Addons] (non-ASF), and we also provide a full REST API through the xref:../ugvro/ugvro.adoc#[Restful Objects viewer]
+In contrast, Apache Isis is full-stack and does generate a complete UI; we then allow you to customize or extend this UI (as per the various (non-ASF) link:http://platform.incode.org[Incode Platform^] modules), and we also provide a full REST API through the xref:../ugvro/ugvro.adoc#[Restful Objects viewer]
 
 Also, it's worth noting that MetaWidget does have an elegant pipeline architecture, with APIs to allow even its metamodel to be replaced.
 It would be feasible and probably quite straightforward to use Apache Isis' own metamodel as an implementation of the MetaWidget API.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_mvc-server-side.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_mvc-server-side.adoc
index ae4f1b6..bcbd158 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_mvc-server-side.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_mvc-server-side.adoc
@@ -17,13 +17,13 @@ The most obvious difference when developing an Apache Isis application is its de
 More sophisticated UIs can be built either by xref:../ugvw/ugvw.adoc#_ugvw_extending[extending Apache Isis' Wicket viewer] or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by xref:../ugvro/ugvro.adoc#[Isis' Restful Objects viewer].
 Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.
 
-Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent link:http://www.isisaddons.org[Isis Addons] (non-ASF) tend to work at a higher-level of abstraction.
-For example, each of these frameworks will integrate with various security mechanism, but the http://github.com/isisaddons/isis-module-security[Isis addons' security module] provides a full subdomain of users, roles, features and permissions that can be plugged into any Isis application.
-Similarly, the http://github.com/isisaddons/isis-module-command[Isis addons' command] and http://github.com/isisaddons/isis-module-audit[Isis addons' audit] modules in combination provide a support for auditing and traceability that can also be used for out of the box profiling.
+Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent link:http://platform.incode.org[Incode Platform^] modules (non-ASF) tend to work at a higher-level of abstraction.
+For example, each of these frameworks will integrate with various security mechanism, but the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module provides a full subdomain of users, roles, features and permissions that can be plugged into any Isis application.
+Similarly, the link:http://platform.incode.org[Incode Platform^]'s command and audit modules in combination provide a support for auditing and traceability that can also be used for out of the box profiling.
 Again, these addons can be plugged into any Isis app.
 
 In terms of testing support, each of these other frameworks provide mechanisms to allow the webapp to be tested from within a JUnit test harness.
 Apache Isis' support is similar.
 Where Apache Isis differs though is that it enables end-to-end testing without the need for slow and fragile Selenium tests.
 Instead, Apache Isis provides a "xref:../ugtst/ugtst.adoc#_ugtst_integ-test-support_wrapper-factory[WrapperFactory]" domain service that allows the generic UI provided to in essence be simulated.
-On a more pragmatic level, the http://github.com/isisaddons/isis-module-fakedata[Isis addons' fakedata] module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.
+On a more pragmatic level, the link:http://platform.incode.org[Incode Platform^]'s fakedata module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_deployment-options.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_deployment-options.adoc
index 42aa775..ed4046b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_deployment-options.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_deployment-options.adoc
@@ -21,7 +21,7 @@ Apache Wicket, and therefore Apache Isis in this configuration, is a stateful ar
 As a platform it is certainly capable of supporting user bases of several thousand (with perhaps one or two hundred concurrent); however it isn't an architecture that you should try to scale up to tens of thousands of concurrent users.
 
 The UI generated by the Wicket viewer is well suited to many line-of-business apps, but it's also worth knowing that (with a little knowledge of the Wicket APIs) it relatively straightforward to extend.
-As described in xref:../ugfun/ugfun.adoc#_ugfun_available-domain-services_isis-addons[Isis addons] chapter, the viewer already has integrations with https://github.com/isisaddons/isis-wicket-gmap3[google maps], https://github.com/isisaddons/isis-wicket-fullcalendar2[a full calendar] and an https://github.com/isisaddons/isis-wicket-excel[export to Excel] component.
+As described in xref:../ugfun/ugfun.adoc#_ugfun_available-domain-services_isis-addons[Isis addons] chapter, the viewer already has integrations with the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s gmap3, fullcalendar2 and excel Wicket components.
 We are also aware of integrations with SVG images (for floor maps of shopping center) and of custom widgets displaying a catalogue (text and images) of medical diseases.
 
 Deploying on Apache Isis means that the framework also manages object persistence.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_aop.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_aop.adoc
index bbe6b6a..1be9ed3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_aop.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_aop.adoc
@@ -40,9 +40,9 @@ That's a rather more interesting cross-cutting concern than boring old logging!
 Apache Isis also draws heavily on the AOP concept of interceptors.
 Whenever an object is rendered in the UI, it is filtered with respect to the user's permissions.
 That is, if a user is not authorized to either view or perhaps modify an object, then this is applied transparently by the framework.
-The link:http://github.com/isisaddons/isis-module-security[Isis addons' security] module, mentioned previously, provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module, mentioned previously, provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.
 
-Another example of interceptors are the http://github.com/isisaddons/isis-module-command[Isis addons' command] and http://github.com/isisaddons/isis-module-audit[Isis addons' audit] modules.
+Another example of interceptors are the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command and audit modules.
 The command module captures every user interaction that modifies the state of the system (the "cause" of a change) while the audit module captures every change to every object (the "effect" of a change).
 Again, this is all transparent to the user.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_naked-objects-pattern.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_naked-objects-pattern.adoc
index 11c7c99..aa4b0fc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_naked-objects-pattern.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_philosophy_naked-objects-pattern.adoc
@@ -50,7 +50,7 @@ The visible and tangible object would get very complex if it should be able to s
 In Apache Isis the responsibility of rendering an object is not the object itself, it is the framework.
 Rather, the object inspects the object and uses that to decide how to render the object.
 This is also extensible.
-In the link:http://www.isisaddons.org[Isis Addons] (non-ASF) the http://github.com/isisaddons/isis-wicket-gmap3[Isis addons' gmap3] wicket extension renders any object with latitude/longitude on a map, while http://github.com/isisaddons/isis-wicket-fullcalendar2[Isis addons' fullcalendar2 wicket extension] renders any object with date(s) on a calendar.
+In the (non-ASF) link:http://platform.incode.org[Incode Platform^] the gmap3 wicket extension renders any object with latitude/longitude on a map, while fullcalendar2 renders any object with date(s) on a calendar.
 ====
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles_lego-blocks.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles_lego-blocks.adoc
index 9e984a1..69fc638 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles_lego-blocks.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_principles_lego-blocks.adoc
@@ -10,7 +10,7 @@
 
 * Reusable building blocks +
 +
-Isis addons, catalog.incode.org
+(non-ASF) link:http://platform.incode.org[Incode Platform^]
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_actions.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_actions.adoc
index 80f657a..d6d9b49 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_actions.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_actions.adoc
@@ -51,7 +51,7 @@ The `@ParameterLayout` annotation provides a UI hint to the framework.
 
 [TIP]
 ====
-The (non-ASF) Isis addons' http://github.com/isisaddons/isis-metamodel-paraname8[paraname8] metamodel extension allows the parameter name to be used in the UI, rather than the type.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension allows the parameter name to be used in the UI, rather than the type.
 ====
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_menu.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_menu.adoc
index 0a2c397..e6ffc51 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_menu.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_domain-services_menu.adoc
@@ -75,7 +75,7 @@ A "list all" action such as this can be useful when exploring the domain with a
 [TIP]
 ====
 Annotating action parameters with xref:../rgant/rgant.adoc#_rgant_ParameterLayout_named[`@ParameterLayout#named()`] can become somewhat tiresome.
-You can avoid doing this by configuring the (non-ASF) http://github.com/isisaddons/isis-metamodel-paraname8[Isis addons' paraname8] metamodel extension.
+You can avoid doing this by configuring the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension.
 ====
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_view-models_dto_dto-consumers.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_view-models_dto_dto-consumers.adoc
index 6e766f8..541891a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_view-models_dto_dto-consumers.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_programming-model_view-models_dto_dto-consumers.adoc
@@ -22,7 +22,7 @@ This is an example of the link:https://leanpub.com/camel-design-patterns[VETRO p
 In our case we focus on the validation (to determine the nature of the inbound message, ie which action was invoked), and the enrich (callback to obtain a DTO with additional information required by the consumer).
 ====
 
-The (non-ASF) http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module provides an out-of-the-box solution of this design.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module provides an out-of-the-box solution of this design.
 It provides an implementation of the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`], but which simply publishes instances of xref:../rgcms/rgcms.adoc#_rgcms_schema-aim[`ActionInvocationMemento`] to an ActiveMQ queue.
 Camel (or similar) can then be hooked up to consume these events from this queue, and use a processor to parse the action memento to determine what has changed on the source system.
 Thereafter, a subsequent Camel processor can then call back to the source - via the xref:../ugvro/ugvro.adoc#[Restful Objects viewer] - to enrich the message with additional details using a DTO.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc
index e2a7774..7121074 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc
@@ -51,7 +51,7 @@ The table below summarizes the annotations available:
 
 [TIP]
 ====
-If you're running on Java 8, then note that it's possible to write Isis applications without using `@ParameterLayout(named=...)` annotation.  Support for this can be found in the link:http://github.com/isisaddons/isis-metamodel-paraname8[Isis addons' paraname8] metamodel extension (non-ASF).  (In the future we'll fold this into core).  See also our guidance on xref:../../migration-notes/migration-notes.adoc#_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8[upgrading to Java 8].
+If you're running on Java 8, then note that it's possible to write Isis applications without using `@ParameterLayout(named=...)` annotation.  Support for this can be found in the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension (non-ASF).  (In the future we'll fold this into core).  See also our guidance on xref:../../migration-notes/migration-notes.adoc#_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8[upgrading to Java 8].
 ====
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_db-schemas.adoc b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_db-schemas.adoc
index 51eba22..ee1cf3c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_db-schemas.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_db-schemas.adoc
@@ -7,7 +7,7 @@
 
 In the same way that Java packages act as a namespace for domain objects, it's good practice to map domain entities to their own (database) schemas.
 
-As of `1.9.0`, all the link:http://www.isisaddons.org[Isis Addons] (non-ASF) modules do this.
+As of `1.9.0`, all the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules do this.
 For example:
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_hints-and-tips_overriding-jdo-annotations.adoc b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_hints-and-tips_overriding-jdo-annotations.adoc
index 21fa6bf..ca08cf6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_hints-and-tips_overriding-jdo-annotations.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_hints-and-tips_overriding-jdo-annotations.adoc
@@ -28,7 +28,7 @@ However, using this first approach does create a maintenance effort; if the doma
 The second approach (using an `.orm` file) is therefore often more useful than the first, because the metadata provided overrides rather than replaces the annotations (and annotations not overridden continue to be honoured).
 
 A typical use case is to change the database schema for an entity.
-For example, as of `1.9.0` the various http://www.isisaddons.org[Isis addons] modules (not ASF) use schemas for each entity. For example, the `AuditEntry` entity in the http://github.com/isisaddons/isis-module-audit[audit module] is annotated as:
+For example, as of `1.9.0` the various (non-ASF) link:http://platform.incode.org[Incode Platform^] modules use schemas for each entity. For example, the `AuditEntry` entity in the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module is annotated as:
 
 [source,java]
 ----
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_api-for-applications.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_api-for-applications.adoc
index e58c861..73416c1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_api-for-applications.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_api-for-applications.adoc
@@ -44,11 +44,11 @@ If using the Wicket viewer, then note there will also be another role which is u
 
 == Servlet API
 
-On occasion you may find it necessary to reach below Isis and to the underlying servlet API.  For example, the http://github.com/isisaddons/isis-module-togglz[Isis addons' togglz] module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console.  (
+On occasion you may find it necessary to reach below Isis and to the underlying servlet API.  For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s togglz module (non-ASF) has a requirement to do this in order to expose its embedded togglz web console.  (
 
 [TIP]
 ====
-If you do need to access the servlet API and are running within the context of Wicket viewer, the http://github.com/isisaddons/isis-module-servletapi[Isis addons' servletapi] module can provide access to the `HttpServletRequest`, `HttpServletResponse` and `ServletContext`.
+If you do need to access the servlet API and are running within the context of Wicket viewer, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s servletapi module can provide access to the `HttpServletRequest`, `HttpServletResponse` and `ServletContext`.
 ====
 
 In this situation, you can still obtain some information about the user and its roles:
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_isisaddons-security-module-realm.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_isisaddons-security-module-realm.adoc
index c4c7e9a..be43d35 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_isisaddons-security-module-realm.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_isisaddons-security-module-realm.adoc
@@ -6,10 +6,10 @@
 
 
 
-The https://github.com/isisaddons/isis-module-security[Isis Addons' security module] (not ASF) provides a complete
-security subdomain for users, roles, permissions; all are persisted as domain entities.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module provides a complete security subdomain for users, roles, permissions; all are persisted as domain entities.
 
-What that means, of course, that they can also be administered through your Isis application.  Moreover, the set of permissions (to features) is derived completely from your application's metamodel; in essence the permissions are "type-safe".  
+What that means, of course, that they can also be administered through your Isis application.
+Moreover, the set of permissions (to features) is derived completely from your application's metamodel; in essence the permissions are "type-safe".
 
 
 In order to play along, the module includes a Shiro realm, which fits in as follows:
@@ -30,7 +30,8 @@ In most cases this delegate realm will be the LDAP realm, and so the architectur
 image::{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG[width="600px",link="{_imagesdir}security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG"]
 
 
-The security module has many more features than are described here, all of which are described in the module's link:https://github.com/isisaddons/isis-module-security[README].  The README also explains in detail how to configure an existing app to use this module.
+The security module has many more features than are described here, all of which are described in the module's README.
+The README also explains in detail how to configure an existing app to use this module.
 
 You can also look at the Isisaddons https://github.com/isisaddons/isis-app-todoapp[todoapp example] (not ASF), which is preconfigured to use the security module.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_jdbc-realm.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_jdbc-realm.adoc
index 362f7b4..f03deb6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_jdbc-realm.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-realm-implementations_jdbc-realm.adoc
@@ -10,7 +10,7 @@ There is nothing to stop you from using some other `Realm` implementation (or in
 
 [WARNING]
 ====
-If you are happy to use a database then we strongly recommend you use the http://github.com/isisaddons/isis-module-security[Isis addons' security] module instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Isis application.
+If you are happy to use a database then we strongly recommend you use the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Isis application.
 ====
 
 If you go down this route, then the architecture is as follows:
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
index bc87c9a..41d23b9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
@@ -60,7 +60,7 @@ The sign-in verification page to render is pluggable; see xref:../ugvw/ugvw.adoc
 
 User registration is only available if the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_UserRegistrationService[`UserRegistrationService`] is configured; this is used by the framework to actually create new instances of the user as accessed by the corresponding (Shiro) realm.
 
-Because Shiro realms are pluggable, the Apache Isis framework does not provide default implementations of this service.  However, if you are using the http://github.com/isisaddons/isis-module-security[Isis addons' security] module (non-ASF), then this module _does_ provide an implementation (that, as you might expect, creates new "user" domain entities).
+Because Shiro realms are pluggable, the Apache Isis framework does not provide default implementations of this service.  However, if you are using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module, then this module _does_ provide an implementation (that, as you might expect, creates new "user" domain entities).
 
 If you are using an LDAP realm and want to enable user-self registration then you'll need to write your own implementation of this service.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc
index 265eba5..9f1a12f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec/ugsec.adoc
@@ -64,7 +64,7 @@ The xref:../ugfun/ugfun.adoc#_ugfun_getting-started_helloworld-archetype[HelloWo
 Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups.
 Apache Isis in turn extends this with its `IsisLdapRealm`, which provides more flexibility for both group/role and role/permissions management.
 
-In addition, the (non-ASF) link:http://www.isisaddons.org[Isis Addons] provides the http://github.com/isisaddons/isis-module-security[Isis addons' security] module, which also provides an implementation of the Shiro `Realm` API.
+In addition, the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules provides the security module, which also provides an implementation of the Shiro `Realm` API.
 However, the security module also represents users, roles and permissions as domain objects, allowing them to be administered through Apache Isis itself.
 Moreover, the security module can optionally delegate password management to a subsidiary (delegate) realm (usually LDAP as discussed above).
 
@@ -78,9 +78,9 @@ A further aspect of security is auditing: recording what data was modified by wh
 Apache Isis provides the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`]
 can be used to track the actions being invoked, and the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]
 captures what data was modified as a result (auditing).
-When ``Interaction``s are persisted (eg by way of (non-ASF) http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module) this provides excellent
+When ``Interaction``s are persisted (eg by way of (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module) this provides excellent
 traceability.
-The (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' audit] module provides an implementation of the `AuditerService`.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module provides an implementation of the `AuditerService`.
 
 For earlier versions of the framework the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] can be used to capture actions, while the (deprecated) xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] used to capture data modified.
 ====
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
index 2b3d793..54c795b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
@@ -55,7 +55,7 @@ public class DomainAppFixturesProvider implements FixtureScriptsSpecificationPro
 
 
 The benefit of this design - decoupling the responsibilities of the superclass and the subclass - is that it ensures that there is always an instance of `FixtureScripts` available, even if the application itself doesn't provide one.
-Some of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules (eg http://github.com/isisaddons/isis-module-security[Isis addons' security] module) expect there to be a `FixtureScripts` service for seeding data, which has caused some confusion.
+.
 
 By way of comparison, if using the older pre-`1.9.0` approach then you would create a subclass:
 
@@ -192,7 +192,7 @@ public class RecreateSimpleObjects extends FixtureScript {                   //
 ----
 <1> inherit from `org.apache.isis.applib.fixturescripts.FixtureScript`
 <2> a hard-coded list of values for the names.
-Note that the http://github.com/isisaddons/isis-module-fakedata[Isis addons' fakedata] module (non-ASF) could also have been used
+Note that the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s fakedata module could also have been used
 <3> whether the script is "discoverable"; in other words whether it should be rendered in the drop-down by the `FixtureScripts` service
 <4> input property: the number of objects to create, up to 10; for the calling test to specify, but note this is optional and has a default (see below).
 It's important that a wrapper class is used (ie `java.lang.Integer`, not `int`)
@@ -347,7 +347,7 @@ As of there are two other approaches.
 The first is to take advantage of a new `MultipleExecutionStrategy`, namely `EXECUTE_ONCE_BY_VALUE`.  Under this strategy the determination as to whether to run a given fixture script is by comparing the fixture script against all others that have run.
 If all fixture scripts implement value semantics, then they can effectively determine whether they need to run or not.
 
-This strategy was introduced in order to better support the `ExcelFixture` fixture script (provided by the (non-ASF) http://github.com/isisaddons/isis-module-excel[Isis addons' excel] module.
+This strategy was introduced in order to better support the `ExcelFixture` fixture script (provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s excel module.
 The `ExcelFixture` takes an Excel spreadsheet and loads up each row.
 For those cases where we wish to ensure that the same spreadsheet is not loaded more than once, the `IGNORE` strategy would have required that a trivial subclass of `ExcelFixture` is created for each and every spreadsheet.
 The `EXECUTE_ONCE_BY_VALUE` on the other hand delegates the determination to the value semantics of the `ExcelFixture`, which is based on the contents of the spreadsheet.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_overview.adoc b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_overview.adoc
index 48ffc64..804bf85 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_overview.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_overview.adoc
@@ -139,7 +139,7 @@ We want our tests to be easily understood, and we want the reader's eye to be dr
 
 One way to do this is to use random (or fake) values for any insignificant data.  This in effect tells the reader that "any value will do".  Moreover, if it turns out that any data won't do, and that there's some behaviour that is sensitive to the value, then the test will start to flicker, passing and then failing depending on inputs.  This is A Good Thing&#8482;.
 
-Apache Isis does not, itself, ship with a fake data library.  However, the http://github.com/isisaddons/isis-module-fakedata[Isis addons' fakedata] module (non-ASF) does provide exactly this capability.
+Apache Isis does not, itself, ship with a fake data library.  However, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s fakedata module (non-ASF) does provide exactly this capability.
 
 [TIP]
 ====
@@ -155,7 +155,7 @@ Writing automated tests is just good development practice.  Also good practice i
 
 Sometimes, though, a feature will take longer to implement than your iteration cycle.  In such a case, how do you use continuous integration to keep everyone working on the mainline without revealing a half-implemented feature on your releases?  One option is to use link:http://martinfowler.com/bliki/FeatureToggle.html[feature toggle]s.
 
-Apache Isis does not, itself, ship with a feature toggle library.  However, the http://github.com/isisaddons/isis-module-togglz[Isis addons' togglz] module (non-ASF) does provide exactly this capability.
+Apache Isis does not, itself, ship with a feature toggle library.  However, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s togglz module does provide exactly this capability.
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_unit-test-support_soap-fake-server-junit-rule.adoc b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_unit-test-support_soap-fake-server-junit-rule.adoc
index 295761c..68cb3b1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_unit-test-support_soap-fake-server-junit-rule.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_unit-test-support_soap-fake-server-junit-rule.adoc
@@ -14,7 +14,7 @@ The `SoapEndpointPublishingRule` is a simple JUnit rule that allows you to run a
 
 [TIP]
 ====
-The (non-ASF) http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module provides a full example of how to integrate and test an Apache Isis application with a (faked out) external system.
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module provides a full example of how to integrate and test an Apache Isis application with a (faked out) external system.
 ====
 
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_auto-refresh.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_auto-refresh.adoc
index 462e98d..a198654 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_auto-refresh.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_auto-refresh.adoc
@@ -7,7 +7,8 @@
 
 This requirement from the users mailing list:
 
-pass:[<div class="extended-quote-first"><p>]Suppose you want to build a monitoring application, eg for an electricity grid. Data is updated in the background (eg via the Restful Objects REST API).  What is needed is the ability to show an entity that includes a http://github.com/isisaddons/isis-wicket-gmap3[map], and have it auto-refresh every 5 seconds or so.
+pass:[<div class="extended-quote-first"><p>]Suppose you want to build a monitoring application, eg for an electricity grid. Data is updated in the background (eg via the Restful Objects REST API).
+What is needed is the ability to show an entity that includes a map, and have it auto-refresh every 5 seconds or so.
 pass:[</p></div>]
 
 Here's one (somewhat crude, but workable) way to accomplish this.
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_login-via-query-args-prototyping.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_login-via-query-args-prototyping.adoc
index ad055ad..bd8df8c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_login-via-query-args-prototyping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_login-via-query-args-prototyping.adoc
@@ -46,4 +46,4 @@ public WebRequest newWebRequest(HttpServletRequest servletRequest, String filter
 }
 ----
 
-Rather than using the static `DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS`, you might also explore using the feature toggle library provided by the (non-ASF) http://github.com/isisaddons/isis-module-togglz[Isis addons' togglz] module.
\ No newline at end of file
+Rather than using the static `DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS`, you might also explore using the feature toggle library provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s togglz module.
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
index c2d5bad..d7a593f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
@@ -6,7 +6,8 @@
 
 
 
-Replacing elements of the page is the most powerful general-purpose way to customize the look-n-feel of the viewer.  Examples at the (non-ASF) http://www.isisaddons.org[Isis Add-ons] include the http://github.com/isisaddons/isis-wicket-gmap3[gmap3] extension, the http://github.com/isisaddons/isis-wicket-fullcalendar2[calendar] extension, the http://github.com/isisaddons/isis-wicket-excel[excel download] and the http://github.com/isisaddons/isis-wicket-wickedcharts[wickedcharts] charting  [...]
+Replacing elements of the page is the most powerful general-purpose way to customize the look-n-feel of the viewer.
+Examples in the (non-ASF) link:http://platform.incode.org[Incode Platform^] include the gmap3, fullcalendar2, excel, pdfjs and wickedcharts components.
 
 The pages generated by Apache Isis' Wicket viewer are built up of numerous elements, from fine-grained widgets for property/parameter fields, to much larger components that take responsibility for rendering an entire entity, or a collection of entities. Under the covers these are all implementations of the the Apache Wicket `Component` API. The larger components delegate to the smaller, of course.
 
@@ -125,12 +126,13 @@ As explained above, in most cases Apache Isis' Wicket viewer will search for the
 
 For example, out-of-the-box Apache Isis provides a table view, a summary view (totals/sums/averages of any data), and a collapsed view (for `@Render(LAZILY)` collections). These are selected by clicking on the toolbar by each collection.
 
-Additional views though could render the objects in the collection as a variety of ways. Indeed, some third-party implementations already exist:
+Additional views though could render the objects in the collection as a variety of ways. Indeed, some third-party implementations in the (non-ASF) link:http://platform.incode.org[Incode Platform^] already exist, including:
 
-* https://github.com/isisaddons/isis-wicket-excel[excel integration] (collection as a downloadable excel spreadsheet)
-* https://github.com/isisaddons/isis-wicket-gmap3[google maps v3 integration] (render any objects with a location on a map)
-* https://github.com/isisaddons/isis-wicket-wickedcharts[wicked charts integration] (barchart of any data)
-* https://github.com/isisaddons/isis-wicket-fullcalendar2[full calendar integration] (render any objects with date properties on a calendar)
+* excel component - collection as a downloadable excel spreadsheet
+* gmap3 component - render any objects with a location on a map
+* pdf.js component - render Blob containined PDF as a scrollable image
+* wicked charts component - barchart of any data
+* full calendar - render any objects with date properties on a calendar
 
 Registering these custom views is just a matter of adding the appropriate Maven module to the classpath. Apache Isis uses the JDK `ServiceLoader` API to automatically discover and register the `ComponentFactory` of each such component.
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
index 673375b..37f6238 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
@@ -21,7 +21,7 @@ To support this the framework requires three services to be registered and confi
 * the xref:../rgsvc/rgsvc.adoc#_rgsvc_presentation-layer-spi_EmailNotificationService[email notification service], which provides an API for to send the verification emails
 * the xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_EmailService[email service], that is used by the email notification service to actually send the email.
 
-The Apache Isis core framework provides a default implementation of both the email notification service and the email service. If your application uses the https://github.com/isisaddons/isis-module-security[Isis addons security module] (not ASF) then an implementation is provided by that module; just add to the classpath. Otherwise you will need to provide your own implementation.
+The Apache Isis core framework provides a default implementation of both the email notification service and the email service. If your application uses the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module then an implementation is provided by that module; just add to the classpath. Otherwise you will need to provide your own implementation.
 
 [NOTE]
 ====
@@ -68,7 +68,7 @@ image::{_imagesdir}user-registration/sign-up-after-registration.png[width="800px
 
 There are two prerequisites:
 
-* register an implementation of the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_UserRegistrationService[user registration service] (eg by using the https://github.com/isisaddons/isis-module-security[Isis addons security module])
+* register an implementation of the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_UserRegistrationService[user registration service] (eg by using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module)
 
 * configure the xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_EmailService[email service]
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_incode-platform.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_incode-platform.adoc
new file mode 100644
index 0000000..d8c8257
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_incode-platform.adoc
@@ -0,0 +1,37 @@
+[[_ugvw_incode-platform]]
+= Appendix: Incode Platform (not ASF)
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+:_basedir: ../../
+:_imagesdir: images/
+
+
+The (non-ASF) link:http://platform.incode.org[Incode Platform^] provides a number of extensions to the Wicket viewer (leveraging the APIs described in xref:../ugvw/ugvw.adoc#_ugvw_extending[Extending the Wicket viewer] section, later.
+While you are free to fork and adapt any of them to your needs, they are also intended for use "out-of-the-box".
+
+At the time of writing the addons available are:
+
+* Excel Wicket component - to export a collection of domain objects as an Excel spreadsheet
+
+** see also the related Excel library module which can be used to read/import a spreadsheet as an collection of view models or entities
+
+* ullcalendar2 Wicket component - to view a collection of domain objects (with a date) on a full-page calendar
+
+* Gmap3 Wicket component - to view a collection of domain objects with a location on a google map
+
+* pdf.js Wicket component - to view a `Blob` containing a PDF as an image
+
+* Summernote Wicket component - to edit a string property using an RTF editor
+
+** (not yet compatible with `1.15.0`)
+
+* Wickedcharts Wicket component - low-level integration with Highcharts charting library
+
+
+Check the link:http://platform.incode.org[website^] for the most up-to-date list.
+
+
+[NOTE]
+====
+Note that the Incode Platform, while maintained by Apache Isis committers, are not part of the ASF.
+====
+
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc
deleted file mode 100644
index dc69d6c..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc
+++ /dev/null
@@ -1,36 +0,0 @@
-[[_ugvw_isis-addons]]
-= Appendix: Isis Add-ons (not ASF)
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:_basedir: ../../
-:_imagesdir: images/
-
-
-The (non-ASF) link:http://www.isisaddons.org[Isis Addons] website provides a number of extensions to the Wicket viewer (leveraging the APIs described in xref:../ugvw/ugvw.adoc#_ugvw_extending[Extending the Wicket viewer] section, later.  While you are free to fork and adapt any of them to your needs, they are also intended for use "out-of-the-box".
-
-At the time of writing the addons available are:
-
-* link:http://github.com/isisaddons/isis-wicket-excel[Excel] component - to export a collection of domain objects as an Excel spreadsheet
-
-** see also the related link:http://github.com/isisaddons/isis-module-excel[Excel module] which can be used to read/import a spreadsheet as an collection of view models or entities
-
-* link:http://github.com/isisaddons/isis-wicket-fullcalendar2[Fullcalendar2] component - to view a collection of domain objects (with a date) on a full-page calendar
-
-* link:http://github.com/isisaddons/isis-wicket-gmap3[Gmap3] component - to view a collection of domain objects with a location on a google map
-
-* link:http://github.com/isisaddons/isis-wicket-pdfjs[pdf.js] component - to view a Blob containing a PDF as an image
-
-* link:http://github.com/isisaddons/isis-wicket-summernote[summernote] component - to edit a string property using an RTF editor
-
-** (not yet compatible with `1.15.0`)
-
-* link:http://github.com/isisaddons/isis-wicket-wickedcharts[wickedcharts] component - low-level integration with Highcharts charting library
-
-
-Check the link:http://www.isisaddons.org[Isis Addons] website for the most up-to-date list.
-
-
-[NOTE]
-====
-Note that Isis addons, while maintained by Apache Isis committers, are not part of the ASF.
-====
-
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
index 4445ae6..02a83e5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
@@ -147,25 +147,19 @@ Because the number of items on the tertiary menu is expected to be small and mos
 viewer does _not_ place dividers between actions from different services on the tertiary menu.
 
 
-== Isis Add-on modules
+== Incode Platform modules
 
-Some of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules also provide services whose actions appear in top-level menus.
+Some of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules also provide services whose actions appear in top-level menus.
 
-The http://github.com/isisaddons/isis-module-security[security]'s module places its domain service menus in three
+The security's module places its domain service menus in three
 top-level menus:
 
 * its `ApplicationUsers`, `ApplicationRoles`, `ApplicationPermission`, `ApplicationFeatureViewModels` and
  `ApplicationTenancies` domain services are all grouped together in a single "Security" top-level menu, on the
  SECONDARY menu bar
 
-* its `SecurityModuleAppFixturesService` domain service, which allows the security modules' fixture scripts to be run,
- is placed on a "Prototyping" top-level menu, also on the SECONDARY menu bar
-
 * its `MeService` domain service, which provides the `me()` action, is placed on the TERTIARY menu bar.
 
-Meanwhile the http://github.com/isisaddons/isis-module-devutils[devutils] module places its actions - to download layouts and
-so forth - on a "Prototyping" top-level menu, on the SECONDARY menu bar.
-
 Currently there is no facility to alter the placement of these services. However, their UI can be suppressed
 using security or using a xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_vetoing-visibility[vetoing subscriber].
 
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/ugvw.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/ugvw.adoc
index 5d24d80..a39199f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/ugvw.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/ugvw.adoc
@@ -17,7 +17,7 @@ implemented using link:http://wicket.apache.org[Apache Wicket].
 
 This user guide discuss end-user features, configuration and customization of the Wicket viewer.
 
-It also discusses how to extend the viewer, and the (non-ASF) link:http://www.isisaddons.org[Isis Addons] wicket components.
+It also discusses how to extend the viewer, and the (non-ASF) link:http://platform.incode.org[Incode Platform^] wicket components.
 
 === Other Guides
 
@@ -57,5 +57,5 @@ include::_ugvw_customisation.adoc[leveloffset=+1]
 include::_ugvw_extending.adoc[leveloffset=+1]
 include::_ugvw_hints-and-tips.adoc[leveloffset=+1]
 
-include::_ugvw_isis-addons.adoc[leveloffset=+1]
+include::_ugvw_incode-platform.adoc[leveloffset=+1]
 
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.12.0-to-1.13.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.12.0-to-1.13.0.adoc
index 2e85e7d..75b32af 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.12.0-to-1.13.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.12.0-to-1.13.0.adoc
@@ -48,8 +48,7 @@ The xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService
 by the xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`].
 
 There can be more than one implementation of this new SPI, and a framework-provided implementation
-(`AuditerServiceLogging`) will log to a file.  The (non-ASF)
-http://github.com/isisaddons/isis-module-audit[Isis addons' audit] module also implements the new SPI.
+(`AuditerServiceLogging`) will log to a file.  The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s audit module also implements the new SPI.
 
 
 == Publishing
@@ -59,8 +58,7 @@ xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_EventSerializer[`Ev
 replaced by the xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].
 
 There can be more than one implementation of this new SPI, and a framework-provided implementation
-(`PublisherServiceLogging`) will log to a file.  The (non-ASF)
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module also implements the new SPI.
+(`PublisherServiceLogging`) will log to a file.  The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module also implements the new SPI.
 
 The new service also supports the notion of published property edits; the new
 xref:../guides/rgant/rgant.adoc#_rgant_Property_publishing[`@Property#publishing()`] annotation attribute can be used to specify.  The `
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
index b7e5201..5b83fff 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.14.0-to-1.15.0.adoc
@@ -154,7 +154,7 @@ The first exception encountered is then re-thrown (to preserve similar behaviour
 [[_migration-notes_1.14.0-to-1.15.0_incode-platform]]
 == (non-ASF) Incode Platform
 
-(*work in progress*) The supporting (non-ASF) link:http://isisaddons.org[Isis Addons] and link:http://catalog.incode.org[Incode Catalog] have also been reorganised into a single link:http://platform.incode.org["Incode Platform"].
+The various (non-ASF) link:http://isisaddons.org[Isis Addons] and link:http://catalog.incode.org[Incode Catalog] have also been combined into a single link:http://platform.incode.org["Incode Platform"].
 
 While each module can still be consumed individually, the new platform versions consistently (a change in any one module will result in a re-release of all).
 This should make these modules easier to consume, and easier to maintain/develop.
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.6.0-to-1.7.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.6.0-to-1.7.0.adoc
index 7ce2790..c6a5ff6 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.6.0-to-1.7.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.6.0-to-1.7.0.adoc
@@ -6,7 +6,8 @@
 
 
 
-In v1.7.0 we've continued the work started in v1.6.0 in modularizing the framework. The most important change to note is that all Apache Isis core modules (with the Maven `groupId` of `org.apache.isis.module` have now MOVED to link:http://www.isisaddons.org[Isis Addons].
+In `1.7.0` we've continued the work started in `1.6.0` in modularizing the framework. The most important change to note is that all Apache Isis core modules (with the Maven `groupId` of `org.apache.isis.module` have now MOVED to link:http://www.isisaddons.org[Isis Addons].
+
 
 In addition, we've retired some obsolete (and unused) functionality, specifically the `ProfileStore` component.
 
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
index 2f8e642..88e7a6c 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
@@ -121,8 +121,9 @@ public class MyAppAppManifest implements AppManifest {
     public Map<String, String> getConfigurationProperties() { return null; }
 }
 ----
-<1> the module classes, whose packages specify the existence of domain services and/or persistent entities.  If your app uses (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules, then include the module classes for these addons in `getModules()`.
-For example, the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module provides the `org.isisaddons.module.security.SecurityModule` class.
+<1> the module classes, whose packages specify the existence of domain services and/or persistent entities.
+If your app uses (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules, then include the module classes for these addons in `getModules()`.
+For example, the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module provides the `org.isisaddons.module.security.SecurityModule` class.
 <2> any additional services, as per `isis.services` configuration property.
 
 
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8.adoc
index 185b7f7..3db6e19 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8.adoc
@@ -40,7 +40,7 @@ under `build/pluginManagement/plugins`, add (or update) `maven-compiler-plugin`:
 
 [TIP]
 ====
-The `-parameters` argument causes the Java compiler to capture the names of method parameters in the `.class` files.  Apache Isis can be configured to use this, thereby avoiding the requirement to annotate every parameter with `@ParameterLayout(named=...)` or `@Named()`.  The necessary configuration is provided in an http://github.com/isisaddons/isis-metamodel-paraname8[Isis addons' paraname8]  metamodel extension (non-ASF).
+The `-parameters` argument causes the Java compiler to capture the names of method parameters in the `.class` files.  Apache Isis can be configured to use this, thereby avoiding the requirement to annotate every parameter with `@ParameterLayout(named=...)` or `@Named()`.  The necessary configuration is provided in the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension.
 ====
 
 We also recommend that you add the `maven-enforcer-plugin` (if not used already).  Again, this resides under `<build>/<pluginManagement>/<plugins>`:
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.9.0-to-1.10.0.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.9.0-to-1.10.0.adoc
index 5f899bf..b148315 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.9.0-to-1.10.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/_migration-notes_1.9.0-to-1.10.0.adoc
@@ -43,8 +43,7 @@ Therefore, in the parent `pom.xml` of your own domain applications, remove:
 One possible issue is that (as per link:https://issues.apache.org/jira/browse/ISIS-830[ISIS-830]) the xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] is now initialized as one of the first domain
 services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be
 posted on the event bus for subscribers.  The typical case for such lifecycle events to occur is from domain services
-that seed reference data; one such example can be found in the (non-ASF)
- http://github.com/isisaddons/isis-module-security[Isis addons' security] module.
+that seed reference data; one such example can be found in the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module.
 
 In previous releases, the ordering of initialization for the `EventBusService` was undefined (but would typically be towards the
 "end" of the list of services.  What this meant in practice is that it generally didn't matter whether (domain service)
diff --git a/adocs/documentation/src/main/asciidoc/pages/common-use-cases/common-use-cases.adoc b/adocs/documentation/src/main/asciidoc/pages/common-use-cases/common-use-cases.adoc
index 1bc7d94..4c09241 100644
--- a/adocs/documentation/src/main/asciidoc/pages/common-use-cases/common-use-cases.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/common-use-cases/common-use-cases.adoc
@@ -25,7 +25,8 @@ One of the original motivations for Apache Isis itself was to be able automatica
 
 Apache Isis' has a pluggable architecture allowing different user interface technologies.
  The principal implementation (as configured by the xref:../../guides/ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]) is the xref:../../guides/ugvw/ugvw.adoc#[Wicket viewer].
-  This provides an appealing default user interface, with the ability to customize the user interface by writing new http://wicket.apache.org[Apache Wicket] components. Some third-party components can be found in the (non-ASF) link:http://www.isisaddons.org[Isis Addons] (non-ASF) project, integrating the Wicket viewer with https://github.com/isisaddons/isis-wicket-gmap3[google maps], https://github.com/isisaddons/isis-wicket-fullcalendar2[a full calendar] and a https://github.com/isisadd [...]
+  This provides an appealing default user interface, with the ability to customize the user interface by writing new http://wicket.apache.org[Apache Wicket] components.
+Some third-party components can be found in the (non-ASF) link:http://platform.incode.org[Incode Platform^].
 
 
 Deploying on Apache Isis means that the framework also manages object persistence.
diff --git a/adocs/documentation/src/main/asciidoc/pages/isis-in-pictures/isis-in-pictures.adoc b/adocs/documentation/src/main/asciidoc/pages/isis-in-pictures/isis-in-pictures.adoc
index 62ef677..bcd3c24 100644
--- a/adocs/documentation/src/main/asciidoc/pages/isis-in-pictures/isis-in-pictures.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/isis-in-pictures/isis-in-pictures.adoc
@@ -12,8 +12,8 @@ On this page we want to show you what a modern Apache Isis application looks lik
 The screenshots below are taken from the Isis Addons' http://github.com/isisaddons/isis-app-todoapp[todoapp example] (non ASF), which you are free to fork and use as you will.
 The corresponding domain classes from which this UI was built can be found https://github.com/isisaddons/isis-app-todoapp/tree/master/dom/src/main/java/todoapp/dom/todoitem[here].
 
-The todoapp also integrates with a number of other link:http://www.isisaddons.org[Isis Addons] modules.
-Because we expect that most apps will end up using one or more of these addons, we've chosen to include screenshots of those too.
+The todoapp also integrates with a number of other modules from the (non-ASF) link:http://platform.incode.org[Incode Platform^].
+Because we expect that most apps will end up using one or more of these modules, we've chosen to include screenshots of those too.
 
 [NOTE]
 ====
@@ -28,7 +28,7 @@ Let's start with the basics...
 === Sign-in
 
 Apache Isis integrates with http://shiro.apache.org[Apache Shiro].
-The core framework supports file-based realms, while the Isis Addons http://github.com/isisaddons/isis-module-security[security module] (non ASF) provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
+The core framework supports file-based realms, while the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
 The example todoapp integrates with the security module.
 
 
@@ -134,15 +134,15 @@ For example, when a collection of objects is rendered, this is just one of sever
 image::{_imagesdir}isis-in-pictures/070-pluggable-views.png[width="800px",link="{_imagesdir}isis-in-pictures/070-pluggable-views.png"]
 
 
-The (non-ASF) link:http://www.isisaddons.org[Isis Addons] library provides a number of such extensions.
-For example, the https://github.com/isisaddons/isis-wicket-gmap3[gmap3 component] will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
+The (non-ASF) link:http://platform.incode.org[Incode Platform^] provides a number of such extensions.
+For example, the gmap3 component will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
 
 image::{_imagesdir}isis-in-pictures/080-gmap3-view.png[width="800px",link="{_imagesdir}isis-in-pictures/080-gmap3-view.png"]
 
 
 
 
-Similarly the Isis Addons' https://github.com/isisaddons/isis-wicket-fullcalendar2[fullcalendar2 component] (non ASF) will render any domain entity (such as `ToDoItem`) that implements its `Calendarable` interface:
+Similarly the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s fullcalendar2 component will render any domain entity (such as `ToDoItem`) that implements its `Calendarable` interface:
 
 image::{_imagesdir}isis-in-pictures/090-fullcalendar2-view.png[width="800px",link="{_imagesdir}isis-in-pictures/090-fullcalendar2-view.png"]
 
@@ -150,7 +150,7 @@ image::{_imagesdir}isis-in-pictures/090-fullcalendar2-view.png[width="800px",lin
 
 
 
-Yet another "view" (though this one is rather simpler) is that provided by the Isis Addons https://github.com/isisaddons/isis-wicket-excel[excel component] (non ASF).
+Yet another "view" (though this one is rather simpler) is that provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s excel Wicket component
 This provides a download button to the table as a spreadsheet:
 
 image::{_imagesdir}isis-in-pictures/100-excel-view-and-docx.png[width="800px",link="{_imagesdir}isis-in-pictures/100-excel-view-and-docx.png"]
@@ -159,7 +159,7 @@ image::{_imagesdir}isis-in-pictures/100-excel-view-and-docx.png[width="800px",li
 
 
 The screenshot above also shows an "export to Word" action.
-This is _not_ a view but instead is a (contributed) action that uses the Isis Addons https://github.com/isisaddons/isis-module-docx[docx module] (non ASF) to perform a "mail-merge":
+This is _not_ a view but instead is a (contributed) action that uses the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s docx module to perform a "mail-merge":
 
 image::{_imagesdir}isis-in-pictures/110-docx.png[width="800px",link="{_imagesdir}isis-in-pictures/110-docx.png"]
 
@@ -178,13 +178,13 @@ Please note that the Isis Addons are not part of ASF, but they _are_ all license
 
 As well as providing extensions to the UI, the (non ASF) Isis Addons provide a rich set of modules to support various cross-cutting concerns.
 
-Under the activity menu are four sets of services which provide support for https://github.com/isisaddons/isis-module-sessionlogger[user session logging/auditing] , https://github.com/isisaddons/isis-module-command[command profiling], https://github.com/isisaddons/isis-module-audit[(object change) auditing] (shown) and (inter-system) https://github.com/isisaddons/isis-module-publishmq[event publishmq]:
+Under the activity menu are four sets of services which provide support for (non-ASF) link:http://platform.incode.org[Incode Platform^]'s sessionlogger module (for user session logging/auditing) , command module (audit/profiling), audit module (audit object changes) (shown) and (inter-system) event publishing:
 
 image::{_imagesdir}isis-in-pictures/120-auditing.png[width="800px",link="{_imagesdir}isis-in-pictures/120-auditing.png"]
 
 
 
-In the security menu is access to the rich set of functionality provided by the Isis Addons https://github.com/isisaddons/isis-module-security[security module]:
+In the security menu is access to the rich set of functionality provided by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module:
 
 image::{_imagesdir}isis-in-pictures/130-security.png[width="800px",link="{_imagesdir}isis-in-pictures/130-security.png"]
 
@@ -200,7 +200,7 @@ image::{_imagesdir}isis-in-pictures/140-i18n.png[width="800px",link="{_imagesdir
 
 
 
-The Isis Addons also provides a module for managing application and user https://github.com/isisaddons/isis-module-settings[settings].
+The (non-ASF) link:http://platform.incode.org[Incode Platform^] also provides a module for managing application and user settings.
 Most apps (the todoapp example included) won't expose these services directly, but will usually wrap them in their own app-specific settings service that trivially delegates to the settings module's services:
 
 image::{_imagesdir}isis-in-pictures/150-appsettings.png[width="800px",link="{_imagesdir}isis-in-pictures/150-appsettings.png"]
@@ -210,8 +210,7 @@ image::{_imagesdir}isis-in-pictures/150-appsettings.png[width="800px",link="{_im
 
 === Multi-tenancy support
 
-Of the various Isis Addons, the https://github.com/isisaddons/isis-module-security[security module] has the most features.
-One significant feature is the ability to associate users and objects with a "tenancy".
+One significant feature of the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module is the ability to associate users and objects with a "tenancy".
 The todoapp uses this feature so that different users' list of todo items are kept separate from one another.
 A user with administrator is able to switch their own "tenancy" to the tenancy of some other user, in order to access the objects in that tenancy:
 
@@ -219,12 +218,12 @@ image::{_imagesdir}isis-in-pictures/160-switch-tenancy.png[width="800px",link="{
 
 
 
-For more details, see the https://github.com/isisaddons/isis-module-security[security module] README.
+For more details, see the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module README.
 
 
 === Me
 
-Most of the https://github.com/isisaddons/isis-module-security[security module]'s services are on the security module, which would normally be provided only to administrators.
+Most of the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module's services are on the security menu, which would normally be provided only to administrators.
 Kept separate is the "me" action:
 
 image::{_imagesdir}isis-in-pictures/170-me.png[width="800px",link="{_imagesdir}isis-in-pictures/170-me.png"]
diff --git a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_commapp.adoc b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_commapp.adoc
index 4b1e5f8..18c0a4a 100644
--- a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_commapp.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_commapp.adoc
@@ -11,35 +11,29 @@ of a business.  You can get a feel for it from this screenshot:
 
 image::{_imagesdir}powered-by/commapp/screenshot-1.png[width="900px",link="{_imagesdir}powered-by/commapp/screenshot-1.png"]
 
-which shows how the app integrates a number of the (non-ASF) link:http://www.isisaddons.org[Isis Addons]
-(http://github.com/isisaddons/isis-module-excel[excel],
-http://github.com/isisaddons/isis-module-fullcalendar2[fullcalendar2] and
-http://github.com/isisaddons/isis-module-gmap3[gmap3]).  The app also uses the
-(non-ASF) http://github.com/isisaddons/isis-module-wickedcharts[wickedcharts] module to generate various charts.
+which shows how the app integrates a number of the (non-ASF) link:http://platform.incode.org[Incode Platform^] componennts
+(excel, fullcalendar2, gmap3 and wickedcharts).
+
 
 == Why Apache Isis?
 
-When making our decision towards a software development framework, we evaluated some few like Spring Framework and
-Oracle ADF, including a newer semantic framework.  At that point we faced we needed to choose between being locked in
-to a framework using many of their proprietary classes, methods and other features, or having to write a lot of code
-even to get things as CURD operations, and we would be facing significant differences in the code if using relational
-databases or the newer so called NonSQL databases.
+When making our decision towards a software development framework, we evaluated some few like Spring Framework and Oracle ADF, including a newer semantic framework.
+At that point we faced we needed to choose between being locked in to a framework using many of their proprietary classes, methods and other features, or having to write a lot of code even to get things as CURD operations, and we would be facing significant differences in the code if using relational databases or the newer so called NonSQL databases.
 
-So we added Apache Isis to our evaluation, and we found it to be open in many aspects, including an open architecture
-and auto-generated UI viewer, as well as equally open and auto-generated REST/SOA web services, seamlessly support
-both SQL and NoSQL through an open and standard http://datanucleus.org[persistence manager], as well as open security
+So we added Apache Isis to our evaluation, and we found it to be open in many aspects, including an open architecture and auto-generated UI viewer, as well as equally open and auto-generated REST/SOA web services, seamlessly support both SQL and NoSQL through an open and standard http://datanucleus.org[persistence manager], as well as open security
 (http://shiro.apache.org[Apache Shiro], LDAP) and features such as multi-tenancy.
 
 Our main focus in the code is given to the business domain, with business logic treated as a first class citizen.
-And because our code simply uses non-proprietary Java, we've been able to extend it the normal way.  Very little code in
-our application so far can be considered to be framework-specific, the few that is only because we chose to use some
-of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] that provide our applications with high value, and which are
+And because our code simply uses non-proprietary Java, we've been able to extend it the normal way.
+Very little code in our application so far can be considered to be framework-specific, the few that is only because we chose to use some
+of the (non-ASF) link:http://platform.incode.org[Incode Platform^] modules that provide our applications with high value, and which are
 open source also.
 
 When creating our prototype and then subsequent application, we've found quite amazing support: most of the time the
 Isis team provides same day high quality support, with samples and references, which has helped us find the solution
-to our needs quickly.  The framework is growing rapidly as well, keeping its openness and business domain driven focus.
-The tutorials and documentation is quite comprehensive and very clear.  We have found all this hard to find in many
-other open source frameworks.
+to our needs quickly.
+The framework is growing rapidly as well, keeping its openness and business domain driven focus.
+The tutorials and documentation is quite comprehensive and very clear.
+We have found all this hard to find in many other open source frameworks.
 
 _Case study provided by Cesar Lugo, R&D Director_
\ No newline at end of file
diff --git a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_estatio.adoc b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_estatio.adoc
index 12de7ec..2f1eca3 100644
--- a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_estatio.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_estatio.adoc
@@ -9,30 +9,30 @@
 
 Estatio is an estate management application developed for and deployed at link:http://www.eurocommercialproperties.com/[Eurocommercial].
 
-Eurocommercial Properties is a Dutch-listed company that owns and operates over 50 shopping centres across Italy, France and Sweden, with income from property of approx. EUR150m per year.  Previously the company had used one of the leading software packages for its invoicing;
-however this had proven on the one hand lacking in key features/functionality for some locales, while
- overlapping/duplicating the features/capabilities of the general ledger system.  It had also been found to be
- extremely difficult to upgrade to new versions of the product (eg multiple regressions).
+Eurocommercial Properties is a Dutch-listed company that owns and operates over 50 shopping centres across Italy, France and Sweden, with income from property of approx. EUR150m per year.
+Previously the company had used one of the leading software packages for its invoicing; however this had proven on the one hand lacking in key features/functionality for some locales, while overlapping/duplicating the features/capabilities of the general ledger system.
+It had also been found to be extremely difficult to upgrade to new versions of the product (eg multiple regressions).
 
-The decision was made to develop a bespoke application focused just on invoicing, providing the flexibility to support
-any of the requirements that might arise in the company's operating coutries.  It would interface but not overlap in
-functionality with the existing general ledger.  It would also be able to expand its scope over time to support more
-of the company's operations (eg to support purchase and disposal of shopping centres).
+The decision was made to develop a bespoke application focused just on invoicing, providing the flexibility to support any of the requirements that might arise in the company's operating coutries.
+It would interface but not overlap in functionality with the existing general ledger.
+It would also be able to expand its scope over time to support more of the company's operations (eg to support purchase and disposal of shopping centres).
 
 The application developed, and deployed initially in Italy, is called Estatio:
 
 image::{_imagesdir}powered-by/estatio/estatio-1.png[width="900px",link="{_imagesdir}powered-by/estatio/estatio-1.png"]
 
-The development team for the original implementation consisted of just two developers (both of whom are Apache Isis committers); the first version of the application was developed over 2 years and 2 man-years effort.  Since the initial release - as the scope of the application has grown - the team has expanded to take on a further part-time developer and also some interns.
+The development team for the original implementation consisted of just two developers (both of whom are Apache Isis committers); the first version of the application was developed over 2 years and 2 man-years effort.
+Since the initial release - as the scope of the application has grown - the team has expanded to take on a further part-time developer and also some interns.
 
 
 == Supporting Open Source
 
-Much of Apache Isis' recent development has been driven out by the requirements of this application, so you can see for yourself how many of the features in Isis are used in real life.  Many of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] also originate from the requirements of Estatio.
+Much of Apache Isis' recent development has been driven out by the requirements of this application, so you can see for yourself how many of the features in Isis are used in real life.  Much of the (non-ASF) link:http://platform.incode.org[Incode Platform^] also originate from the requirements of Estatio.
 
 Estatio itself is also open source, licensed under Apache Software License and available on link:https://github.com/estatio/estatio[github].
 
-The Apache Isis committers are extremely grateful for Eurocommercial's investment in the framework in order to make Estatio a reality.  Our heart-felt thanks.
+The Apache Isis committers are extremely grateful for Eurocommercial's investment in the framework in order to make Estatio a reality.
+Our heart-felt thanks.
 
 And to learn a little more about the Estatio domain model itself, take a look at both the source code (of course) and also at https://github.com/estatio/estatio/blob/master/adocs/documentation/src/main/asciidoc/auditability.adoc[this documentation], developed to allow Eurocommercial's accountants to understand and audit the application.
 
diff --git a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_gesconsultor-grc.adoc b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_gesconsultor-grc.adoc
index 37d5f28..3304f9f 100644
--- a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_gesconsultor-grc.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_gesconsultor-grc.adoc
@@ -51,57 +51,45 @@ This is implemented with the Dojo javascript library, interfacing to Apache Isis
 
 === Risk Management
 
-Allows a company to manage __Risk Scenario__s through a _Risk Register_, and execute a full ISO 31000 compliant
-_Risk Assessment_.  A custom UI visualizes these risks as a heatmap:
+Allows a company to manage __Risk Scenario__s through a _Risk Register_, and execute a full ISO 31000 compliant _Risk Assessment_.
+A custom UI visualizes these risks as a heatmap:
 
 image::{_imagesdir}powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png[width="800px",link="{_imagesdir}powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png"]
 
 
 === Project Management
 
-Allows users to visually manage their projects and tasks through a KanBan-like interface.  Again, the viewer provides
-drag-n-drop capabilities:
+Allows users to visually manage their projects and tasks through a KanBan-like interface.
+Again, the viewer provides drag-n-drop capabilities:
 
 image::{_imagesdir}powered-by/gesconsultor-grc/fig-4-managing-projects.png[width="px",link="{_imagesdir}powered-by/gesconsultor-grc/fig-4-managing-projects.png"]
 
 
 === Dashboard and Indicators
 
-Being a "world-first", the GRC platform's implementation of the Information Security measurement standard (ISO 27004)
-allows companies to access real-time information available in the GRC platform and External Systems, associate
-_Decision Criteria_ to them and create beautiful __Dashboard__s and __Indicator__s.
+Being a "world-first", the GRC platform's implementation of the Information Security measurement standard (ISO 27004) allows companies to access real-time information available in the GRC platform and External Systems, associate _Decision Criteria_ to them and create beautiful __Dashboard__s and __Indicator__s.
 
 All the business rules are on a Domain fully implemented in Apache Isis.
 
 
 == Implementation details
 
-The GRC application require a more sophisticating and customizable viewer than is provided "out-of-the-box" by
-Apache Isis.  We chose http://wavemaker.com[Wavemaker] for implementing the viewer, also leveraging and integrating with
-various Wavemaker services.
+The GRC application require a more sophisticating and customizable viewer than is provided "out-of-the-box" by Apache Isis.
+We chose http://wavemaker.com[Wavemaker] for implementing the viewer, also leveraging and integrating with various Wavemaker services.
 
-Even so, while GRC does (as the figures above show) include custom views, the majority of the views exposed by GRC are
-automatically generated from the underlying domain entities; the GRC viewer is a proprietary version of Isis' own
-xref:../../guides/ugvw/ugvw.adoc#[Wicket viewer].  At the last count more than 400 domain entities, across 6 different
-Bounded Contexts, are surfaced in the UI in this this way.
+Even so, while GRC does (as the figures above show) include custom views, the majority of the views exposed by GRC are automatically generated from the underlying domain entities; the GRC viewer is a proprietary version of Isis' own xref:../../guides/ugvw/ugvw.adoc#[Wicket viewer].
+At the last count more than 400 domain entities, across 6 different Bounded Contexts, are surfaced in the UI in this this way.
 
-At the Domain level, we also extensively use the xref:../../guides/ugfun/ugfun.adoc#_ugfun_building-blocks_events_domain-events[domain events]
-functionality available in Apache Isis, along with many of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] (such
-as http://github.com/isisaddons/isis-module-audit[audit], http://github.com/isisaddons/isis-module-security[security]
-and the http://github.com/isisaddons/isis-module-excel[excel] modules).
+At the Domain level, we also extensively use the xref:../../guides/ugfun/ugfun.adoc#_ugfun_building-blocks_events_domain-events[domain events] functionality available in Apache Isis, along with many of the (non-ASF) link:http://platform.incode.org[Incode Platform^] (such as audit, security and excel modules).
 
-The GRC platform currently has more than 5600 automated tests, about 2000 being
-xref:../../guides/ugtst/ugtst.adoc#_ugtst_bdd-spec-support[BDD tests] and 3600 xref:../../guides/ugtst/ugtst.adoc#_ugtst_integ-test-support[integration
-tests], all leveraging Apache Isis' extensive testing capabilities.
+The GRC platform currently has more than 5600 automated tests, about 2000 being xref:../../guides/ugtst/ugtst.adoc#_ugtst_bdd-spec-support[BDD tests] and 3600 xref:../../guides/ugtst/ugtst.adoc#_ugtst_integ-test-support[integration tests], all leveraging Apache Isis' extensive testing capabilities.
 
 
 == Summing up
 
-Three years after this major refactoring, the GRC platform was acquired by Telefonica to be used as its top-level
-Security Governance platform; a breakthrough in the Managed Security Services sector.
+Three years after this major refactoring, the GRC platform was acquired by Telefonica to be used as its top-level Security Governance platform; a breakthrough in the Managed Security Services sector.
 
-The original development team currently work on Telefonica offices; the Product Management is co-directed by the
-link:http://www.govertis.com[GOVERTIS company] that originally developed it, and Telefonica.
+The original development team currently work on Telefonica offices; the Product Management is co-directed by the link:http://www.govertis.com[GOVERTIS company] that originally developed it, and Telefonica.
 
 All this could not have been achieved as quickly nor as effectively without the Apache Isis platform.
 
diff --git a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_transport-planner.adoc b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_transport-planner.adoc
index ec163cb..18c99d9 100644
--- a/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_transport-planner.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/powered-by/_powered-by_transport-planner.adoc
@@ -24,16 +24,16 @@ is necessary).
 [cols="2a,2a"]
 |===
 
-|TransportPlanner allows schedules of journeys to be planned.  It uses the (non-ASF) http://github.com/isisaddons/isis-wicket-gmap3[Isis addons' gmap3] wicket extension to provide the map.
+|TransportPlanner allows schedules of journeys to be planned.  It uses the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s gmap3 wicket component to provide the map.
 
 |image::https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TransportDemand.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b[width="530px",link="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TransportDemand.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"]
 
 
-|TransportPlanner uses (non-ASF) http://github.com/isisaddons/isis-wicket-wickedcharts[Isis addons' wickedcharts] wicket extension to provide custom graphs
+|TransportPlanner uses the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s wickedcharts wicket extension to provide custom graphs
 |image::https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TPM_CostPie.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b[width="530px",link="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TPM_CostPie.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"]
 
 
-|Another example of TransportPlanner's use of (non-ASF) http://github.com/isisaddons/isis-wicket-wickedcharts[wickedcharts]
+|Another example of TransportPlanner's use of (non-ASF) link:http://platform.incode.org[Incode Platform^]'s wickedcharts component.
 |image::https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/Tpm_ResourceUsage.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b[width="530px",link="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/Tpm_ResourceUsage.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b"]
 
 |===
diff --git a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc
index 7686a68..902d60a 100644
--- a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc
@@ -84,7 +84,7 @@ Learn more xref:../../guides/dg/dg.adoc#_dg_ide_intellij[here]
 
 _Configuring the command and auditing add-on modules for the xref:../../guides/ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp]._ +
 
-Learn more at the (non-ASF) Isis addons' http://github.com/isisaddons/isis-module-command[command] and http://github.com/isisaddons/isis-module-audit[audit] modules
+Learn more at the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command and audit SPI modules
 
 |video::g01tK58MxJ8[youtube,width="420px",height="236px"]
 
@@ -93,7 +93,7 @@ Learn more at the (non-ASF) Isis addons' http://github.com/isisaddons/isis-modul
 
 _Configuring the security add-on module for for the xref:../../guides/ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp]._ +
 
-Learn more at the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module
+Learn more at the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security SPI module.
 
 |video::bj8735nBRR4[youtube,width="420px",height="236px"]
 
@@ -103,7 +103,7 @@ Learn more at the (non-ASF) http://github.com/isisaddons/isis-module-security[Is
 
 _A run-through of the command (profiling) service, auditing service, publishing service.  Also shows how commands can be run in the background either explicitly by scheduling through the background service or implicitly by way of a framework annotation._ +
 
-Learn more at the (non-ASF) Isis addons' http://github.com/isisaddons/isis-module-command[command], http://github.com/isisaddons/isis-module-audit[audit] and (non-ASF) http://github.com/isisaddons/isis-module-publishing[publishing] modules.
+Learn more at the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command and audit modules (also the obsolete http://github.com/isisaddons-legacy/isis-module-publishing[publishing] modules).
 
 |video::tqXUZkPB3EI[youtube,width="420px",height="210px"]
 
@@ -111,7 +111,7 @@ Learn more at the (non-ASF) Isis addons' http://github.com/isisaddons/isis-modul
 
 |Bulk updates in Apache Isis (v1.5.0) +
 
-_Using the (non-ASF) http://github.com/isisaddons/isis-module-excel[Isis addons' excel] module and view models to perform bulk updates)._
+_Using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s excel module and view models to perform bulk updates)._
     
 |video::8SsRDhCUuRc[youtube,width="420px",height="315px"]
 
@@ -131,7 +131,7 @@ _Using the (non-ASF) http://github.com/isisaddons/isis-module-excel[Isis addons'
 
 |Customizing the Wicket viewer +
 
-_How to customize the Wicket viewer, integrating the (non-ASF) http://github.com/isisaddons/isis-wicket-gmap3[Isis addons' gmap3 ] wicket extension._
+_How to customize the Wicket viewer, integrating the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s gmap3 wicket component._
 
 |video::9o5zAME8LrM[youtube,width="420px",height="315px"]
 
diff --git a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
index 92974af..0847670 100644
--- a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts.adoc
@@ -308,7 +308,7 @@ Using link:https://projectlombok.org/[Project Lombok] to remove boilerplate from
 
 
 |link:https://www.youtube.com/watch?v=AXuxULuRtm0[029^] +
-Using the (non-ASF) http://github.com/isisaddons/isis-metamodel-paraname8[Isis addons' paraname8] module to remove boilerplate from your domain object (xref:../../guides/rgant/rgant.adoc#_rgant-ParameterLayout_named[`@ParameterLayout#named()`] annotation attribute on action parameters).
+Using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s paraname8 metamodel extension to remove boilerplate from your domain object (xref:../../guides/rgant/rgant.adoc#_rgant-ParameterLayout_named[`@ParameterLayout#named()`] annotation attribute on action parameters).
 |||||x|||x|||
 
 
@@ -413,7 +413,7 @@ Using the xref:../../guides/rgcms/rgcms.adoc#_rgcms_classes_super_FixtureScript[
 
 
 |link:https://www.youtube.com/watch?v=-jMiD9n1L5U[040^] +
-Using the (non-ASF) http://github.com/isisaddons/isis-module-fakedata[Isis addons' fakedata] module's `FakeDataService` to provide fake (random) names within a fixture script.
+Using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s fakedata module's `FakeDataService` to provide fake (random) names within a fixture script.
 ||x|||x||||||
 
 
@@ -476,29 +476,27 @@ include::_screencasts-playlists.adoc[]
 
 
 |link:https://www.youtube.com/watch?v=SoREp-8MQz0[047^] +
-Configuring an Apache Isis app to allow tables of objects to be downloaded as an Excel spreadsheet, using the (non-ASF) http://github.com/isisaddons/isis-wicket-excel[Isis addons' excel] wicket extension.
+Configuring an Apache Isis app to allow tables of objects to be downloaded as an Excel spreadsheet, using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s excel wicket component.
 |||||x||||||
 
 
 |link:https://www.youtube.com/watch?v=bqjLx8gMOEw[048^] +
 Configuring an Apache Isis app to allow tables of domain objects with date information to be rendered on a full-page
-calendar, using the (non-ASF) http://github.com/isisaddons/isis-wicket-fullcalendar2[Isis addons' fullcalendar2] wicket
-extension.
+calendar, using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s fullcalendar2 wicket
+component.
 |||||x||||||
 
 
 |link:https://www.youtube.com/watch?v=0YoFa44Xr6M[049^] +
 Using the xref:../../guides/rgant/rgant.adoc#_rgant-Programmatic[`@Programmatic`] annotation to exclude methods from a domain object
-(eg implementing methods of an interface as defined by the (non-ASF)
-http://github.com/isisaddons/isis-wicket-fullcalendar2[Isis addons' fullcalendar2 ] wicket extension) that would
+(eg implementing methods of an interface as defined by the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s fullcalendar2 wicket component) that would
 otherwise be part of the Apache Isis metamodel (and thus show up in the UI).
 ||||||||||x|
 
 
 |link:https://www.youtube.com/watch?v=mIwptdeZ67Q[050^] +
 Configuring an Apache Isis app to allow tables of domain objects with location information to be rendered on map,
- using the (non-ASF) http://github.com/isisaddons/isis-wicket-gmap3[Isis addons' gmap3] wicket
- extension.
+ using the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s gmap3 wicket component.
 |||||x||||||
 
 
diff --git a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
index 829b198..f4ef91d 100644
--- a/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/tg/_tg_stop-scaffolding-start-coding.adoc
@@ -559,19 +559,21 @@ This can be helpful for "naive" code which would normally make the same query wi
 
 == Extending the Wicket UI
 
-Each element in the Wicket viewer (entity form, properties, collections, action button etc) is a component, each created by a internal API (`ComponentFactory`, described xref:../../guides/ugvw/ugvw.adoc#_ugvw_extending[here]). For collections there can be multiple views, and the Wicket viewer provides a view selector drop down (top right of each collection panel).
+Each element in the Wicket viewer (entity form, properties, collections, action button etc) is a component, each created by a internal API (`ComponentFactory`, described xref:../../guides/ugvw/ugvw.adoc#_ugvw_extending[here]).
+For collections there can be multiple views, and the Wicket viewer provides a view selector drop down (top right of each collection panel).
+
+Moreover, we can add additional views. In this section we'll explore some of these, already provided through the (non-ASF) link:http://platform.incode.org[Incode Platform^].
 
-Moreover, we can add additional views. In this section we'll explore some of these, already provided through http://www.isisaddons.org/[Isis addons] (not ASF).
 
 === Excel download
 
-The https://github.com/isisaddons/isis-wicket-excel[Excel download add-on] allows the collection to be downloaded as an Excel spreadsheet (`.xlsx`).
+The Incode Platform's Excel Wicket component allows the collection to be downloaded as an Excel spreadsheet (`.xlsx`).
 
 * Use the instructions on the add-on module's README to add in the excel download module (ie: update the POM).
 
 === Fullcalendar2
 
-The https://github.com/isisaddons/isis-wicket-fullcalendar2[Fullcalendar2 download add-on] allows entities to be rendered in a full-page calendar.
+The Incode Platform's Fullcalendar2 Wicket component allows entities to be rendered in a full-page calendar.
 
 * Use the instructions on the add-on module's README to add in the fullcalendar2 module (ie: update the POM).
 * on one of your entities, implement either the `CalendarEventable` interface or the (more complex) `Calendarable` interface.
@@ -580,7 +582,7 @@ The https://github.com/isisaddons/isis-wicket-fullcalendar2[Fullcalendar2 downlo
 
 === gmap3
 
-The https://github.com/isisaddons/isis-wicket-gmap3[Gmap3 download add-on] allows entities that implement certain APIs to be rendered in a full-page gmap3.
+The Incode Platform's Gmap3 Wicket componet allows entities that implement certain APIs to be rendered in a full-page gmap3.
 
 * Use the instructions on the add-on module's README to add in the gmap3 module (ie: update the POM).
 * on one of your entities, implement the `Locatable` interface
@@ -592,11 +594,15 @@ The https://github.com/isisaddons/isis-wicket-gmap3[Gmap3 download add-on] allow
 
 == Add-on modules (optional)
 
-In addition to providing Wicket viewer extensions, http://www.isisaddons.org/[Isis addons] also has a large number of modules. These address such cross-cutting concerns as security, command (profiling), auditing and publishing.
+In addition to providing Wicket viewer extensions, the (non-ASF) link:http://platform.incode.org[Incode Platform^] also has a large number of other modules.
+These address such cross-cutting concerns as security, command (profiling), auditing and publishing.
 
-* (optional): follow the https://github.com/isisaddons/isis-module-security[security module] README or http://youtu.be/bj8735nBRR4[screencast]
-* (optional): follow the https://github.com/isisaddons/isis-module-command[command module] README or http://youtu.be/g01tK58MxJ8[screencast]
-* (optional): follow the https://github.com/isisaddons/isis-module-audit[auditing module] README or (the same) http://youtu.be/g01tK58MxJ8[screencast]
+* (optional): follow the security module README.
+ There is also a http://youtu.be/bj8735nBRR4[screencast] that refers to the Incode Platform's predecessor, the isisaddons.org website.
+* (optional): follow the command module README.
+There is also a http://youtu.be/g01tK58MxJ8[screencast] that refers to the Incode Platform's predecessor, the isisaddons.org website.
+* (optional): follow the auditing module README.
+Or, see (the same) http://youtu.be/g01tK58MxJ8[screencast].
 
 
 
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.10.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.10.0.adoc
index dc93cb5..200d83c 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.10.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.10.0.adoc
@@ -6,7 +6,9 @@
 :toc: right
 
 
-Apache Isis 1.10.0 provides a couple of new domain services.  Client-side filtering of objects (eg to support (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module's multi-tenancy support) is completed so that autocomplete//choices, summary totals and components such as (non-ASF) http://github.com/isisaddons/isis-wicket-gmap3[Isis addons' gmap3 ] wicket extension show only filtered objects. The "are you sure" semantic and corresponding UI is also avail [...]
+Apache Isis 1.10.0 provides a couple of new domain services.  Client-side filtering of objects (eg to support (non-ASF) link:http://platform.incode.org[Incode Platform^]'s security module's multi-tenancy support) is completed so that autocomplete//choices, summary totals and components such as (non-ASF) link:http://platform.incode.org[Incode Platform^]'s gmap3 wicket component show only filtered objects.
+The "are you sure" semantic and corresponding UI is also available, as well as the ability to specify the default view for collections.
+The release also introduces a new type of contribution service (mixins), as well as bringing in support for Project Lombok
 
 Internally there have been substantial simplifications to the codebase.
 
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
index 45f1f81..2e18a68 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.12.0.adoc
@@ -9,7 +9,7 @@
 
 
 The main feature in 1.12.0 is much enhanced support for custom layouts, using an optional separate XML layout file `Xxx.layout.xml` (where `Xxx` is the class of the object being rendered).  This is similar in concept to the earlier support we have had for custom layouts through a `.layout.json` file, but introduces the ability to position object members anywhere using bootstrap columns and rows.  It also brings in
-support for tabgroups, and allows object members to be included in the page more than once (eg a table view and also a (non-ASF) http://github.com/isisaddons/isis-wicket-fullcalendar2[calendar] view).
+support for tabgroups, and allows object members to be included in the page more than once (eg a table view and also a (non-ASF) link:http://platform.incode.org[Incode Platform^]'s fullcalendar2 view).
 
 As a result of this change, the support for editing objects has been modified; rather than an 'edit' button which toggles the entire
 page into edit mode, instead each property is edited individually.  The current implementation of this is using a prompt dialog (very
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc
index e7215d3..98a89dc 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.0.adoc
@@ -19,9 +19,8 @@ replaced by xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_Auditer
 xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].  It is now possible to have multiple implementations
 of each.
 
-The (non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' auditing] module has been reworked to
-implement xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_spi_AuditService[`AuditService`], while the new (non-ASF)
-http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module implements
+The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s auditing module has been reworked to
+implement xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_spi_AuditService[`AuditService`], while the new (non-ASF) link:http://platform.incode.org[Incode Platform^]'s publishmq module implements
 xref:../guides/rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`] to publish interaction events to an ActiveMQ bus (and
 to allow such events to be replayed if necessary).
 
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.2.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.2.adoc
index ff74103..1c73aed 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.2.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.13.2.adoc
@@ -4,14 +4,14 @@
 This is a maintenance release with a number of minor improvements and bug fixes.
 If these the main improvement is that the simpleapp archetype has been substantially reworked to be more modular.
 
-This release also closes the ticket to provide a better DB migration story; this has been implemented by way of the (non-ASF) http://github.com/isisaddons/isis-module-flywaydb[Isis addons' flywaydb] module.
+This release also closes the ticket to provide a better DB migration story; this has been implemented by way of the (non-ASF) link:http://platform.incode.org[Incode Platform^]'s flywaydb module.
 
 
 
 == New Feature
 
 * link:https://issues.apache.org/jira/browse/ISIS-1542[ISIS-1542] - Update simpleapp application/archetype to provide access to HSQL DB Manager (via their Swing UI) when running in-memory
-* link:https://issues.apache.org/jira/browse/ISIS-1471[ISIS-1471] - Integrate Flyway or Liquibase or something similar (see (non-ASF) http://github.com/isisaddons/isis-module-flywaydb[Isis addons' flywaydb] module.
+* link:https://issues.apache.org/jira/browse/ISIS-1471[ISIS-1471] - Integrate Flyway or Liquibase or something similar (see (non-ASF) link:http://platform.incode.org[Incode Platform^]'s flywaydb module.
 
 
 == Improvement
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
index be489a5..afa4214 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.15.0.adoc
@@ -17,7 +17,7 @@ That said, we do recommend that you read and keep in mind the xref:../migration-
 
 [NOTE]
 ====
-(*work in progress*) The supporting (non-ASF) link:http://isisaddons.org[Isis Addons] and link:http://catalog.incode.org[Incode Catalog] have also been reorganised into a single link:http://platform.incode.org["Incode Platform"].
+The supporting (non-ASF) link:http://isisaddons.org[Isis Addons] and link:http://catalog.incode.org[Incode Catalog] have also been combined into a single link:http://platform.incode.org["Incode Platform"].
 
 While each module can still be consumed individually, the new platform versions consistently (a change in any one module will result in a re-release of all).
 This should make these modules easier to consume, and easier to maintain/develop.
@@ -128,9 +128,9 @@ All the modules remain open source, still licensed under the ASF v2.0 license.
 * link:https://issues.apache.org/jira/browse/ISIS-1521[ISIS-1521] - Release activities for 1.15.0
 
 
-== Add-ons
+== Incode Platform
 
-Implemented in either the supporting (non-ASF) link:http://isisaddons.org[Isis Addons] or link:http://catalog.incode.org[Incode Catalog].
+Implemented in the (non-ASF) link:http://platform.incode.org[Incode Platform^].
 
 * link:https://issues.apache.org/jira/browse/ISIS-513[ISIS-513] - [ADDONS] Wicket: Pdf.js display in browser natively
 
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.7.0.adoc b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.7.0.adoc
index b5f7f7a..fc6c3de 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.7.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/_release-notes_1.7.0.adoc
@@ -55,7 +55,7 @@
 
 === Removed features
 
-Moved to (non-ASF) link:http://www.isisaddons.org[Isis Addons]
+Moved to (non-ASF) link:http://www.isisaddons.org[Isis Addons] (as of 1.15.0, part of (non-ASF) link:http://platform.incode.org[Incode Platform^]).
 
 * link:https://issues.apache.org/jira/browse/ISIS-851[ISIS-851] - Remove modules from Apache Isis core (available instead through isisaddons).
 * link:https://issues.apache.org/jira/browse/ISIS-887[ISIS-887] - xxx modules, as now in isisaddons.

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].