http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_application-layer.adoc
----------------------------------------------------------------------
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 a8c4cb1..839a223 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
@@ -27,7 +27,7 @@ Impl'n (g: a:)
 
 
 
-|xref:rgfis.adoc#_rgfis_spi_AuthenticationSessionProvider[`o.a.i.core.commons.`
 +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_AuthenticationSessionProvider[`o.a.i.core.commons.`
 +
 `authentication.` +
 `AuthenticationSessionProvider`]
 |Simply responsible for obtaining the current `AuthenticationSession` (the 
framework's internal representation of the currently logged-in user).
@@ -37,30 +37,30 @@ Impl'n (g: a:)
 |Default implementation looks up from `IsisSessionFactory` singleton's 
thread-local
 
 
-|xref:rgfis.adoc#_rgfis_spi_CommandDtoServiceInternal[`o.a.i.c.m.s.command` +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_CommandDtoServiceInternal[`o.a.i.c.m.s.command`
 +
 `CommandDtoServiceInternal`]
 |Creates memento of current action invocation, for use as a serializable XML 
reified command.  The
 most notable usage of this is to allow the execution of the `Command` to be 
deferred to run in the background (via
-xref:rgant.adoc#_rgant-Action_command[`@Action#commandExecuteIn()`] or
-xref:rgant.adoc#_rgant-Property_command[`@Property#commandExecuteIn()`].
+xref:../rgant/rgant.adoc#_rgant-Action_command[`@Action#commandExecuteIn()`] or
+xref:../rgant/rgant.adoc#_rgant-Property_command[`@Property#commandExecuteIn()`].
 |`CommandDtoService-` +
 `InternalServiceDefault` +
 ``isis-core-runtime``
 |
 
 
-|xref:rgfis.adoc#_rgfis_spi_MessageBrokerServiceInternal[`o.a.i.c.m.s.msgbroker`
 +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_MessageBrokerServiceInternal[`o.a.i.c.m.s.msgbroker`
 +
 `MessageBrokerServiceInternal`]
-|A wrapper around xref:rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`].
+|A wrapper around 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`].
 |MessageBrokerService-` +
 `InternalDefault` +
 ``isis-core-runtime``
 |This service does not provide any additional capabilities over 
`MessageService`, and will (most likely) be conflated with that service in the 
future.
 
 
-|xref:rgfis.adoc#_rgfis_spi_InteractionDtoServiceInternal[`o.a.i.c.m.s.ixn` +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_InteractionDtoServiceInternal[`o.a.i.c.m.s.ixn`
 +
 `InteractionDtoServiceInternal`]
-|Creates DTO for the current execution of an action invocation or property 
edit, for use either as a reified command or for implementations of the 
xref:rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
+|Creates DTO for the current execution of an action invocation or property 
edit, for use either as a reified command or for implementations of the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
 |`CommandDtoService-` +
 `InternalServiceDefault` +
 ``isis-core-metamodel``

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_persistence-layer.adoc
----------------------------------------------------------------------
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 7aa1be2..e5800b2 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
@@ -27,23 +27,23 @@ Impl'n (g: a:)
 
 
 
-|xref:rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`o.a.i.c.r.s.auditing.` +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`o.a.i.c.r.s.auditing.`
 +
 `AuditingServiceInternal`]
 |Co-ordinates between
-xref:rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 and
-xref:rgfis.adoc#_rgfis_spi_AuditerService[`AuditerService`].
+xref:../rgfis/rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 and
+xref:../rgfis/rgfis.adoc#_rgfis_spi_AuditerService[`AuditerService`].
 |concrete class.
 |
 
 
-|xref:rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`o.a.i.c.r.s.changes.`
 +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`o.a.i.c.r.s.changes.`
 +
 `ChangedObjectsServiceInternal`]
 |Request-scoped service holding objects enlisted into current transaction.
 |concrete class.
 |
 
 
-|xref:rgfis.adoc#_rgfis_spi_PersistenceSessionServiceInternal[`o.a.i.c.m.s.` +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_PersistenceSessionServiceInternal[`o.a.i.c.m.s.`
 +
 `persistsession.` +
 `PersistenceSessionServiceInternal`]
 |Acts as a facade to the underlying JDO persistence session / database 
connection.  As such it provides methods for
@@ -54,20 +54,20 @@ querying and for persisting objects.
 |
 
 
-|xref:rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`o.a.i.c.m.s.publishing.`
 +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`o.a.i.c.m.s.publishing.`
 +
 `PublishingServiceInternal`]
 |Co-ordinates between
-xref:rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 and
-xref:rgsvc.adoc#_rgsvc_api_MetricsService[`MetricsService`] and the SPI 
services,
-xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] and 
(deprecated)
-xref:rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
+xref:../rgfis/rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 and
+xref:../rgsvc/rgsvc.adoc#_rgsvc_api_MetricsService[`MetricsService`] and the 
SPI services,
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] and 
(deprecated)
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
 |`PublishingService-` +
 `InternalDefault` +
 `isis-core-runtime`
 |
 
 
-|xref:rgfis.adoc#_rgfis_spi_TransactionStateProviderInternal[`o.a.i.c.m.s.` +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_TransactionStateProviderInternal[`o.a.i.c.m.s.`
 +
 `transtate.` +
 `TransactionStateProviderInternal`]
 |Simply provides the ability to check as to the state of the current 
transaction.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer.adoc
----------------------------------------------------------------------
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 b723ef1..a2e2248 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
@@ -27,10 +27,10 @@ Impl'n (g: a:)
 |Notes
 
 
-|xref:rgfis.adoc#_rgfis_spi_ContentNegotiationService[`o.a.i.v.ro.` +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`o.a.i.v.ro.` +
 `rendering.service.conneg.` +
 `ContentNegotiationService`]
-|Encodes the algorithm that delegates to any registered 
xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]s.
+|Encodes the algorithm that delegates to any registered 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]s.
 |`ContentNegotiationService-` +
 `XRoDomainType` +
 ``o.a.i.core`` +
@@ -38,10 +38,10 @@ Impl'n (g: a:)
 |
 
 
-|xref:rgfis.adoc#_rgfis_spi_RepresentationService[`o.a.i.v.ro.` +
+|xref:../rgfis/rgfis.adoc#_rgfis_spi_RepresentationService[`o.a.i.v.ro.` +
 `rendering.service.` +
 `RepresentationService`]
-|Generates the representations, delegating to any registered 
xref:rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]s.
+|Generates the representations, delegating to any registered 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]s.
 |`RepresentationService-` +
 `ForRestfulObjects` +
 ``o.a.i.core`` +

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuditingServiceInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuditingServiceInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuditingServiceInternal.adoc
index b51fb0d..33c13ff 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuditingServiceInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuditingServiceInternal.adoc
@@ -6,15 +6,15 @@
 
 
 The (internal) `AuditingServiceInternal` domain service acts as an internal 
facade to any
-configured xref:rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] and
-xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] services.  It is 
responsible for obtaining the details
+configured 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] and
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] services. 
 It is responsible for obtaining the details
 of all changes to domain objects within an interaction, and then to call the 
configured `AuditingService` to actually
 create audit entries of those changes.
 
 [NOTE]
 ====
-xref:rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] is now 
deprecated, replaced by
-xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`].
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] is now 
deprecated, replaced by
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`].
 ====
 
 
@@ -31,9 +31,9 @@ public class AuditingServiceInternal {
 }
 ----
 <1> minor performance optimization as to whether any auditing services are 
actually enabled; checks to see if
-any xref:rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] has been 
configured, also if any
-xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditService`] are enabled.
-<2> uses the 
xref:rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 to obtain details of the changed properties, then call the configured 
xref:rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`].
+any xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] has 
been configured, also if any
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditService`] are enabled.
+<2> uses the 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 to obtain details of the changed properties, then call the configured 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`].
 
 The service implementation is `o.a.i.c.r.s.auditing.AuditingServiceInternal`.
 
@@ -42,13 +42,13 @@ The service implementation is 
`o.a.i.c.r.s.auditing.AuditingServiceInternal`.
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' default
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' default
 implementation of `AuditingServiceInternal` class is automatically registered 
(it is annotated with `@DomainService`)
 so no further configuration is required.
 
 
 == Related Classes
 
-The service delegates between the (internal) 
xref:rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 domain service  to the configured 
xref:rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`].  If no such 
`AuditingService` is configured, this service is in effect a no-op.
+The service delegates between the (internal) 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 domain service  to the configured 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`].  If no 
such `AuditingService` is configured, this service is in effect a no-op.
 
-The (internal) 
xref:rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`]
 performs a similar function for the 
xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`], also collating 
details of the changed objects from `ChangedObjectsServiceInternal`.
+The (internal) 
xref:../rgfis/rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`]
 performs a similar function for the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`], also 
collating details of the changed objects from `ChangedObjectsServiceInternal`.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuthenticationSessionProvider.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuthenticationSessionProvider.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuthenticationSessionProvider.adoc
index 3737a6e..d1c476e 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuthenticationSessionProvider.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_AuthenticationSessionProvider.adoc
@@ -31,4 +31,4 @@ 
isisSessionFactory.getCurrentSession().getAuthenticationSession();
 ----
 
 
-If xref:rgsvc.adoc#_rgsvc_api_SudoService[`SudoService`] has been used to 
temporarily override the user and/or roles, then this service will report the 
overridden values.
+If xref:../rgsvc/rgsvc.adoc#_rgsvc_api_SudoService[`SudoService`] has been 
used to temporarily override the user and/or roles, then this service will 
report the overridden values.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ChangedObjectsServiceInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ChangedObjectsServiceInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ChangedObjectsServiceInternal.adoc
index 8bcea96..d69a3ec 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ChangedObjectsServiceInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ChangedObjectsServiceInternal.adoc
@@ -8,8 +8,8 @@
 The `ChangedObjectsServiceInternal` class is an (internal) request-scoped 
domain service that is
 responsible for collecting the details of all changes to domain objects within 
an interaction.  This is then used by
 various other  (internal) domain services, notably
-xref:rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`] 
and
-xref:rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`].
+xref:../rgfis/rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`]
 and
+xref:../rgfis/rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`].
 
 
 
@@ -37,10 +37,10 @@ public class ChangedObjectsServiceInternal {
 }
 ----
 <1> Enlists an object that has just been created, updated or deleted, 
capturing the pre-modification values of the properties.
-<2> Used by the framework to determine whether to set the "persist hint" on 
the `Command` object (as per 
xref:rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`]).
-<3> Used by 
xref:rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`]
 to obtain details of and
+<2> Used by the framework to determine whether to set the "persist hint" on 
the `Command` object (as per 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`]).
+<3> Used by 
xref:../rgfis/rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`]
 to obtain details of and
 counters of all objects changed within the transaction.
-<4> Used by 
xref:rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`] 
to obtain all pairs of
+<4> Used by 
xref:../rgfis/rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`]
 to obtain all pairs of
 pre/post values of changed properties
 <5> Called by the framework to for clean up after auditing and publishing has 
completed.
 
@@ -56,7 +56,7 @@ The service implementation is 
`o.a.i.c.r.s.changes.ChangedObjectsServiceInternal
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' default
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' default
 implementation of `ChangedObjectsServiceInternal` class is automatically 
registered (it is annotated with `@DomainService`)
 so no further configuration is required.
 
@@ -64,6 +64,6 @@ so no further configuration is required.
 
 == Related Classes
 
-Both the 
xref:rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`] 
and
-xref:rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`]
 (internal) domain services query
+Both the 
xref:../rgfis/rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`]
 and
+xref:../rgfis/rgfis.adoc#_rgfis_spi_PublishingServiceInternal[`PublishingServiceInternal`]
 (internal) domain services query
 this object.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_CommandDtoServiceInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_CommandDtoServiceInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_CommandDtoServiceInternal.adoc
index 32a9a4e..a0e3e32 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_CommandDtoServiceInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_CommandDtoServiceInternal.adoc
@@ -7,9 +7,9 @@
 
 The `CommandDtoServiceInternal` is responsible for creating an memento of the 
current action
 invocation or property edit, to store in the `Command` object (from
-xref:rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`]).  This memento is 
a JAXB DTO being an instance of the
-xref:rgcms.adoc#_rgcms_schema-cmd["cmd" schema], so can be reified so that its 
execution can be deferred until later,
-as a xref:rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[background command].
+xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`]).  This 
memento is a JAXB DTO being an instance of the
+xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd["cmd" schema], so can be reified so 
that its execution can be deferred until later,
+as a xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[background 
command].
 
 
 
@@ -43,13 +43,13 @@ public interface CommandDtoServiceInternal {
 }
 ----
 <1> Note that this method (more precisely, `ActionInvocationMemento`) does 
__not__ support mixins.
-<2> Returns a JAXB DTO being an instance of the 
xref:rgcms.adoc#_rgcms_schema-cmd["cmd" schema] (hence convertible to
+<2> Returns a JAXB DTO being an instance of the 
xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd["cmd" schema] (hence convertible to
 XML) that represents the __intention__ to invoke an action on a target object 
(or possibly many targets, for
 bulk actions).  If an action, it can also be either mixin action or a 
contributed action.
 <3> Returns a JAXB DTO that represents the intention to edit (set or clear) a 
property on a target (or possibly many
 targets, for symmetry with actions).
-<4> add the arguments of an action to an `ActionDto`.  This is used when the 
command is actually executed (per 
xref:rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`]) to 
populate the parameters of the equivalent `ActionInvocationDto`.
-<5> add the new value argument of a property to a `PropertyDto`.  This is used 
when the command is actually executed (per 
xref:rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`]) to set the 
the new value of the equivalent `PropertyEditDto`.
+<4> add the arguments of an action to an `ActionDto`.  This is used when the 
command is actually executed (per 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`]) 
to populate the parameters of the equivalent `ActionInvocationDto`.
+<5> add the new value argument of a property to a `PropertyDto`.  This is used 
when the command is actually executed (per 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`]) 
to set the the new value of the equivalent `PropertyEditDto`.
 
 
 The SPI is implemented by 
`o.a.i.c.r.s.command.CommandDtoServiceInternalServiceDefault`.
@@ -58,5 +58,5 @@ The SPI is implemented by 
`o.a.i.c.r.s.command.CommandDtoServiceInternalServiceD
 == Related Services
 
 The design of this service is similar to that of
-xref:rgfis.adoc#_rgfis_spi_InteractionDtoServiceInternal[`InteractionDtoServiceInternal`],
 used to create the
-`MemberExecutionDto` (from the xref:rgcms.adoc#_rgcms_schema-ixn["ixn" 
schema]).
+xref:../rgfis/rgfis.adoc#_rgfis_spi_InteractionDtoServiceInternal[`InteractionDtoServiceInternal`],
 used to create the
