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

commit 361d941e29f6ceebf14a2fe85c8692f81bef2878
Author: Dan Haywood <[email protected]>
AuthorDate: Sun Oct 23 15:00:50 2022 +0100

    ISIS-3260: fixes some antora bad links
---
 .../pages/what-is-apache-causeway/screencasts.adoc |  4 ++--
 .../applib/pages/index/events/ui/IconUiEvent.adoc  |  4 +++-
 .../hooks/HintStore_020-examples-and-usage.adoc    |  2 +-
 .../LayoutServiceMenu_020-examples-and-usage.adoc  |  2 +-
 .../LayoutService_020-examples-and-usage.adoc      |  2 +-
 .../UrlEncodingService_020-examples-and-usage.adoc |  4 ----
 .../applib-classes/pages/mixees-and-mixins.adoc    |  6 ++---
 .../pages/roles-mixins-contributees/mixins.adoc    |  2 +-
 .../applib-classes/partials/module-nav.adoc        |  2 +-
 .../partials/_presentation-layer-spi.adoc          |  2 +-
 .../domain-services.adoc                           |  6 ++---
 .../causeway/applib/events/ui/IconUiEvent.java     | 12 +++++-----
 .../src/main/adoc/modules/commons/pages/about.adoc |  4 ++--
 .../src/main/adoc/modules/config/pages/about.adoc  | 26 +++++++++++-----------
 .../config/pages/sections/causeway.extensions.adoc |  2 +-
 .../main/adoc/modules/metamodel/pages/about.adoc   |  2 +-
 .../UrlEncodingServiceWithCompression.java         |  3 +++
 ...ObjectEntityChangePublishingVm-description.adoc |  4 +++-
 .../src/main/adoc/modules/bypass/pages/about.adoc  |  4 ++--
 .../adoc/modules/fakedata/pages/about.adoc         |  4 ++--
 .../pages/fixture-scripts/maven-configuration.adoc |  4 ++--
 .../adoc/modules/h2console/pages/about.adoc        |  4 ++--
 .../modules/ROOT/pages/content-negotiation.adoc    |  3 ++-
 23 files changed, 55 insertions(+), 53 deletions(-)

diff --git 
a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
 
b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
index 98f958f45f..1c082fc480 100644
--- 
a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
+++ 
b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
@@ -208,7 +208,7 @@ include::screencasts/playlists.adoc[]
 
 |link:https://www.youtube.com/watch?v=0d713-V4vrg[019^] +
 Demonstrates how Apache Causeway' xref:vw:ROOT:about.adoc[Web UI (Wicket 