+`MemberExecutionDto` (from the 
xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn["ixn" schema]).

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ContentNegotiationService.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ContentNegotiationService.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ContentNegotiationService.adoc
index 09506ef..3bd00cc 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ContentNegotiationService.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_ContentNegotiationService.adoc
@@ -26,7 +26,7 @@ If the underlying tables change (as the result of a change in 
their correspondin
 +
 The `ContentNegotiationService` is responsible for inspecting the HTTP 
`Accept` header, and use this to select the correct representation to render.  +
 +
-The Apache Isis framework provides three implementations of 
`ContentNegotiationService` which inspects different elements of the HTTP 
`Accept` header.  One of these implementations, 
`ContentNegotiationServiceXRoDomainType` will further delegate down to the 
companion 
xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`] 
service (if configured/available), based on the value of the "x-ro-domain-type" 
parameter of the header. +
+The Apache Isis framework provides three implementations of 
`ContentNegotiationService` which inspects different elements of the HTTP 
`Accept` header.  One of these implementations, 
`ContentNegotiationServiceXRoDomainType` will further delegate down to the 
companion 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]
 service (if configured/available), based on the value of the 
"x-ro-domain-type" parameter of the header. +
 +
 A typical implementation of `ContentMappingService` will convert the domain 
object into some sort of DTO (data transfer object) as specified by the 
"x-ro-domaintype".  If this DTO is annotated with JAXB or Jackson mappings, 
then the RO viewer (courtesy of the underlying 
link:http://resteasy.jboss.org/[RestEasy] framework) can serialize these 
directly. +
 +
@@ -113,7 +113,7 @@ As discussed in the introduction, the framework also 
provides three implementati
 ** 
`application/xml;profile=urn:org.restfulobjects:repr-types/action-result;x-ro-domain-type=...`
 
 
-The value of the `x-ro-domain-type` parameter corresponds to the DTO to be 
mapped into by the 
xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`].
+The value of the `x-ro-domain-type` parameter corresponds to the DTO to be 
mapped into by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`].
 
 If the DTO is annotated with JAXB, then also note that the runtime type must 
be annotated with the JAXB `javax.xml.bind.annotation.XmlRootElement` so that 
RestEasy is able to unambiguously serialize it.
 
@@ -171,14 +171,14 @@ 
image::{_imagesdir}reference-services-spi/ContentNegotiationService/accept-json.
 [_rgfis_spi_ContentNegotiationService_Configuration]]
 == Configuration
 
-The default `ContentNegotiationServiceXRoDomainType` implementation provides a 
xref:rgcfg.adoc#_rgcfg_configuring-core[configuration property] which controls 
whether a mapped domain object is pretty-printed (formatted, indented) or not:
+The default `ContentNegotiationServiceXRoDomainType` implementation provides a 
xref:../rgcfg/rgcfg.adoc#_rgcfg_configuring-core[configuration property] which 
controls whether a mapped domain object is pretty-printed (formatted, indented) 
or not:
 
 [source,ini]
 ----
 isis.services.ContentNegotiationServiceXRoDomainType.prettyPrint=true
 ----
 
-If the property is not set, then the default depends on the 
xref:rgcfg.adoc#_rgcfg_deployment-types[deployment type]; production mode will 
disable pretty printing, while prototyping mode will enable it.
+If the property is not set, then the default depends on the 
xref:../rgcfg/rgcfg.adoc#_rgcfg_deployment-types[deployment type]; production 
mode will disable pretty printing, while prototyping mode will enable it.
 
 
 
@@ -187,18 +187,18 @@ If the property is not set, then the default depends on 
the xref:rgcfg.adoc#_rgc
 == Registering the Services
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' default
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' default
 implementations of `ContentNegotiationService` service are automatically 
registered and injected (it is annotated with
 `@DomainService`) so no further configuration is required.
 
 To use an alternative implementation, use
-xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
-in the xref:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
+xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
+in the 
xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
 
 
 
 == Related Services
 
-The default implementation of `ContentNegotiationService` delegates to 
xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`] (if 
present) to convert domain entities into a stable form (eg DTO).
+The default implementation of `ContentNegotiationService` delegates to 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]
 (if present) to convert domain entities into a stable form (eg DTO).
 
-The `ContentNegotiationService` is itself called by the (default 
implementation of) 
xref:rgfis.adoc#_rgfis_spi_RepresentationService[`RepresentationService`].
\ No newline at end of file
+The `ContentNegotiationService` is itself called by the (default 
implementation of) 
xref:../rgfis/rgfis.adoc#_rgfis_spi_RepresentationService[`RepresentationService`].
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_InteractionDtoServiceInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_InteractionDtoServiceInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_InteractionDtoServiceInternal.adoc
index c7680a4..fd7c6c8 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_InteractionDtoServiceInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_InteractionDtoServiceInternal.adoc
@@ -6,7 +6,7 @@
 
 
 
-The `InteractionDtoServiceInternal` internal domain service is used by the 
framework to create and update DTOs representing member executions, ie the 
invocation of an action or the editing of a property.  The DTO is in all cases 
a subclass of `MemberExecutionDto`, from the 
xref:rgcms.adoc#_rgcms_schema-ixn["ixn" schema], and subsequently accessible 
from the `Interaction` object (per the 
xref:rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] service).
+The `InteractionDtoServiceInternal` internal domain service is used by the 
framework to create and update DTOs representing member executions, ie the 
invocation of an action or the editing of a property.  The DTO is in all cases 
a subclass of `MemberExecutionDto`, from the 
xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn["ixn" schema], and subsequently 
accessible from the `Interaction` object (per the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] 
service).
 
 
 == SPI & Implementation
@@ -31,7 +31,7 @@ public interface InteractionDtoServiceInternal {
 }
 ----
 <1> called by the framework when invoking an action, to create a DTO capturing 
the details of the action invocation (target, arguments etc).
-<2> called by the framework when editing a property, to create a DTO (for the 
xref:rgcms.adoc#_rgcms_schema-ixn["ixn" schema]) capturing the details of the 
property edit (target, new value etc).
+<2> called by the framework when editing a property, to create a DTO (for the 
xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn["ixn" schema]) capturing the details 
of the property edit (target, new value etc).
 <3> called by the framework to attach the result of an action invocation to 
the aforementioned DTO.
 
 The service is implemented by 
`o.a.i.core.runtime.services.ixn.InteractionDtoServiceInternalDefault`.
@@ -40,5 +40,5 @@ The service is implemented by 
`o.a.i.core.runtime.services.ixn.InteractionDtoSer
 == Related Services
 
 The design of this service is similar to that of
-xref:rgfis.adoc#_rgfis_spi_CommandDtoServiceInternal[`CommandDtoServiceInternal`],
 used to create the `CommandDto`
-(from the xref:rgcms.adoc#_rgcms_schema-cmd["cmd" schema]).
+xref:../rgfis/rgfis.adoc#_rgfis_spi_CommandDtoServiceInternal[`CommandDtoServiceInternal`],
 used to create the `CommandDto`
+(from the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd["cmd" schema]).

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_MessageBrokerServiceInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_MessageBrokerServiceInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_MessageBrokerServiceInternal.adoc
index b9d79fe..88b89cc 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_MessageBrokerServiceInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_MessageBrokerServiceInternal.adoc
@@ -6,7 +6,7 @@
 
 
 The (internal) `MessageBrokerServiceInternal` domain service is a wrapper 
around
-xref:rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`].
+xref:../rgsvc/rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`].
 
 
 [NOTE]
@@ -39,6 +39,6 @@ The framework provides two implementations:
 
 * `MessageBrokerServiceInternalDefault` is provided by `isis-core-runtime`, 
and is used during normal use and integration tests
 
-* `MessageBrokerServiceInternalNoop` is provided as a fallback by 
`isis-core-metamodel`, and is provided to allow the xref:rgmvn.adoc[maven 
plugin] to be bootstrapped without any "backend" database.
+* `MessageBrokerServiceInternalNoop` is provided as a fallback by 
`isis-core-metamodel`, and is provided to allow the 
xref:../rgmvn/rgmvn.adoc[maven plugin] to be bootstrapped without any "backend" 
database.
 
 The `...Default` implementation takes priority over the `...Noop` 
implementation.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PersistenceSessionServiceInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PersistenceSessionServiceInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PersistenceSessionServiceInternal.adoc
index fdf048c..a7aee62 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PersistenceSessionServiceInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PersistenceSessionServiceInternal.adoc
@@ -91,6 +91,6 @@ The framework provides two implementations:
 
 * `PersistenceSessionServiceInternalDefault` is provided by 
`isis-core-runtime`, and is used during normal use and integration tests
 
-* `PersistenceSessionServiceInternalNoop` is provided as a fallback by 
`isis-core-metamodel`, and is provided to allow the xref:rgmvn.adoc[maven 
plugin] to be bootstrapped without any "backend" database.
+* `PersistenceSessionServiceInternalNoop` is provided as a fallback by 
`isis-core-metamodel`, and is provided to allow the 
xref:../rgmvn/rgmvn.adoc[maven plugin] to be bootstrapped without any "backend" 
database.
 
 The `...Default` implementation takes priority over the `...Noop` 
implementation.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PublishingServiceInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PublishingServiceInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PublishingServiceInternal.adoc
index c9e1550..faab58e 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PublishingServiceInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_PublishingServiceInternal.adoc
@@ -6,14 +6,14 @@
 
 
 The (internal) `PublishingServiceInternal` domain service acts as an internal 
facade to any
-configured xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] or 
(deprecated)
-xref:rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] domain 
services.
+configured 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] or 
(deprecated)
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] 
domain services.
 
 For published action invocations/ property edits, it provides an API for those 
member executions to call.
 
 For published objects, it provides an API for the framework to call at the end 
of the interaction; it obtains details
 of the changed objects (from the
-xref:rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`])
 and filters them to just
+xref:../rgfis/rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`])
 and filters them to just
 those objects that are to be published; these are then passed through to any 
configured `PublisherService` or
 `PublishingService` implementations.
 
@@ -39,17 +39,17 @@ public class PublishingServiceInternal {
 }
 ----
 <1> to publish an action invocation, as represented by the specified member 
`Execution` parameter and with the
-xref:rgant.adoc#_rgant-Action_publishing[`@Action#publishing()`] annotation 
attribute or equivalent, to any configured
-xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  The 
`Execution` object will be an instance of
-`ActionInvocation` (see 
xref:rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] for 
details).
+xref:../rgant/rgant.adoc#_rgant-Action_publishing[`@Action#publishing()`] 
annotation attribute or equivalent, to any configured
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  The 
`Execution` object will be an instance of
+`ActionInvocation` (see 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] 
for details).
 <2> the remaining parameters are to support the publishing of the action to 
any configured
-xref:rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] services 
(deprecated).
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] 
services (deprecated).
 <3> to publish a property edit, as as represented by the specified member 
`Execution` parameter and with the
-xref:rgant.adoc#_rgant-Property_publishing[`@Property#publishing()`] 
annotation attribute or equivalent, to any
-configured xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  
The `Execution` object will be an instance
-of `PropertyEdit` (see 
xref:rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] for 
details).
+xref:../rgant/rgant.adoc#_rgant-Property_publishing[`@Property#publishing()`] 
annotation attribute or equivalent, to any
+configured 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  The 
`Execution` object will be an instance
+of `PropertyEdit` (see 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] 
for details).
 <4> to publish all changed objects that are to be published (with the
-xref:rgant.adoc#_rgant-DomainObject_publishing[`@DomainObject#publishing()`] 
annotation attribute or equivalent).
+xref:../rgant/rgant.adoc#_rgant-DomainObject_publishing[`@DomainObject#publishing()`]
 annotation attribute or equivalent).
 
 
 The service implementation is 
`o.a.i.c.m.s.publishing.PublishingServiceInternal`.
@@ -59,7 +59,7 @@ The service implementation is 
`o.a.i.c.m.s.publishing.PublishingServiceInternal`
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' default
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' default
 implementation of `PublishingServiceInternal` class is automatically 
registered (it is annotated with `@DomainService`)
 so no further configuration is required.
 
@@ -67,10 +67,10 @@ so no further configuration is required.
 == Related Classes
 
 The service delegates between the (internal)
-xref:rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 domain service to the
-configured xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] and
- xref:rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
+xref:../rgfis/rgfis.adoc#_rgfis_spi_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]
 domain service to the
+configured 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] and
+ xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
 
-The (internal) 
xref:rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`] 
performs a similar
-function for the 
xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`], also collating 
details of the
+The (internal) 
xref:../rgfis/rgfis.adoc#_rgfis_spi_AuditingServiceInternal[`AuditingServiceInternal`]
 performs a similar
+function for the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`], also 
collating details of the
 changed objects from `ChangedObjectsServiceInternal`.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_RepresentationService.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_RepresentationService.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_RepresentationService.adoc
index 76eac5a..8977f1a 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_RepresentationService.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_RepresentationService.adoc
@@ -9,11 +9,11 @@
 
 The `RepresentationService` is the main plug-in point for the 
xref:ugvro.adoc#[RestfulObjects viewer] to generate representations.
 
-The default implementation generates representations according to the 
link:http://restfulobjects.org[Restful Objects spec] v1.0.  However, it also 
delegates to the 
xref:rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]
 which provides a mechanism for altering representations according to the HTTP 
`Accept` header.
+The default implementation generates representations according to the 
link:http://restfulobjects.org[Restful Objects spec] v1.0.  However, it also 
delegates to the 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]
 which provides a mechanism for altering representations according to the HTTP 
`Accept` header.
 
 The principal motivation is to allow more flexible representations to be 
generated for REST clients that (perhaps through their use of a certain 
Javascript library, say) expect, or at least works best with, a certain style 
of representation.
 
-In all there are three domain services that can influence the representations 
generated: this service, 
xref:rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]and
 the xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]. 
 The diagram below shows how these collaborate:
+In all there are three domain services that can influence the representations 
generated: this service, 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]and
 the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`].
  The diagram below shows how these collaborate:
 
 
image::{_imagesdir}reference-services-spi/RepresentationService/service-collaborations.png[width="700px",link="{_imagesdir}reference-services-spi/RepresentationService/service-collaborations.png"]
 
@@ -75,21 +75,21 @@ ie `MemberReprMode`
 
 == Implementation
 
-As discussed in the introduction, the framework provides a default 
implementation, 
`o.a.i.v.ro.rendering.service.RepresentationServiceContentNegotiator`.   This 
delegates to 
xref:rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]
 to generate an alternative representation; but if none is provided then it 
falls back on generating the representations as defined in the 
link:http://restfulobjects.org[Restful Objects spec] v1.0.
+As discussed in the introduction, the framework provides a default 
implementation, 
`o.a.i.v.ro.rendering.service.RepresentationServiceContentNegotiator`.   This 
delegates to 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]
 to generate an alternative representation; but if none is provided then it 
falls back on generating the representations as defined in the 
link:http://restfulobjects.org[Restful Objects spec] v1.0.
 
 To use an alternative implementation, use
-xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
-in the xref:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
+xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
+in the 
xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
 
 
 == Registering the Services
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' default implementation of `RepresentationService` service is 
automatically registered and injected (it is annotated with `@DomainService`) 
so no further configuration is required.
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' default implementation of `RepresentationService` 
service is automatically registered and injected (it is annotated with 
`@DomainService`) so no further configuration is required.
 
 
 
 
 == Related Services
 
-The default implementation delegates to 
xref:rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`],
 whose default implementation may delegate in turn to 
xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`] (if 
present).
\ No newline at end of file
+The default implementation delegates to 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`],
 whose default implementation may delegate in turn to 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]
 (if present).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_TransactionStateProviderInternal.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_TransactionStateProviderInternal.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_TransactionStateProviderInternal.adoc
index 5112df1..655f8d0 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_TransactionStateProviderInternal.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_spi_TransactionStateProviderInternal.adoc
@@ -10,7 +10,7 @@ state of the current transaction.
 
 [NOTE]
 ====
-The service will probably be combined with 
xref:rgsvc.adoc#_rgsvc_api_TransactionService[`TransactionService`]
+The service will probably be combined with 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_TransactionService[`TransactionService`]
 in the future.
 ====
 
@@ -33,6 +33,6 @@ The framework provides two implementations:
 
 * `TransactionStateProviderInternalDefault` is provided by 
`isis-core-runtime`, and is used during normal use and integration tests
 
-* `TransactionStateProviderInternalNoop` is provided as a fallback by 
`isis-core-metamodel`, and is provided to allow the xref:rgmvn.adoc[maven 
plugin] to be bootstrapped without any "backend" database.
+* `TransactionStateProviderInternalNoop` is provided as a fallback by 
`isis-core-metamodel`, and is provided to allow the 
xref:../rgmvn/rgmvn.adoc[maven plugin] to be bootstrapped without any "backend" 
database.
 
 The `...Default` implementation takes priority over the `...Noop` 
implementation.

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
index 32bc0ce..614872d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
@@ -13,17 +13,17 @@ Use to verify at build time that the metamodel of an 
application is valid.  This
 
 * `swagger` +
 +
-Uses the xref:rgsvc.adoc#_rgsvc_api_SwaggerService[`SwaggerService`] to 
generate link:http://swagger.io[Swagger] spec files that describe the public 
and/or private RESTful APIs exposed by the xref:ugvro.adoc#[RestfulObjects 
viewer].
+Uses the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_SwaggerService[`SwaggerService`] 
to generate link:http://swagger.io[Swagger] spec files that describe the public 
and/or private RESTful APIs exposed by the xref:ugvro.adoc#[RestfulObjects 
viewer].
 
 * `xsd` +
 +
-Uses the xref:rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbService`] to generate XSD 
schemas from any JAXB-annotated view models/DTOs. +
+Uses the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbService`] to 
generate XSD schemas from any JAXB-annotated view models/DTOs. +
 +
-This is instead of and preferable to using the JAXB 
link:https://jaxb.java.net/2.2.4/docs/schemagen.html[schemagen] tool, because 
it uses the framework's support (via 
xref:rgant.adoc#_rgant-XmlJavaTypeAdapter[`@XmlJavaTypeAdapter`]) to translate 
any references to domain objects into ``OidDto``s (as defined by the Apache 
Isis xref:rgcms.adoc#_rgcms_schema-common[common schema]).
+This is instead of and preferable to using the JAXB 
link:https://jaxb.java.net/2.2.4/docs/schemagen.html[schemagen] tool, because 
it uses the framework's support (via 
xref:../rgant/rgant.adoc#_rgant-XmlJavaTypeAdapter[`@XmlJavaTypeAdapter`]) to 
translate any references to domain objects into ``OidDto``s (as defined by the 
Apache Isis xref:../rgcms/rgcms.adoc#_rgcms_schema-common[common schema]).
 
 The `validate` goal is by default bound to the `test` phase, and the `swagger` 
goal is by default bound to the `package` phase; both are typically of your 
application's `dom` sub-module.  The `xsd` goal meanwhile defaults to the 
`generate-resources` phase, and this is generally used in a completely separate 
sub-module.  An example can be found in the (non-ASF) 
http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] example 
app; the separate submodule that uses the `xsd` goal is (also) called 
`todoapp-xsd`.
 
-All of these goals require an 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`] to 
point the plugin at, so that
+All of these goals require an 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`]
 to point the plugin at, so that
 it knows how to bootstrap an Isis runtime.  This is discussed below, followed 
by sections on configuring the two goals.
 
 
@@ -31,14 +31,14 @@ it knows how to bootstrap an Isis runtime.  This is 
discussed below, followed by
 [[__rgmvn_intro_app-manifest]]
 == `AppManifest`
 
-As noted in the introduction, all the goals require an 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`]
+As noted in the introduction, all the goals require an 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`]
 to point the plugin at, so that it knows how to bootstrap an Isis runtime.
 
 This can be extremely minimal; it isn't necessary to use the main 
`AppManifest` (in the `app` module) used to
 bootstrap the application, you can instead use a cut-down one.  This then 
allows the plugins to be run during the
 build of the `dom` module, rather than having to run in the context of the 
`integtest` module.
 
-For example, the 
xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp]'s
+For example, the 
xref:../ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp]'s
 manifest is:
 
 [source,java]

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
index 7c5ee80..44cf269 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
@@ -6,7 +6,7 @@
 :toc: right
 
 
-The `swagger` goal of the `isis-maven-plugin` uses the 
xref:rgsvc.adoc#_rgsvc_api_SwaggerService[`SwaggerService`] to
+The `swagger` goal of the `isis-maven-plugin` uses the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_SwaggerService[`SwaggerService`] to
 generate link:http://swagger.io[Swagger] spec files to describe the public 
and/or private RESTful APIs exposed by the xref:ugvro.adoc#[RestfulObjects 
viewer].
 
 These spec files, once generated, can then be used in the build pipeline to 
generate client-side stubs, typically using Swagger's own 
link:https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen-maven-plugin[swagger-codegen-maven]
 plugin.
@@ -88,7 +88,7 @@ Update the `pom.xml` (in your project's `integtest` module):
 ----
 <1> the profile is active by default, though can be disabled using 
`-Dskip.isis-swagger`
 <2> set to `1.11.0` (or any later version)
-<3> the manifest discussed 
xref:rgmvn.adoc#_rgmvn_intro_app-manifest[previously]; adjust as required
+<3> the manifest discussed 
xref:../rgmvn/rgmvn.adoc#_rgmvn_intro_app-manifest[previously]; adjust as 
required
 <4> the visibilities to create (one swagger spec file per visibility listed)
 <5> which file format to generate the spec files as.
 <6> the `dom` module for the project; adjust as required

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
index 4f42bfb..d086a48 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
@@ -32,7 +32,7 @@ different configuration; see the final section for 
differences.
 
 == `dom` submodule
 
-Update the `pom.xml` (we recommend in your project's `dom` module, and with a 
xref:rgmvn.adoc#_rgmvn_intro_app-manifest[minimal AppManifest]):
+Update the `pom.xml` (we recommend in your project's `dom` module, and with a 
xref:../rgmvn/rgmvn.adoc#_rgmvn_intro_app-manifest[minimal AppManifest]):
 
 [source,xml]
 ----
@@ -80,7 +80,7 @@ Update the `pom.xml` (we recommend in your project's `dom` 
module, and with a xr
 ----
 <1> the profile is active by default, though can be disabled using 
`-Dskip.isis-validate`
 <2> set to `1.10.0` (or any later version)
-<3> the manifest discussed 
xref:rgmvn.adoc#_rgmvn_intro_app-manifest[previously]; adjust as required
+<3> the manifest discussed 
xref:../rgmvn/rgmvn.adoc#_rgmvn_intro_app-manifest[previously]; adjust as 
required
 <4> the `dom` module for the project; adjust as required
 <5> binds the plugin's `validate` goal to the Maven `test` lifecycle phase (ie 
the goal will be called when `mvn test` is run).
 
@@ -110,7 +110,7 @@ mvn test -Dskip.isis-validate
 
 == Example of failure
 
-In the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp] 
application the `SimpleObject` defines an `updateName` action.  This has a 
supporting method:
+In the 
xref:../ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp] 
application the `SimpleObject` defines an `updateName` action.  This has a 
supporting method:
 
 
 [source,java]

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
index 5982bd5..d4580f7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
@@ -6,13 +6,13 @@
 :toc: right
 
 
-The `xsd` goal of the `isis-maven-plugin` uses the 
xref:rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbService`] to
+The `xsd` goal of the `isis-maven-plugin` uses the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbService`] to
 generate XSD schemas from any JAXB-annotated 
xref:ugbtb.adoc#_ugbtb_view-models[view model/DTOs].
 
 This is instead of and preferable to using the JAXB 
link:https://jaxb.java.net/2.2.4/docs/schemagen.html[schemagen]
 tool, because it uses the framework's support (via
-xref:rgant.adoc#_rgant-XmlJavaTypeAdapter[`@XmlJavaTypeAdapter`]) to translate 
any references to domain
-objects into ``OidDto``s (as defined by the Apache Isis 
xref:rgcms.adoc#_rgcms_schema-common[common schema]).
+xref:../rgant/rgant.adoc#_rgant-XmlJavaTypeAdapter[`@XmlJavaTypeAdapter`]) to 
translate any references to domain
+objects into ``OidDto``s (as defined by the Apache Isis 
xref:../rgcms/rgcms.adoc#_rgcms_schema-common[common schema]).
 
 The `xsd` goal defines the following properties:
 
@@ -26,11 +26,11 @@ Defaults to `generated-resources/isis-xsd`
 
 * `separate` - (optional) whether to create separate directories for each 
JAXB-class. +
 +
-Defaults to `false`.  Most DTO classes will reference one another or the 
xref:rgcms.adoc#_rgcms_schema-common[common schema].  Normally it's fine to 
merge all these XSDs together.  This property, if set, results in each a 
separate directory for each generation of its XSD or XSDs.
+Defaults to `false`.  Most DTO classes will reference one another or the 
xref:../rgcms/rgcms.adoc#_rgcms_schema-common[common schema].  Normally it's 
fine to merge all these XSDs together.  This property, if set, results in each 
a separate directory for each generation of its XSD or XSDs.
 
 * `commonSchemas` - (optional) whether to also generate the isis common 
schema(s). +
 +
-Defaults to `false`; if set then the call to 
xref:rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbService`] will set 
`IsisSchemas.INCLUDE` flag.
+Defaults to `false`; if set then the call to 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbService`] will set 
`IsisSchemas.INCLUDE` flag.
 
 As a convenience to any (Java) consumers, the XSDs generated from the view 
models can then in turn be generated
 into DTOs.  The original view models and these DTOs are similar but not 
identical: while the view models can only be used

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_AcceptHeaderService.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_AcceptHeaderService.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_AcceptHeaderService.adoc
index 38bc76c..f3fac0b 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_AcceptHeaderService.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_AcceptHeaderService.adoc
@@ -5,13 +5,13 @@
 :_imagesdir: images/
 
 
-The `AcceptHeaderService` domain service is a 
xref:rgant.adoc#_rgant-RequestScoped[`@RequestScoped`] service that
+The `AcceptHeaderService` domain service is a 
xref:../rgant/rgant.adoc#_rgant-RequestScoped[`@RequestScoped`] service that
 simply exposes the HTTP `Accept` header to the domain.  Its intended use is to 
support multiple versions of a REST API, where the responsibility for content 
negotiation (determining which version of the REST API is to be used) is 
managed by logic in the domain objects themselves.
 
 [NOTE]
 ====
-As an alternative to performing content negotiation within the domain classes, 
the 
xref:rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]
 and
-xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`] SPI 
domain services allow the framework to perform the content negotiation 
responsibility.
+As an alternative to performing content negotiation within the domain classes, 
the 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiationService`]
 and
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]
 SPI domain services allow the framework to perform the content negotiation 
responsibility.
 ====
 
 == API & Implementation
@@ -27,7 +27,7 @@ public interface AcceptHeaderService {
     List<MediaType> getAcceptableMediaTypes();      // <2>
 }
 ----
-<1> is xref:rgant.adoc#_rgant-RequestScoped[`@RequestScoped`], so this domain 
service instance is scoped to a particular request and is then destroyed
+<1> is xref:../rgant/rgant.adoc#_rgant-RequestScoped[`@RequestScoped`], so 
this domain service instance is scoped to a particular request and is then 
destroyed
 <2> returns the list of media types found in the HTTP Accept header.
 
 
@@ -49,7 +49,7 @@ The diagram below illustrated this:
 
 
image::{_imagesdir}reference-services-api/acceptheaderservice.png[width="700px",link="{_imagesdir}reference-services-api/acceptheaderservice.png"]
 
-The REST request is submitted to a domain service with a 
xref:rgant.adoc#_rgant-DomainService_nature[nature] of `VIEW_REST_ONLY` 
(`MyRestApi` in the diagram).  This uses the `AcceptHeaderService` to obtain 
the values of the
+The REST request is submitted to a domain service with a 
xref:../rgant/rgant.adoc#_rgant-DomainService_nature[nature] of 
`VIEW_REST_ONLY` (`MyRestApi` in the diagram).  This uses the 
`AcceptHeaderService` to obtain the values of the
 HTTP `Accept` header.  Based on this it delegates to the appropriate 
underlying domain service (with a nature of
 `DOMAIN` so that they are not exposed in the REST API at all).
 
@@ -60,7 +60,7 @@ type/subtype, eg `application/vnd.myrestapi-v1+json`; an 
alternative is to use a
 `application/json;x-my-rest-api-version=1` (where `x-my-rest-api-version` is 
the media type parameter).
 
 The Restful Objects specification does this something similar with its own 
`x-ro-domain-type` media type parameter;
-this is used by the 
xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`] to 
determine how to
+this is used by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]
 to determine how to
 map domain objects to view models/DTOs.
 ====
 