viewer)] remembers the state of rendered domain objects, and how the end-user 
of the
- application can clear these UI hints using the (framework-provided) 
xref:refguide:viewer:index/wicket/viewer/mixins/Object_clearHints.adoc["clear 
hints"] mixin action.
+ application can clear these UI hints using the (framework-provided) 
xref:refguide:viewer:index/wicket/applib/mixins/Object_clearHints.adoc["clear 
hints"] mixin action.
 |||X||||||||
 
 
@@ -253,7 +253,7 @@ Using a 
xref:refguide:applib-classes:events/domainevent.adoc[domain event] subsc
 
 
 |link:https://www.youtube.com/watch?v=6GjLW0hlrm4[025^] +
-Using a domain event subscriber to hide functionality, in this case the 
xref:refguide:viewer:index/wicket/viewer/mixins/Object_clearHints.adoc["clear 
hints"] action automatically provided by the framework.
+Using a domain event subscriber to hide functionality, in this case the 
xref:refguide:viewer:index/wicket/applib/mixins/Object_clearHints.adoc["clear 
hints"] action automatically provided by the framework.
 ||||||||||X|
 
 
diff --git 
a/antora/components/refguide-index/modules/applib/pages/index/events/ui/IconUiEvent.adoc
 
b/antora/components/refguide-index/modules/applib/pages/index/events/ui/IconUiEvent.adoc
index ca1f1cfaea..45e5eff52f 100644
--- 
a/antora/components/refguide-index/modules/applib/pages/index/events/ui/IconUiEvent.adoc
+++ 
b/antora/components/refguide-index/modules/applib/pages/index/events/ui/IconUiEvent.adoc
@@ -1,7 +1,9 @@
 = IconUiEvent
 :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 [...]
 
-Emitted for subscribers to provide a cssClass hint (equivalent to the 
`iconName()` supporting method).* If the domain object defines its own 
xref:refguide:applib-methods:reserved.adoc#iconName[iconName()] supporting 
method, or if it has the 
xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassFa[@DomainObjectLayout#cssClassFa()]
 attribute, then these will take precedence.
+Emitted for subscribers to provide a cssClass hint (equivalent to the 
`iconName()` supporting method).
+
+If the domain object defines its own 
xref:refguide:applib-methods:ui-hints/iconName.adoc[iconName()] supporting 
method, or if it has the 
xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassFa[@DomainObjectLayout#cssClassFa()]
 attribute, then these will take precedence.
 
 The class has a number of responsibilities:
 
diff --git 
a/antora/components/refguide-index/modules/applib/pages/index/services/hint/hooks/HintStore_020-examples-and-usage.adoc
 
b/antora/components/refguide-index/modules/applib/pages/index/services/hint/hooks/HintStore_020-examples-and-usage.adoc
index d74fe4fe68..4ee2d44d3e 100644
--- 
a/antora/components/refguide-index/modules/applib/pages/index/services/hint/hooks/HintStore_020-examples-and-usage.adoc
+++ 
b/antora/components/refguide-index/modules/applib/pages/index/services/hint/hooks/HintStore_020-examples-and-usage.adoc
@@ -11,7 +11,7 @@ An alternative implementation might be more sophisticated (eg 
implementing an MR
 
 == See Also
 
-* The xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)] exposes the  
xref:refguide:viewer:index/wicket/viewer/mixins/Object_clearHints.adoc["clear 
hints"] mixin action
+* The xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)] exposes the  
xref:refguide:viewer:index/wicket/applib/mixins/Object_clearHints.adoc["clear 
hints"] mixin action
 that is for use by end-users of the application to clear any UI hints that 
have accumulated for a domain object.
 
 * Mutable view models should implement the 
xref:refguide:applib:index/services/hint/HintIdProvider.adoc[] in order for 
hints to work.
diff --git 
a/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
 
b/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
index 69f18e0e58..857f953c33 100644
--- 
a/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
+++ 
b/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutServiceMenu_020-examples-and-usage.adoc
@@ -5,4 +5,4 @@
 == See also
 
 * xref:refguide:applib:index/services/layout/LayoutService.adoc[LayoutService]
-* xref:refguide:applib:index/services/layout/Style.adoc[Style]
+* 
xref:refguide:applib:index/services/layout/LayoutExportStyle.adoc[LayoutExportStyle]
diff --git 
a/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
 
b/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
index 5629e84af4..62a85bbc40 100644
--- 
a/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
+++ 
b/antora/components/refguide-index/modules/applib/pages/index/services/layout/hooks/LayoutService_020-examples-and-usage.adoc
@@ -71,7 +71,7 @@ The grid regions will be empty in this version, and the 
framework will use the `
 == See also
 
 The functionality of `LayoutService` is surfaced in the user interface through 
a related 
xref:refguide:applib:index/services/layout/LayoutService.adoc#related-mixins-and-menus[mixin
 and menu action].
-See also xref:refguide:applib:index/services/layout/Style.adoc[Style], which 
determines how much data is included in the downloaded XML.
+See also 
xref:refguide:applib:index/services/layout/LayoutExportStyle.adoc[LayoutExportStyle],
 which determines how much data is included in the downloaded XML.
 
 The xref:refguide:applib:index/services/grid/GridService.adoc[GridService] is 
responsible for loading and normalizing layout XML for a domain class.
 It in turn uses the 
xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService]
 and  
xref:refguide:applib:index/services/grid/GridSystemService.adoc[GridSystemService]
diff --git 
a/antora/components/refguide-index/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
 
b/antora/components/refguide-index/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
index 389898a539..7ff7bdc020 100644
--- 
a/antora/components/refguide-index/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
+++ 
b/antora/components/refguide-index/modules/applib/pages/index/services/urlencoding/hooks/UrlEncodingService_020-examples-and-usage.adoc
@@ -22,7 +22,3 @@ For large view models, there's the possibility that the 2083 
character limit cou
 
 * xref:userguide:fun:overview.adoc#view-models[view models]
 
-* 
xref:refguide:applib:index/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.adoc[UrlEncodingServiceUsingBaseEncodingAbstract]
-+
-provided as a convenient base class for alternative implementations.
-
diff --git 
a/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc
 
b/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc
index c2d27bd155..d052249b30 100644
--- 
a/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc
+++ 
b/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc
@@ -27,11 +27,11 @@ The framework provides a number of mixins that contributes 
to `java.lang.Object`
 ** 
xref:refguide:applib:index/mixins/metamodel/Object_objectIdentifier.adoc[Object_objectIdentifier]
 (property)
 
 * Wicket viewer:
-** 
xref:refguide:viewer:index/wicket/viewer/mixins/Object_clearHints.adoc[Object_clearHints]
+** 
xref:refguide:viewer:index/wicket/applib/mixins/Object_clearHints.adoc[Object_clearHints]
 
 * All viewers:
-** 
xref:refguide:viewer:index/common/applib/mixins/Object_impersonate.adoc[Object_impersonate]
-** 
xref:refguide:viewer:index/common/applib/mixins/Object_impersonateWithRoles.adoc[Object_impersonateWithRoles]
+** 
xref:refguide:viewer:index/commons/applib/mixins/Object_impersonate.adoc[Object_impersonate]
+** 
xref:refguide:viewer:index/commons/applib/mixins/Object_impersonateWithRoles.adoc[Object_impersonateWithRoles]
 ** 
xref:refguide:applib:index/mixins/rest/Object_openRestApi.adoc[Object_openRestApi]
 
 
diff --git 
a/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
 
b/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
index fe80af23a1..8f3541209c 100644
--- 
a/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
+++ 
b/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
@@ -22,7 +22,7 @@ The framework provides a number of mixins that contributes to 
`java.lang.Object`
 ** 
xref:refguide:applib:index/mixins/layout/Object_downloadLayoutXml.adoc[Object_downloadLayoutXml]
 
 * Wicket viewer:
-** 
xref:refguide:viewer:index/wicket/viewer/mixins/Object_clearHints.adoc[Object_clearHints]
+** 
xref:refguide:viewer:index/wicket/applib/mixins/Object_clearHints.adoc[Object_clearHints]
 
 
 
diff --git 
a/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc 
b/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
index 3b8ea4c7e4..5135682f9f 100644
--- a/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
+++ b/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
@@ -35,7 +35,7 @@
 *** 
xref:refguide:applib:index/mixins/metamodel/Object_logicalTypeName.adoc[Object_logicalTypeName]
 (property)
 *** 
xref:refguide:applib:index/mixins/metamodel/Object_objectIdentifier.adoc[Object_objectIdentifier]
 (property)
 
-*** 
xref:viewer:index/wicket/viewer/mixins/Object_clearHints.adoc[Object_clearHints]
+*** 
xref:viewer:index/wicket/applib/mixins/Object_clearHints.adoc[Object_clearHints]
 
 *** xref:applib:index/mixins/rest/Object_openRestApi.adoc[Object_openRestApi]
 
diff --git 
a/antora/components/refguide/modules/applib-svc/partials/_presentation-layer-spi.adoc
 
b/antora/components/refguide/modules/applib-svc/partials/_presentation-layer-spi.adoc
index 2bcdd806b1..214b6cecaa 100644
--- 
a/antora/components/refguide/modules/applib-svc/partials/_presentation-layer-spi.adoc
+++ 
b/antora/components/refguide/modules/applib-svc/partials/_presentation-layer-spi.adoc
@@ -75,7 +75,7 @@ xref:security:secman:about.adoc[SecMan] provides an 
implementation of this servi
 Used to convert view models mementos into usable URL form.
 
 
-|xref:refguide:viewer:index/common/applib/services/userprof/UserProfileUiModelProvider.adoc[UserProfileUiModelProvider]
+|xref:refguide:viewer:index/commons/applib/services/userprof/UserProfileUiService.adoc[UserProfileUiService]
 |Obtain an alternative (usually enriched/customized) name for the current 
user, to render in the UI.
 
 |===
diff --git 
a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
 
b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
index 2dfc63f05f..1a013d802d 100644
--- 
a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
+++ 
b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
@@ -10,9 +10,9 @@ This may be exposed in the UI, or might be invoked 
programmatically.
 
 However, a service cannot have (persisted) properties, nor can it have 
(persisted) collections.
 
-Domain services that are visible in the UI or REST API are annotated with 
xref:refguide:applib:index/annotation/DomainService.adoc[@DomainService()], 
while services that are _programmatic_ in nature should be simply annotated 
using Spring's 
xref:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Component.html[@Component]
 or one of its specializations, eg
-xref:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Service.html[@Service]
-orxref:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Repository.html[@Repository].
+Domain services that are visible in the UI or REST API are annotated with 
xref:refguide:applib:index/annotation/DomainService.adoc[@DomainService()], 
while services that are _programmatic_ in nature should be simply annotated 
using Spring's 
link:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Component.html[@Component]
 or one of its specializations, eg
+link:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Service.html[@Service]
+or 
link:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/stereotype/Repository.html[@Repository].
 
 Apache Causeway runs on top of Spring Boot, and relies on Spring Boot for 
dependency injection using `@javax.inject.Inject`.
 The `@javax.annotation.Priority` annotation is used to prioritize multiple 
service implementations, effectively allowing any framework-provided domain 
service to be substituted out by a user-defined one encountered with an earlier 
precedence (= higher priority) if required.
diff --git 
a/api/applib/src/main/java/org/apache/causeway/applib/events/ui/IconUiEvent.java
 
b/api/applib/src/main/java/org/apache/causeway/applib/events/ui/IconUiEvent.java
index 61642ccbd5..6690690d3a 100644
--- 
a/api/applib/src/main/java/org/apache/causeway/applib/events/ui/IconUiEvent.java
+++ 
b/api/applib/src/main/java/org/apache/causeway/applib/events/ui/IconUiEvent.java
@@ -25,6 +25,11 @@ import java.util.EventObject;
  * <tt>iconName()</tt> supporting method).
  *
  * <p>
+ * If the domain object defines its own 
xref:refguide:applib-methods:ui-hints.adoc[iconName()] supporting method, or if 
it has the
+ * 
xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassFa[@DomainObjectLayout#cssClassFa()]
 attribute, then these will take precedence.
+ * </p>
+ * 
+ * <p>
  * The class has a number of responsibilities:
  * </p>
  *
@@ -42,13 +47,6 @@ import java.util.EventObject;
  * </p>
  *
  *
- * *
- *
- *
- * If the domain object defines its own 
xref:refguide:applib-methods:reserved.adoc#iconName[iconName()] supporting 
method, or if it has the
- * 
xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassFa[@DomainObjectLayout#cssClassFa()]
 attribute, then these will take precedence.
- * </p>
- *
  * @since 1.x {@index}
  */
 public abstract class IconUiEvent<S> extends AbstractUiEvent<S> {
diff --git a/commons/src/main/adoc/modules/commons/pages/about.adoc 
b/commons/src/main/adoc/modules/commons/pages/about.adoc
index c0b3db72b6..e739cb0f8c 100644
--- a/commons/src/main/adoc/modules/commons/pages/about.adoc
+++ b/commons/src/main/adoc/modules/commons/pages/about.adoc
@@ -3,13 +3,13 @@
 :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 [...]
 
 _Apache Causeway Commons_ is a library with utilities, that are shared with 
the entire
-_Apache Isis_ ecosystem.
+_Apache Causeway_ ecosystem.
 
 == Motivation
 
 This module was initially created, to remove dependence on 3^rd^ party 
(general purpose)
 _Java_ libraries like _Guava_ or _Apache Commons_. This should reduce the 
likelihood for
-_Apache Isis_ developers to run into _jar_ version conflicts, when using one 
of these
+_Apache Causeway_ developers to run into _jar_ version conflicts, when using 
one of these
 3^rd^ party libraries.
 
 It now also allows us to collect utilities in support of common idioms, that 
we use
diff --git a/core/config/src/main/adoc/modules/config/pages/about.adoc 
b/core/config/src/main/adoc/modules/config/pages/about.adoc
index 90ad077d75..ee530a513c 100644
--- a/core/config/src/main/adoc/modules/config/pages/about.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/about.adoc
@@ -87,9 +87,9 @@ It is also possible to explicitly specify production mode:
 If (by a combination of mechanisms) both prototyping and production modes are 
specified, then production mode wins.
 
 
-=== `IsisSystemEnvironment` domain service
+=== `CausewaySystemEnvironment` domain service
 
-Applications can discover the prototyping mode by injecting the 
`IsisSystemEnvironment` service.
+Applications can discover the prototyping mode by injecting the 
`CausewaySystemEnvironment` service.
 
 
 
@@ -112,7 +112,7 @@ public class SimpleApp
             extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
-        IsisPresets.prototyping();                              // <.>
+        CausewayPresets.prototyping();                              // <.>
         SpringApplication.run(
                 new Class[] { SimpleApp.class }, args);
     }
@@ -130,11 +130,11 @@ It looks like this:
 ----
 @Configuration
 @Import({
-        IsisModuleCoreRuntimeServices.class,                    // <.>
-        IsisModuleSecurityShiro.class,                          // <.>
-        IsisModuleJpaEclipselink.class,                         // <.>
-        IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,     // <.>
-        IsisModuleViewerWicketViewer.class,                     // <.>
+        CausewayModuleCoreRuntimeServices.class,                    // <.>
+        CausewayModuleSecurityShiro.class,                          // <.>
+        CausewayModuleJpaEclipselink.class,                         // <.>
+        CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,     // <.>
+        CausewayModuleViewerWicketViewer.class,                     // <.>
         ...
         ApplicationModule.class,                                // <.>
         ...
@@ -148,7 +148,7 @@ public class AppManifest {
 There are several security implementations, precisely one must be selected
 <.> Enables xref:pjpa:ROOT:about.adoc[JPA/Eclipselink] for persistence.
 +
-Alternatively, `IsisModuleJdoDataNucleus5.class` would be specified in order 
to use xref:pjdo:ROOT:about.adoc[JDO/DataNucleus] instead.
+Alternatively, `CausewayModuleJdoDataNucleus5.class` would be specified in 
order to use xref:pjdo:ROOT:about.adoc[JDO/DataNucleus] instead.
 +
 Optional (though if omitted then only 
xref:userguide:fun:overview.adoc#view-models[view models] may be used, with 
hand-rolled persistence).
 
@@ -156,10 +156,10 @@ Optional (though if omitted then only 
xref:userguide:fun:overview.adoc#view-mode
 <.> Enables the xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)]
 <.> References the application's module(s), in this case just the one, 
`ApplicationModule`. +
 
-All of the components available are named in the form`IsisModuleXxx`, so they 
are easy to discover.
+All of the components available are named in the form `CausewayModuleXxx`, so 
they are easy to discover.
 
 NOTE: Components currently do _not_ use Spring Boot's auto-configuration 
capabilities.
-That means that it's not enough to just add the appropriate Maven module to 
the classpath; its corresponding `IsisModuleXxx` must be referenced using an 
`@Import`.
+That means that it's not enough to just add the appropriate Maven module to 
the classpath; its corresponding `CausewayModuleXxx` must be referenced using 
an `@Import`.
 
 
 == Configuration Properties
@@ -170,9 +170,9 @@ So do some of the xref:extensions::about.adoc[extensions] 
and xref:valuetypes:RO
 The remainder of this guide lists the various configuration properties 
available, broken out into logical sections.
 
 [#causewayconfiguration-domain-service]
-=== IsisConfiguration domain service
+=== CausewayConfiguration domain service
 
-Applications can discover the current configuration properties for the 
framework (under the `causeway` top-level key) by injecting the 
`IsisConfiguration` domain service.
+Applications can discover the current configuration properties for the 
framework (under the `causeway` top-level key) by injecting the 
`CausewayConfiguration` domain service.
 There are similar domain services for 
xref:pjpa:ROOT:about.adoc[JPA/Eclipselink] (`EclipselinkConfiguration`), 
xref:pjdo:ROOT:about.adoc[JDO/DataNucleus] (`DatanucleusConfiguration`) and 
RestEasy (`RestEasyConfiguration`), as used by xref:vro:ROOT:about.adoc[REST 
API (Restful Objects viewer)].
 
 Applications can also create their own configuration properties file; the 
xref:docs:starters:simpleapp.adoc[simpleapp] starter app provides an example.
diff --git 
a/core/config/src/main/adoc/modules/config/pages/sections/causeway.extensions.adoc
 
b/core/config/src/main/adoc/modules/config/pages/sections/causeway.extensions.adoc
index f5def9025f..a9d1ba2949 100644
--- 
a/core/config/src/main/adoc/modules/config/pages/sections/causeway.extensions.adoc
+++ 
b/core/config/src/main/adoc/modules/config/pages/sections/causeway.extensions.adoc
@@ -273,7 +273,7 @@ regular-user.role-name
 |
 | The role name for regular users of the application, granting them access to 
basic security features.
 
-The exact set of permissions is hard-wired in the 
``IsisExtSecmanRegularUserRoleAndPermissions`` fixture.
+The exact set of permissions is hard-wired in the 
``CausewayExtSecmanRegularUserRoleAndPermissions`` fixture.
 
 
 |
diff --git a/core/metamodel/src/main/adoc/modules/metamodel/pages/about.adoc 
b/core/metamodel/src/main/adoc/modules/metamodel/pages/about.adoc
index a0a1a75c12..5bcf3497d2 100644
--- a/core/metamodel/src/main/adoc/modules/metamodel/pages/about.adoc
+++ b/core/metamodel/src/main/adoc/modules/metamodel/pages/about.adoc
@@ -173,7 +173,7 @@ Thus:
 
 * *_Viewmodels_* and *_Entities_* are specializations of *_Domain Objects_*.
 
-** _View Models_ are (lifecycle-) managed by _Apache Isis_
+** _View Models_ are (lifecycle-) managed by _Apache Causeway_
 ** _Entities_ are managed by the configured persistence layer
 (either JDO or JPA).
 
diff --git 
a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
 
b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
index a2c84523bc..5792d5e271 100644
--- 
a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
+++ 
b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/urlencoding/UrlEncodingServiceWithCompression.java
@@ -32,6 +32,9 @@ import org.springframework.stereotype.Service;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.urlencoding.UrlEncodingService;
 
+/**
+ * @since 2.0 {@index}
+ */
 @Service
 @Named(CausewayModuleCoreRuntimeServices.NAMESPACE + 
".UrlEncodingServiceWithCompression")
 @Priority(PriorityPrecedence.MIDPOINT)
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc
 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc
index f1978e07ae..0ddc81656a 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc
@@ -2,7 +2,9 @@
 
 WARNING: TODO: was renamed/moved from auditing+publishing to 
entityChangePublishing
 
-The `entityChangePublishing` element for a domain object means that all 
registered implementation(s) of the 
link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService`
 SPI] will be notified of the identity and nature of the change 
(created/updated/deleted) to the domain object.
+The `entityChangePublishing` element for a domain object means that all 
registered implementation(s) of the (internal) 
xref:refguide:core:index/metamodel/services/publishing/ExecutionPublisher.adoc[ExecutionPublisher]
+
+link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService`
 SPI] will be notified of the identity and nature of the change 
(created/updated/deleted) to the domain object.
 
 
:examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/publishing/DomainObjectPublishingVm-description.adoc
 This is done _after_ the interaction in which the object(s) was changed has 
completed.
diff --git a/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc 
b/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
index b97c70386e..f62b26eaed 100644
--- a/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
+++ b/security/bypass/src/main/adoc/modules/bypass/pages/about.adoc
@@ -22,14 +22,14 @@ In your application's `AppManifest` (top-level Spring 
`@Configuration` used to b
 @Configuration
 @Import({
         ...
-        IsisModuleSecurityBypass.class,
+        CausewayModuleSecurityBypass.class,
         ...
 })
 public class AppManifest {
 }
 ----
 
-Make sure that no other `IsisModuleSecurityXxx` module is imported.
+Make sure that no other `CausewayModuleSecurityXxx` module is imported.
 
 
 == In Use
diff --git a/testing/fakedata/adoc/modules/fakedata/pages/about.adoc 
b/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
index 1f18c2bb15..222f2dfdcb 100644
--- a/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
+++ b/testing/fakedata/adoc/modules/fakedata/pages/about.adoc
@@ -65,7 +65,7 @@ In the domain module(s) of your application, add the 
following dependency:
 
 === Update AppManifest
 
-In your application's `AppManifest` (top-level Spring `@Configuration` used to 
bootstrap the app), import the `IsisModuleTestingFakeDataApplib` module:
+In your application's `AppManifest` (top-level Spring `@Configuration` used to 
bootstrap the app), import the `CausewayModuleTestingFakeDataApplib` module:
 
 [source,java]
 .AppManifest.java
@@ -73,7 +73,7 @@ In your application's `AppManifest` (top-level Spring 
`@Configuration` used to b
 @Configuration
 @Import({
         ...
-        IsisModuleTestingFakeDataApplib.class,
+        CausewayModuleTestingFakeDataApplib.class,
         ...
 })
 public class AppManifest {
diff --git 
a/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/maven-configuration.adoc
 
b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/maven-configuration.adoc
index f727c04c8c..d2545ebf85 100644
--- 
a/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/maven-configuration.adoc
+++ 
b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/maven-configuration.adoc
@@ -44,7 +44,7 @@ In the domain module(s) of your application, add the 
following dependency:
 
 == Update AppManifest
 
-In your application's `AppManifest` (top-level Spring `@Configuration` used to 
bootstrap the app), import the `IsisModuleTestingFixturesApplib` module:
+In your application's `AppManifest` (top-level Spring `@Configuration` used to 
bootstrap the app), import the `CausewayModuleTestingFixturesApplib` module:
 
 [source,java]
 .AppManifest.java
@@ -52,7 +52,7 @@ In your application's `AppManifest` (top-level Spring 
`@Configuration` used to b
 @Configuration
 @Import({
         ...
-        IsisModuleTestingFixturesApplib.class,
+        CausewayModuleTestingFixturesApplib.class,
         ...
 })
 public class AppManifest {
diff --git a/testing/h2console/adoc/modules/h2console/pages/about.adoc 
b/testing/h2console/adoc/modules/h2console/pages/about.adoc
index 2e2eeefd0c..f2655a41be 100644
--- a/testing/h2console/adoc/modules/h2console/pages/about.adoc
+++ b/testing/h2console/adoc/modules/h2console/pages/about.adoc
@@ -49,7 +49,7 @@ In the domain module(s) of your application, add the 
following dependency:
 
 === Update AppManifest
 
-In your application's `AppManifest` (top-level Spring `@Configuration` used to 
bootstrap the app), import the `IsisModuleTestingH2ConsoleUi` module:
+In your application's `AppManifest` (top-level Spring `@Configuration` used to 
bootstrap the app), import the `CausewayModuleTestingH2ConsoleUi` module:
 
 [source,java]
 .AppManifest.java
@@ -57,7 +57,7 @@ In your application's `AppManifest` (top-level Spring 
`@Configuration` used to b
 @Configuration
 @Import({
         ...
-        IsisModuleTestingH2ConsoleUi.class,
+        CausewayModuleTestingH2ConsoleUi.class,
         ...
 })
 public class AppManifest {
diff --git 
a/viewers/restfulobjects/adoc/modules/ROOT/pages/content-negotiation.adoc 
b/viewers/restfulobjects/adoc/modules/ROOT/pages/content-negotiation.adoc
index 2aa6ada1bb..a22d52a269 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/content-negotiation.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/content-negotiation.adoc
@@ -102,4 +102,5 @@ For further details, see:
 * 
xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationService.adoc[ContentNegotiationService]
 * 
xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.adoc[ContentNegotiationServiceForRestfulObjectsV1_0]
 * 
xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.adoc[ContentNegotiationServiceXRoDomainType]
-* 
xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.adoc[ContentNegotiationServiceOrgApacheIsisV1]
 and  
xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.adoc[ContentNegotiationServiceOrgApacheIsisV2]
+* 
xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.adoc[ContentNegotiationServiceOrgApacheIsisV1]
+* 
xref:refguide:viewer:index/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.adoc[ContentNegotiationServiceOrgApacheCausewayV2]

Reply via email to