@@ -70,10 +70,10 @@ map domain objects to view models/DTOs.
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' default
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' default
 implementation of `AcceptHeaderService` class is automatically registered (it 
is annotated with `@DomainService`)
 so no further configuration is required.
 
 To use an alternative implementation, use
-xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
-in the xref:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
+xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
+in the 
xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ActionInvocationContext.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ActionInvocationContext.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ActionInvocationContext.adoc
index b9f4458..0d84ae4 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ActionInvocationContext.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ActionInvocationContext.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The `ActionInvocationContext` domain service is a 
xref:rgant.adoc#_rgant-RequestScoped[`@RequestScoped`] service intended to 
support the implementation of "bulk" actions annotated with 
xref:rgant.adoc#_rgant-Action_invokeOn[`@Action#invokeOn()`].  This allows the 
user to select multiple objects in a table and then invoke the same action 
against all of them.
+The `ActionInvocationContext` domain service is a 
xref:../rgant/rgant.adoc#_rgant-RequestScoped[`@RequestScoped`] service 
intended to support the implementation of "bulk" actions annotated with 
xref:../rgant/rgant.adoc#_rgant-Action_invokeOn[`@Action#invokeOn()`].  This 
allows the user to select multiple objects in a table and then invoke the same 
action against all of them.
 
 When an action is invoked in this way, this service allows each object 
instance to "know where it is" in the collection; it acts a little like an 
iterator.  In particular, an object can determine if it is the last object to 
be called, and so can perform special processing, eg to return a summary 
calculated result.
 
@@ -27,7 +27,7 @@ public static class ActionInvocationContext {
     public boolean isLast() { ... }
 }
 ----
-<1> is xref:rgant.adoc#_rgant-RequestScoped[`@RequestScoped`], so this domain 
service instance is scoped to a particular request and is then destroyed
+<1> is xref:../rgant/rgant.adoc#_rgant-RequestScoped[`@RequestScoped`], so 
this domain service instance is scoped to a particular request and is then 
destroyed
 <2> an enum set to either `OBJECT` (if action has been invoked on a single 
object) or `COLLECTION` (if has been invoked on a collection).
 <3> returns the list of domain objects which are being acted upon
 <4> is the 0-based index to the object being acted upon.
@@ -38,7 +38,7 @@ public static class ActionInvocationContext {
 
 For actions that are void or that return null, Apache Isis will return to the 
list once executed. But for bulk actions that are non-void, Apache Isis will 
render the returned object/value from the last object invoked (and simply 
discards the object/value of all actions except the last).
 
-One idiom is for the domain objects to also use the 
xref:rgsvc.adoc#_rgsvc_api_Scratchpad[`Scratchpad`] service to share 
information, for example to aggregate values. The 
`ActionInvocationContext#isLast()` method can then be used to determine if all 
the information has been gathered, and then do something with it (eg derive 
variance across a range of values, render a graph etc).
+One idiom is for the domain objects to also use the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_Scratchpad[`Scratchpad`] service to share 
information, for example to aggregate values. The 
`ActionInvocationContext#isLast()` method can then be used to determine if all 
the information has been gathered, and then do something with it (eg derive 
variance across a range of values, render a graph etc).
 
 More prosaically, the `ActionInvocationContext` can be used to ensure that the 
action behaves appropriately depending on how it has been invoked (on a single 
object and/or a collection) whether it is called in bulk mode or regular mode. 
Here's a snippet of code from the bulk action in the Isis addon example 
https://github.com/isisaddons/isis-app-todoapp/[todoapp] (not ASF):
 
@@ -66,13 +66,13 @@ public class ToDoItem ... {
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' default
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' default
 implementation of `ActionInvocationContext` class is automatically registered 
(it is annotated with `@DomainService`)
 so no further configuration is required.
 
 To use an alternative implementation, use
-xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
-in the xref:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
+xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
+in the 
xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ApplicationFeatureRepository.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ApplicationFeatureRepository.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ApplicationFeatureRepository.adoc
index 489b01e..f3b5df1 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ApplicationFeatureRepository.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ApplicationFeatureRepository.adoc
@@ -50,13 +50,13 @@ These methods are designed primarily to return lists of 
strings for use in drop-
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' core
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' core
 implementation of `ApplicationFeatureRepository` service is automatically 
registered and injected (it is annotated with
 `@DomainService`) so no further configuration is required.
 
 To use an alternative implementation, use
-xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
-in the xref:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
+xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
+in the 
xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
 
 
 == Related Services

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BackgroundService.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BackgroundService.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BackgroundService.adoc
index fcc31aa..103724f 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BackgroundService.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BackgroundService.adoc
@@ -6,14 +6,14 @@
 
 
 The `BackgroundService2` domain service, and also the companion
-xref:rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService2`]
 SPI service, enable commands
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService2`]
 SPI service, enable commands
 to be persisted such that they may be invoked in the background.
 
 The `BackgroundService2` is responsible for capturing a memento representing 
the command in a typesafe way,
 and persisting it rather than executing it directly.
 
 The default `BackgroundServiceDefault` implementation works by using a proxy 
wrapper around the target so that it can
-capture the action to invoke and its arguments.  (As of `1.13.0`), this is 
done using 
xref:rgfis.adoc#_rgfis_spi_CommandDtoServiceInternal[`CommandDtoServiceInternal`]
 (in previous releases it used (a private copy of) 
xref:rgsvc.adoc#_rgsvc_api_MementoService[`MementoService`]).
+capture the action to invoke and its arguments.  (As of `1.13.0`), this is 
done using 
xref:../rgfis/rgfis.adoc#_rgfis_spi_CommandDtoServiceInternal[`CommandDtoServiceInternal`]
 (in previous releases it used (a private copy of) 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_MementoService[`MementoService`]).
 
 The persistence delegates the persistence of the memento to an appropriate 
implementation of the companion
 `BackgroundCommandService2`.  One such implementation of 
`BackgroundCommandService` is provided by (non-ASF)
@@ -21,7 +21,7 @@ http://github.com/isisaddons/isis-module-command[Isis addons' 
command] module.
 
 The persisting of commands is only half the story; there needs to be a 
separate process to read the commands and
 execute them. The `BackgroundCommandExecution` abstract class (discussed
-xref:rgsvc.adoc#_rgsvc_api_BackgroundService_BackgroundCommandExecution[below])
 provides infrastructure to do this;
+xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BackgroundService_BackgroundCommandExecution[below])
 provides infrastructure to do this;
 the concrete implementation of this class depends on the configured 
`BackgroundCommandService` (in order to query for
 the persisted (background) ``Command``s.
 
@@ -38,8 +38,8 @@ public interface BackgroundService2 {
     <T> T executeMixin(Class<T> mixinClass, Object mixedIn);    // <2>
 }
 ----
-<1> returns a proxy around the domain object; any methods executed against 
this proxy will result in a command (to invoke the corresponding action) being 
persisted by 
xref:rgsvc.adoc#_rgsvc_spi_BackgroundCommandService2[`BackgroundCommandService2`]
-<2> Returns a proxy around the mixin; any methods executed against this proxy 
will result in a command (to invoke the corresponding mixin action) being 
persisted by 
xref:rgsvc.adoc#_rgsvc_spi_BackgroundCommandService2[`BackgroundCommandService2`].
+<1> returns a proxy around the domain object; any methods executed against 
this proxy will result in a command (to invoke the corresponding action) being 
persisted by 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService2[`BackgroundCommandService2`]
+<2> Returns a proxy around the mixin; any methods executed against this proxy 
will result in a command (to invoke the corresponding mixin action) being 
persisted by 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService2[`BackgroundCommandService2`].
 
 The default implementation is provided by core 
(`o.a.i.core.runtime.services.background.BackgroundServiceDefault`).
 
@@ -63,13 +63,13 @@ public void submitCustomerInvoices() {
 
 This will create a bunch of background commands executing the 
`submitInvoice()` action for each of the customers returned from the customer 
repository.
 
-The action method invoked must be part of the Apache Isis metamodel, which is 
to say it must be public, accept only scalar arguments, and must not be 
annotated with xref:rgant.adoc#_rgant-Programmatic[`@Programmatic`] or 
`@Ignore`. However, it may be annotated with 
xref:rgant.adoc#_rgant-Action_hidden[`@Action#hidden()`] or 
xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] and it 
will still be invoked.
+The action method invoked must be part of the Apache Isis metamodel, which is 
to say it must be public, accept only scalar arguments, and must not be 
annotated with xref:../rgant/rgant.adoc#_rgant-Programmatic[`@Programmatic`] or 
`@Ignore`. However, it may be annotated with 
xref:../rgant/rgant.adoc#_rgant-Action_hidden[`@Action#hidden()`] or 
xref:../rgant/rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] 
and it will still be invoked.
 
 In fact, when invoked by the background service, no business rules (hidden, 
disabled, validation) are enforced; the action method must take responsibility 
for performing appropriate validation and error checking.
 
 [TIP]
 ====
-If you want to check business rules, you can use 
xref:rgant.adoc#_rgant-WrapperFactory[`@WrapperFactory#wrapNoExecute(...)`].
+If you want to check business rules, you can use 
xref:../rgant/rgant.adoc#_rgant-WrapperFactory[`@WrapperFactory#wrapNoExecute(...)`].
 ====
 
 
@@ -80,7 +80,7 @@ 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.adoc#_rgsvc_api_CommandContext[`CommandContext`] and 
xref:rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] domain services are 
configured, and the `CommandService` supports persistent commands.  Note that 
(non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' 
command] module does indeed provide such an implementation of `CommandService` 
(as well as of the required `BackgroundCommandService`).
+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_api_CommandContext[`CommandContext`] and 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] domain 
services are configured, and the `CommandService` supports persistent commands. 
 Note that (non-ASF) http://github.com/isisaddons/isis-module-command[Isis 
addons' 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.
 
@@ -97,7 +97,7 @@ public Command submitCustomerInvoices() {
 @Inject
 CommandContext commandContext;  // <1>
 ----
-<1> the injected xref:rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] 
domain service.
+<1> the injected 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] domain 
service.
 
 The user would be returned a domain object representing their action 
invocation.
 
@@ -107,26 +107,26 @@ The user would be returned a domain object representing 
their action invocation.
 == Registering the Services
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' core
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' core
 implementation of `BackgroundService` is automatically registered (it is 
annotated with `@DomainService`) so no
 further configuration is required.
 
 To use an alternative implementation, use
-xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
-in the xref:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
+xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
+in the 
xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
 
 
 
 == Related Services
 
-This service is closely related to the 
xref:rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] and also that 
service's supporting 
xref:rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] service.
+This service is closely related to the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] and also 
that service's supporting 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] 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. 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.adoc#_rgsvc_spi_CommandService[`CommandService`] and 
xref:rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService`]).
+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_spi_CommandService[`CommandService`] and 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService`]).
 
-The 
xref:rgfis.adoc#_rgfis_spi_CommandDtoServiceInternal[`CommandDtoServiceInternal`]
 is used to obtain
-a memento of the command such that it can be persisted.  (In earlier versions, 
xref:rgsvc.adoc#_rgsvc_api_MementoService[`MementoService`] was used for this 
purpose).
+The 
xref:../rgfis/rgfis.adoc#_rgfis_spi_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_api_MementoService[`MementoService`] was used 
for this purpose).
 
 
 
include::_rgsvc_api_BackgroundService_BackgroundCommandExecution.adoc[leveloffset=+1]

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BookmarkService.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BookmarkService.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BookmarkService.adoc
index 498b9b5..895c19a 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BookmarkService.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BookmarkService.adoc
@@ -9,7 +9,7 @@ The `BookmarkService2` API provides the ability to obtain a 
serializable ``o.a.i
 
 For example, a `Customer` object with:
 
-* an object type of "custmgmt.Customer" (as per 
xref:rgant.adoc#_rgant-DomainObject_objectType[`DomainObject#objectType()`] or 
equivalent) , and
+* an object type of "custmgmt.Customer" (as per 
xref:../rgant/rgant.adoc#_rgant-DomainObject_objectType[`DomainObject#objectType()`]
 or equivalent) , and
 * an id=123
 
 could correspond to a `Bookmark` with a string representation of 
`custmgmt.Customer|123`.
@@ -24,7 +24,7 @@ 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-auditing[Isis addons' auditing] 
module's implementation of
-xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] uses bookmarks to 
capture the object
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] uses 
bookmarks to capture the object
 that is being audited.
 
 [TIP]
@@ -100,13 +100,13 @@ 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.adoc#_rgsvc_api_BackgroundCommandService[`BackgroundCommandService`],
 which uses a
+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.adoc#_rgsvc_spi_PublishingService[`PublishingService`], and by the
+module's implementation of 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`], and 
by the
 (non-ASF) http://github.com/isisaddons/isis-module-auditing[Isis addons' 
auditing] module's implementation of
-xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`].
+xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`].
 
 
 
@@ -114,12 +114,12 @@ 
xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`].
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' core
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' core
 implementation of `BookmarkService` is automatically registered (it is 
annotated with `@DomainService`) so no further
 configuration is required.
 
 To use an alternative implementation, use
-xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
-in the xref:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
+xref:../rgant/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`]
 (as explained
+in the 
xref:../rgsvc/rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to 
this guide).
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BulkInteractionContext.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BulkInteractionContext.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BulkInteractionContext.adoc
index f31c631..cb210a8 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BulkInteractionContext.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_BulkInteractionContext.adoc
@@ -5,5 +5,5 @@
 :_imagesdir: images/
 
 
-This service is deprecated, replaced by 
xref:rgsvc.adoc#_rgsvc_api_ActionInvocationContext[`ActionInvocationContext`].
+This service is deprecated, replaced by 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_ActionInvocationContext[`ActionInvocationContext`].
 

http://git-wip-us.apache.org/repos/asf/isis/blob/252c2f8e/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ClockService.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ClockService.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ClockService.adoc
index 70c6be4..e9760c1 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ClockService.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_api_ClockService.adoc
@@ -49,8 +49,8 @@ The default `ClockService` implementation in fact simply 
delegates to another cl
 
 * there are two subclasses implementations `Clock`, namely `SystemClock` and 
`FixtureClock`.
 * the first implementation that is instantiated registers itself as the 
singleton.
-* if running in xref:rgcfg.adoc#_rgcfg_deployment-types[production] (server) 
mode, then (unless another implementation has beaten it to the punch) the 
framework will instantiate the ``SystemClock`.  Once instantiated this cannot 
be replaced.
-* if running in xref:rgcfg.adoc#_rgcfg_deployment-types[prototype] mode, then 
the framework will instead instantiate `FixtureClock`.  This _can_ be replaced 
if required.
+* if running in xref:../rgcfg/rgcfg.adoc#_rgcfg_deployment-types[production] 
(server) mode, then (unless another implementation has beaten it to the punch) 
the framework will instantiate the ``SystemClock`.  Once instantiated this 
cannot be replaced.
+* if running in xref:../rgcfg/rgcfg.adoc#_rgcfg_deployment-types[prototype] 
mode, then the framework will instead instantiate `FixtureClock`.  This _can_ 
be replaced if required.
 
 The `FixtureClock` will behave as the system clock, unless its is explicitly 
set using `FixtureClock#setDate(...)` or `FixtureClock#setTime(...)` and so 
forth.
 
@@ -93,7 +93,7 @@ public class NntpClockServiceInitializer  {
 == Registering the Service
 
 Assuming that the `configuration-and-annotation` services installer is 
configured (implicit if using the
-`AppManifest` to 
xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the app]) 
then Apache Isis' core
+`AppManifest` to 
xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[bootstrap the 
app]) then Apache Isis' core
 implementation of `ClockService` is automatically registered (it is annotated 
with `@DomainService`) so no further
 configuration is required.
 

Reply via email to