http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Mixin.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Mixin.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Mixin.adoc
index 92b1acf..03abb65 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Mixin.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Mixin.adoc
@@ -11,7 +11,7 @@ The `@Mixin` annotation indicates that the class acts as a 
mixin, contributing b
 Mixins were originally introduced as a means of allowing contributions from 
one module to the types of another module; in such cases the mixin type is 
often an interface type (eg `DocumentHolder`) that might be implemented by 
numerous different concrete types.
 However, mixins are also a convenient mechanism for grouping functionality 
even for a concrete type.
 
-For further discussion on using mixins, see 
xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] in the user guide.
+For further discussion on using mixins, see 
xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] in the user guide.
 
 The table below summarizes the annotation's attributes.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
index 6761765..bba6565 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout.adoc
@@ -96,7 +96,7 @@ public class ToDoItem {
 
 [NOTE]
 ====
-Note that there is (currently) no support for specifying UI hints for domain 
services through the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for 
properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain 
services through the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for 
properties, collections and actions are supported).
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_describedAs.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_describedAs.adoc
index b4ab0da..a25df4a 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_describedAs.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_describedAs.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The `describedAs()` attribute is used to provide a short description of the 
action parameter to the user.  In the xref:ugvw.adoc#[Wicket viewer] it is 
displayed as a 'tool tip'.  The `describedAs()` attribute can also be specified 
for xref:../rgant/rgant.adoc#_rgant-CollectionLayout_describedAs[collections],  
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_describedAs[properties], 
xref:../rgant/rgant.adoc#_rgant-ActionLayout_describedAs[actions], 
xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[domain objects] 
and xref:../rgant/rgant.adoc#_rgant-ViewModelLayout_describedAs[view models].
+The `describedAs()` attribute is used to provide a short description of the 
action parameter to the user.  In the xref:../ugvw/ugvw.adoc#[Wicket viewer] it 
is displayed as a 'tool tip'.  The `describedAs()` attribute can also be 
specified for 
xref:../rgant/rgant.adoc#_rgant-CollectionLayout_describedAs[collections],  
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_describedAs[properties], 
xref:../rgant/rgant.adoc#_rgant-ActionLayout_describedAs[actions], 
xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[domain objects] 
and xref:../rgant/rgant.adoc#_rgant-ViewModelLayout_describedAs[view models].
 
 Descriptions may be provided for objects, members (properties,
 collections and actions), and for individual parameters within an action

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_labelPosition.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_labelPosition.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_labelPosition.adoc
index 0242245..610b0ed 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_labelPosition.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_labelPosition.adoc
@@ -36,6 +36,6 @@ public class Order {
 ----
 
 
-To get an idea of how these are rendered (in the xref:ugvw.adoc#[Wicket 
viewer]), see 
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_labelPosition[PropertyLayout#labelPosition()].
+To get an idea of how these are rendered (in the 
xref:../ugvw/ugvw.adoc#[Wicket viewer]), see 
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_labelPosition[PropertyLayout#labelPosition()].
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
index b34662f..8070b24 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_named.adoc
@@ -40,5 +40,5 @@ public class Customer {
 
 [TIP]
 ====
-The framework also provides a separate, powerful mechanism for 
xref:ugbtb.adoc#_ugbtb_i18n[internationalization].
+The framework also provides a separate, powerful mechanism for 
xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[internationalization].
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_typicalLength.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_typicalLength.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_typicalLength.adoc
index bcc9c7c..434a776 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_typicalLength.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ParameterLayout_typicalLength.adoc
@@ -8,7 +8,7 @@
 
 The `typicalLength()` attribute indicates the typical length of a string 
parameter.  It is ignored for parameters of other types.  The attribute is also 
supported for 
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_typicalLength[properties].
 
-The information is intended as a hint to the UI to determine the space that 
should be given to render a particular string parameter.  That said, note that 
the xref:ugvw.adoc#[Wicket viewer] uses the maximum space available for all 
fields, so in effect ignores this attribute.
+The information is intended as a hint to the UI to determine the space that 
should be given to render a particular string parameter.  That said, note that 
the xref:../ugvw/ugvw.adoc#[Wicket viewer] uses the maximum space available for 
all fields, so in effect ignores this attribute.
 
 For example:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
index 5e42bfa..f363421 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
@@ -25,8 +25,8 @@ This can appear in several contexts, including:
  (see xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) 
http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
 * in the serialization of `OidDto` in the 
xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and 
xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
-* in the URLs of the xref:ugvro.adoc#[RestfulObjects viewer]
-* in the URLs of the xref:ugvw.adoc#[Wicket viewer] (in general and in 
particular if xref:ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
+* in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
+* in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in 
particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying 
URLs])
 * in XML snapshots generated by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_XmlSnapshotService[`XmlSnapshotService`]
 
 
@@ -92,7 +92,7 @@ If only `schema` is defined, then the value is 
"`schema.className`".
 This might be obvious, but to make explicit: we recommend that you always 
specify an object type for your domain objects.
 
 Otherwise, if you refactor your code (change class name or move package), then 
any externally held references to the OID of the object will break.
-At best this will require a data migration in the database; at worst it could 
cause external clients accessing data through the xref:ugvro.adoc#[Restful 
Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could 
cause external clients accessing data through the 
xref:../ugvro/ugvro.adoc#[Restful Objects] viewer to break.
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
index 4af546d..78d60f7 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
@@ -7,7 +7,7 @@
 
 The `@javax.annotation.PostConstruct` annotation, as defined in 
link:https://jcp.org/en/jsr/detail?id=250[JSR-250],  is recognized by Apache 
Isis as a callback method on domain services to be called just after they have 
been constructed, in order that they initialize themselves.
 
-It is also recognized for xref:ugbtb.adoc#_ugbtb_view-models[view models] (eg 
annotated with xref:../rgant/rgant.adoc#_rgant-ViewModel[`@ViewModel`]).
+It is also recognized for xref:../ugbtb/ugbtb.adoc#_ugbtb_view-models[view 
models] (eg annotated with 
xref:../rgant/rgant.adoc#_rgant-ViewModel[`@ViewModel`]).
 
 For the default application-scoped (singleton) domain services, this means 
that the method, if present, is called during the bootstrapping of the 
application.  For 
xref:../rgant/rgant.adoc#_rgant-RequestScoped[`@RequestScoped`] domain 
services, the method is called at the beginning of the request.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
index 96517ee..15b43b5 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
@@ -104,7 +104,7 @@ It is also possible to apply the annotation to actions of 
domain services that a
 
 [TIP]
 ====
-As an alternative to using the `@PropertyLayout` annotation, a 
xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] can be used (and is 
generally to be preferred since it is more flexible/powerful).
+As an alternative to using the `@PropertyLayout` annotation, a 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[file-based layout] can be used 
(and is generally to be preferred since it is more flexible/powerful).
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
index c5580e8..acd69a0 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_cssClass.adoc
@@ -23,7 +23,7 @@ public class ToDoItem {
 
 
 
-As an alternative to using the annotation, the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
+As an alternative to using the annotation, the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
 can be used instead, eg:
 
 [source,javascript]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
index 5644f47..bbc427c 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_describedAs.adoc
@@ -6,7 +6,7 @@
 
 
 
-The `describedAs()` attribute is used to provide a short description of the 
property to the user.  In the xref:ugvw.adoc#[Wicket viewer] it is displayed as 
a 'tool tip'. The attribute can also be specified for 
xref:../rgant/rgant.adoc#_rgant-CollectionLayout_describedAs[collections],  
xref:../rgant/rgant.adoc#_rgant-ActionLayout_describedAs[actions], 
xref:../rgant/rgant.adoc#_rgant-ParameterLayout_describedAs[parameters], 
xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[domain objects] 
and xref:../rgant/rgant.adoc#_rgant-ViewModelLayout_describedAs[view models].
+The `describedAs()` attribute is used to provide a short description of the 
property to the user.  In the xref:../ugvw/ugvw.adoc#[Wicket viewer] it is 
displayed as a 'tool tip'. The attribute can also be specified for 
xref:../rgant/rgant.adoc#_rgant-CollectionLayout_describedAs[collections],  
xref:../rgant/rgant.adoc#_rgant-ActionLayout_describedAs[actions], 
xref:../rgant/rgant.adoc#_rgant-ParameterLayout_describedAs[parameters], 
xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[domain objects] 
and xref:../rgant/rgant.adoc#_rgant-ViewModelLayout_describedAs[view models].
 
 For example:
 
@@ -20,7 +20,7 @@ public class Customer {
 ----
 
 
-As an alternative to using the annotation, the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
+As an alternative to using the annotation, the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
 can be used instead, eg:
 
 [source,javascript]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
index 3391532..cf21719 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_hidden.adoc
@@ -10,7 +10,7 @@ The `hidden()` attribute indicates where (in the UI) the 
property should be hidd
 
 [TIP]
 ====
-It is also possible to use 
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`]
 or a xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] such that the 
property can be hidden at the view layer.
+It is also possible to use 
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`]
 or a xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[file-based layout] such 
that the property can be hidden at the view layer.
 Both options are provided with a view that in the future the view-layer 
semantics may be under the control of (expert) users, whereas domain-layer 
semantics should never be overridden or modified by the user.
 ====
 
@@ -64,11 +64,11 @@ tables. Annotating with `@Property(where=Where.NOWHERE)` 
overrides this.
 
 [NOTE]
 ====
-The xref:ugvro.adoc#[RestfulObjects viewer] has only partial support for these 
`Where` enums.
+The xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] has only partial support 
for these `Where` enums.
 ====
 
 
-As an alternative to using the annotation, the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
+As an alternative to using the annotation, the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
 can be used instead, eg:
 
 [source,javascript]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
index 0b5a843..b1504fe 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_labelPosition.adoc
@@ -30,7 +30,7 @@ public class ToDoItem {
 ----
 
 
-To get an idea of how these are rendered (in the xref:ugvw.adoc#[Wicket 
viewer]), we can look at the (non-ASF) 
http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] that 
happens to have examples of most of these various label positions.
+To get an idea of how these are rendered (in the 
xref:../ugvw/ugvw.adoc#[Wicket viewer]), we can look at the (non-ASF) 
http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] that 
happens to have examples of most of these various label positions.
 
 The default `LEFT` label positioning is used by the `cost` property:
 
@@ -58,7 +58,7 @@ 
image::{_imagesdir}reference-annotations/PropertyLayout/labelPosition-boolean-RI
 
 
 
-As an alternative to using the annotation, the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
+As an alternative to using the annotation, the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
 can be used instead, eg:
 
 [source,javascript]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
index 57da035..20dc3ac 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_multiLine.adoc
@@ -25,7 +25,7 @@ Here the `stepsToReproduce` will be displayed in a text area 
of 10 rows.
 
 
 
-As an alternative to using the annotation, the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
+As an alternative to using the annotation, the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
 can be used instead, eg:
 
 [source,javascript]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
index 5cef62f..b009165 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_named.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
 
 
 
-As an alternative to using the annotation, the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
+As an alternative to using the annotation, the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
 can be used instead, eg:
 
 [source,javascript]
@@ -47,5 +47,5 @@ can be used instead, eg:
 
 [TIP]
 ====
-The framework also provides a separate, powerful mechanism for 
xref:ugbtb.adoc#_ugbtb_i18n[internationalization].
+The framework also provides a separate, powerful mechanism for 
xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[internationalization].
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
index f4451af..6f8266a 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_renderedAsDayBefore.adoc
@@ -32,7 +32,7 @@ public class Tenancy {
 
 
 
-As an alternative to using the annotation, the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
+As an alternative to using the annotation, the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`]
 can be used instead, eg:
 
 [source,javascript]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_typicalLength.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_typicalLength.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_typicalLength.adoc
index 0d51135..5ffdc03 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_typicalLength.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_typicalLength.adoc
@@ -8,7 +8,7 @@
 
 The `typicalLength()` attribute indicates the typical length of a string 
property.  It is ignored for properties of other types.  The attribute is also 
supported for 
xref:../rgant/rgant.adoc#_rgant-ParameterLayout_typicalLength[parameters].
 
-The information is intended as a hint to the UI to determine the space that 
should be given to render a particular string property.  That said, note that 
the xref:ugvw.adoc#[Wicket viewer] uses the maximum space available for all 
fields, so in effect ignores this attribute.
+The information is intended as a hint to the UI to determine the space that 
should be given to render a particular string property.  That said, note that 
the xref:../ugvw/ugvw.adoc#[Wicket viewer] uses the maximum space available for 
all fields, so in effect ignores this attribute.
 
 For example:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_hidden.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_hidden.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_hidden.adoc
index 71a7461..6b9aa83 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_hidden.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property_hidden.adoc
@@ -62,5 +62,5 @@ tables. Annotating with `@Property(where=Where.NOWHERE)` 
overrides this.
 
 [NOTE]
 ====
-The xref:ugvro.adoc#[RestfulObjects viewer] has only partial support for these 
`Where` enums.
+The xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] has only partial support 
for these `Where` enums.
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
index 21f16ac..8526bb0 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout.adoc
@@ -82,7 +82,7 @@ public class CategoryPieChart { ... }
 
 [NOTE]
 ====
-Note that there is (currently) no support for specifying UI hints for view 
models through the dynamic 
xref:ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for 
properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for view 
models through the dynamic 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`.layout.json`] file (only for 
properties, collections and actions are supported).
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_describedAs.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_describedAs.adoc
index 1646f4e..97826b7 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_describedAs.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_describedAs.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The `describedAs()` attribute is used to provide a short description of the 
view model to the user.  In the xref:ugvw.adoc#[Wicket viewer] it is displayed 
as a 'tool tip'.  The `describedAs()` attribute can also be specified for 
xref:../rgant/rgant.adoc#_rgant-CollectionLayout_describedAs[collections],  
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_describedAs[properties], 
xref:../rgant/rgant.adoc#_rgant-ActionLayout_describedAs[actions], 
xref:../rgant/rgant.adoc#_rgant-ParameterLayout_describedAs[parameters] and 
xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[domain objects].
+The `describedAs()` attribute is used to provide a short description of the 
view model to the user.  In the xref:../ugvw/ugvw.adoc#[Wicket viewer] it is 
displayed as a 'tool tip'.  The `describedAs()` attribute can also be specified 
for xref:../rgant/rgant.adoc#_rgant-CollectionLayout_describedAs[collections],  
xref:../rgant/rgant.adoc#_rgant-PropertyLayout_describedAs[properties], 
xref:../rgant/rgant.adoc#_rgant-ActionLayout_describedAs[actions], 
xref:../rgant/rgant.adoc#_rgant-ParameterLayout_describedAs[parameters] and 
xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[domain objects].
 
 For example:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_named.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_named.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_named.adoc
index 2998e40..606045f 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_named.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_named.adoc
@@ -31,5 +31,5 @@ public class PieChartAnalysisViewModel {
 
 [TIP]
 ====
-The framework also provides a separate, powerful mechanism for 
xref:ugbtb.adoc#_ugbtb_i18n[internationalization].
+The framework also provides a separate, powerful mechanism for 
xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[internationalization].
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_paged.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_paged.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_paged.adoc
index 6ba7e74..358f404 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_paged.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModelLayout_paged.adoc
@@ -11,7 +11,7 @@ The `paged()` attribute specifies the number of rows to 
display in a standalone
 
 [WARNING]
 ====
-The xref:ugvro.adoc#[RestfulObjects viewer] currently does not support paging. 
  The xref:ugvw.adoc#[Wicket viewer] _does_ support paging, but note that the 
paging is performed client-side rather than server-side.
+The xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] currently does not 
support paging.   The xref:../ugvw/ugvw.adoc#[Wicket viewer] _does_ support 
paging, but note that the paging is performed client-side rather than 
server-side.
 
 We therefore recommend that large collections should instead be modelled as 
actions (to allow filtering to be applied to limit the number of rows).
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
index 1ed0889..47818bf 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ViewModel_objectType.adoc
@@ -14,8 +14,8 @@ This can appear in several contexts, including:
  (see xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) 
http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
 * in the serialization of `OidDto` in the 
xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and 
xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
-* in the URLs of the xref:ugvro.adoc#[RestfulObjects viewer]
-* in the URLs of the xref:ugvw.adoc#[Wicket viewer] (in general and in 
particular if xref:ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
+* in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
+* in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in 
particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying 
URLs])
 * in XML snapshots generated by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_XmlSnapshotService[`XmlSnapshotService`]
 
 
@@ -54,7 +54,7 @@ If only `schema` is defined, then the value is 
"`schema.className`".
 This might be obvious, but to make explicit: we recommend that you always 
specify an object type for your domain objects.
 
 Otherwise, if you refactor your code (change class name or move package), then 
any externally held references to the OID of the object will break.
-At best this will require a data migration in the database; at worst it could 
cause external clients accessing data through the xref:ugvro.adoc#[Restful 
Objects] viewer to break.
+At best this will require a data migration in the database; at worst it could 
cause external clients accessing data through the 
xref:../ugvro/ugvro.adoc#[Restful Objects] viewer to break.
 ====
 
 [NOTE]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlJavaTypeAdapter.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlJavaTypeAdapter.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlJavaTypeAdapter.adoc
index 2b2a034..b24585c 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlJavaTypeAdapter.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlJavaTypeAdapter.adoc
@@ -22,6 +22,6 @@ public class ToDoItem ...  {
 
 This annotation therefore allows view models/DTOs to have references to 
persistent entities; a common idiom.
 
-For a more complete discussion of writing JAXB view models/DTOs, see 
xref:ugbtb.adoc#_ugbtb_view-models[this topic]
+For a more complete discussion of writing JAXB view models/DTOs, see 
xref:../ugbtb/ugbtb.adoc#_ugbtb_view-models[this topic]
 in the user guide.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
index ac3b58d..220a1fe 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
@@ -7,7 +7,7 @@
 
 The `@XmlRootElement` annotation provides an alternative way to define a
 xref:rg.adoc#_ugbtb_view-models[view model], in particular one intended to act 
as a DTO for use within
-xref:ugvro.adoc#[RestfulObjects viewer], or which contains arbitrarily complex 
state.
+xref:../ugvro/ugvro.adoc#[RestfulObjects viewer], or which contains 
arbitrarily complex state.
 
 A view model is a non-persisted domain object whose state is converted to/from 
a string memento.  In the case of a
 JAXB-annotated object this memento is its XML representation.  JAXB generally 
requires that the root element of the
@@ -18,7 +18,7 @@ xref:../rgant/rgant.adoc#_rgant-ViewModel[`@ViewModel`] 
annotation, using `@XmlR
 significant advantages:
 
 * the view model can be used as a "canonical" DTO, for example when accessing 
data using the
-xref:ugvro.adoc#[RestfulObjects viewer] in combination with the
+xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] in combination with the
 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`].
 +
 +
 This provides a stable and
@@ -74,10 +74,10 @@ public class ToDoItemDto implements Dto {
 Although (like any other viewmodel) a JAXB-annotated can have behaviour 
(actions) and UI hints, you may wish to keep
 the DTO "clean", just focused on specifying the data contract.
 
-Behaviour can therefore be provided using 
xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] (annotated with
+Behaviour can therefore be provided using 
xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] (annotated with
 xref:../rgant/rgant.adoc#_rgant-Mixin[`@Mixin`]), while 
xref:../rgcms/rgcms.adoc#_rgcms_classes_uievent[UI events] can be used
 to obtain title, icons and so on.
 
-For a more complete discussion of writing JAXB view models/DTOs, see 
xref:ugbtb.adoc#_ugbtb_view-models[this topic]
+For a more complete discussion of writing JAXB view models/DTOs, see 
xref:../ugbtb/ugbtb.adoc#_ugbtb_view-models[this topic]
 in the user guide.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
index d04be91..997eb9e 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
@@ -20,7 +20,7 @@ The annotations listed in the table below are still supported 
by Apache Isis, bu
 |Purpose
 |Use instead
 |Layer
-|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
+|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
 
 |`@ActionOrder`
 |Order of buttons and menu items representing actions.
@@ -99,7 +99,7 @@ The annotations listed in the table below are still supported 
by Apache Isis, bu
 
 |`@Debug`
 |Action only invokable in debug mode.
-|Not supported by either the xref:ugvw.adoc#[Wicket viewer] or the 
xref:ugvro.adoc#[RestfulObjects viewer]; use prototype mode instead 
(xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`])
+|Not supported by either the xref:../ugvw/ugvw.adoc#[Wicket viewer] or the 
xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]; use prototype mode instead 
(xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`])
 |UI
 |
 
@@ -117,7 +117,7 @@ The annotations listed in the table below are still 
supported by Apache Isis, bu
 
 |`@Exploration`
 |Action available in special 'exploration' mode.
-|Not supported by either the xref:ugvw.adoc#[Wicket viewer] or the 
xref:ugvro.adoc#[RestfulObjects viewer]; use prototype mode instead 
(xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`])
+|Not supported by either the xref:../ugvw/ugvw.adoc#[Wicket viewer] or the 
xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]; use prototype mode instead 
(xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`])
 |UI
 |
 
@@ -170,13 +170,13 @@ Actions can still be invoked.
 
 |`@MemberGroups`
 |Layout of properties and collections of a domain object or view model object.
-|xref:ugvw.adoc#_ugvw_layout_file-based[dynamic `.layout.xml`] files
+|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[dynamic `.layout.xml`] files
 |UI
 |Yes
 
 |@MemberGroupLayout`
 |Grouping of properties into groups, and organizing of properties, collections 
into columns.
-|xref:ugvw.adoc#_ugvw_layout_file-based[dynamic `.layout.xml`] files
+|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[dynamic `.layout.xml`] files
 |UI
 |Yes
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jdo.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jdo.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jdo.adoc
index 7c40b21..cab9628 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jdo.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jdo.adoc
@@ -36,7 +36,7 @@ The table below lists the JDO annotations currently 
recognized by Apache Isis.
 
 |xref:../rgant/rgant.adoc#_rgant-Discriminator[`@javax.jdo.annotations.` +
 `Discriminator`]
-|Override for the object type, as used in `Bookmark`s, URLs for 
xref:ugvro.adoc#[RestfulObjects viewer] and elsewhere. +
+|Override for the object type, as used in `Bookmark`s, URLs for 
xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] and elsewhere. +
 
 Note that the discriminator overrides the object type that may otherwise be 
inferred from the 
xref:../rgant/rgant.adoc#_rgant-PersistenceCapable[`@PersistenceCapable`] 
annotation.
 |Domain / persistence
@@ -45,7 +45,7 @@ Note that the discriminator overrides the object type that 
may otherwise be infe
 
 |xref:../rgant/rgant.adoc#_rgant-NotPersistent[`@javax.jdo.annotations.` +
 `NotPersistent`]
-|Used to determine whether to enforce or skip some 
xref:ugbtb.adoc#_ugbtb_programming-model_custom-validator[metamodel validation] 
for `@Column` versus equivalent Isis annotations.
+|Used to determine whether to enforce or skip some 
xref:../ugbtb/ugbtb.adoc#_ugbtb_programming-model_custom-validator[metamodel 
validation] for `@Column` versus equivalent Isis annotations.
 
 |Domain / persistence
 |Property
@@ -56,7 +56,7 @@ Note that the discriminator overrides the object type that 
may otherwise be infe
 `PersistenceCapable`]
 |Used to build Apache Isis' own internal identifier for objects. +
 
-If the `schema()` attribute is specified (and if 
xref:../rgant/rgant.adoc#_rgant-Discriminator[`@Discriminator`] _hasn't_ been 
specified), is also used to derive the object type, as used in `Bookmark`s, 
URLs for xref:ugvro.adoc#[RestfulObjects viewer] and elsewhere.
+If the `schema()` attribute is specified (and if 
xref:../rgant/rgant.adoc#_rgant-Discriminator[`@Discriminator`] _hasn't_ been 
specified), is also used to derive the object type, as used in `Bookmark`s, 
URLs for xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] and elsewhere.
 
 |Domain / persistence
 |Class

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
index 5435a7b..6b03cdf 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_jee.adoc
@@ -16,7 +16,7 @@ The table below lists the JEE annotations currently 
recognized.  Expect to see m
 |Annotation
 |Purpose
 |Layer
-|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
+|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
 
 |xref:../rgant/rgant.adoc#_rgant-Digits[`@javax.validation.` +
 `constraints.` +

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
index 26e6530..bb06696 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_main.adoc
@@ -11,7 +11,7 @@ For each of these domain types and members there are two 
annotations.  One cover
 
 [TIP]
 ====
-Most UI semantics can also be specified using 
xref:ugvw.adoc#_ugvw_layout_file-based[dynamic object layout].
+Most UI semantics can also be specified using 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[dynamic object layout].
 ====
 
 
@@ -24,7 +24,7 @@ The table below summarizes these most commonly used 
annotations in Apache Isis.
 |Annotation
 |Purpose
 |Layer
-|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
+|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
 
 |xref:../rgant/rgant.adoc#_rgant-Action[`@Action`]
 |Domain semantics for actions

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
index db3a31a..876fb1b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_other.adoc
@@ -13,7 +13,7 @@ These annotations are also commonly used, but relate _not_ to 
objects or object
 |Annotation
 |Purpose
 |Layer
-|xref:ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
+|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
 
 |xref:../rgant/rgant.adoc#_rgant-Facets[`@Facets`]
 |Install arbitrary facets within the Apache Isis metamodel.

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuration-files.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuration-files.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuration-files.adoc
index fb02fbe..ddb9c8b 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuration-files.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuration-files.adoc
@@ -11,9 +11,9 @@ The `WEBINF/isis.properties` file is always read and must 
exist.
 
 In addition, the following other properties are searched for and if present 
also read:
 
-* `viewer_wicket.properties` - if the xref:ugvw.adoc#[Wicket viewer] is in use
+* `viewer_wicket.properties` - if the xref:../ugvw/ugvw.adoc#[Wicket viewer] 
is in use
 
-* `viewer_restfulobjects.properties` - if the xref:ugvro.adoc#[RestfulObjects 
viewer] is in use
+* `viewer_restfulobjects.properties` - if the 
xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] is in use
 
 * `viewer.properties` - for any other viewer configuration (but there are none 
currently)
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
index bd72906..c4948a0 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_configuring-core.adoc
@@ -8,7 +8,7 @@ This section lists the core/runtime configuration properties 
recognized by Apach
 
 [NOTE]
 ====
-Configuration properties for the JDO/DataNucleus objectstore can be found in 
the xref:ugodn.adoc#_ugodn_configuring[Configuring DataNucleus] section later 
in this chapter, while configuration properties for the viewers can be found in 
the their respective chapters, 
xref:ugvw.adoc#_ugvw_configuration-properties[here for Wicket viewer], and 
xref:ugvro.adoc#_ugvro_configuration-properties[here for the Restful Objects 
viewer].
+Configuration properties for the JDO/DataNucleus objectstore can be found in 
the xref:../ugodn/ugodn.adoc#_ugodn_configuring[Configuring DataNucleus] 
section later in this chapter, while configuration properties for the viewers 
can be found in the their respective chapters, 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties[here for Wicket viewer], 
and xref:../ugvro/ugvro.adoc#_ugvro_configuration-properties[here for the 
Restful Objects viewer].
 ====
 
 
@@ -458,7 +458,7 @@ This property is IGNORED if the 
xref:../rgcfg/rgcfg.adoc#_rgcfg_configuring-comp
 | `read`,`write`
 |Whether to force the `TranslationService` into either read or write mode. +
 
-See xref:ugbtb.adoc#_ugbtb_i18n[i18n support] to learn more about the 
translation service.
+See xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[i18n support] to learn more about the 
translation service.
 
 
 |===
@@ -481,7 +481,7 @@ See xref:ugbtb.adoc#_ugbtb_i18n[i18n support] to learn more 
about the translatio
 |`FQCN`
 |Custom implementation of `MetaModelValidator` (in the 
`org.apache.isis.core.metamodel.specloader.validator` package) +
 
-See xref:ugbtb.adoc#_ugbtb_programming-model_custom-validator[Custom 
Validator] to learn more.
+See xref:../ugbtb/ugbtb.adoc#_ugbtb_programming-model_custom-validator[Custom 
Validator] to learn more.
 
 |`isis.reflector.validator.` +
 `actionCollection` +
@@ -507,7 +507,7 @@ See also `isis.reflector.facets.ignoreDeprecated`.
 (`false`)
 | Whether to check that the class has an object type explicitly specified 
somehow.
 
-The object type is used by the framework as an alias for the object's concrete 
class; it is one part of the object's OID and can be seen in the URLs of the 
xref:ugvw.adoc#[Wicket viewer] and xref:ugvro.adoc#[Restful Objects viewer], 
and is encoded in the ``Bookmark``s returned by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`].
+The object type is used by the framework as an alias for the object's concrete 
class; it is one part of the object's OID and can be seen in the URLs of the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] and xref:../ugvro/ugvro.adoc#[Restful 
Objects viewer], and is encoded in the ``Bookmark``s returned by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`].
 In this was it may also be persisted, for example in polymorphic associations 
or command or auditing tables.
 
 If the object type is not specified explicitly, then this can cause data 
migration issues if the class is subsequently refactored (eg renamed, or moved 
to a different package).
@@ -547,7 +547,7 @@ This is by way of possibly deprecating and eventually 
moving contributed service
 | When searching for  
xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_disable[`disableXxx()`] or 
xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_hide[`hideXxx()`] methods, 
whether to search only for the no-param version (or also for supporting methods 
that match the parameter types of the action). +
 
 If enabled then will not search for supporting methods with the exact set of 
arguments as the method it was supporting (and any supporting methods that have 
additional parameters will be treated as invalid).
-Note that this in effect means that 
xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins[mixins] must be used instead of 
xref:ugbtb.adoc#_ugbtb_decoupling_contributions[contributed services].
+Note that this in effect means that 
xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins[mixins] must be used instead of 
xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_contributions[contributed services].
 
 
 |`isis.reflector.validator.` +
@@ -620,7 +620,7 @@ See 
xref:../rgcfg/rgcfg.adoc#__rgcfg_configuring-core_filterVisibility[section b
 |This property is now ignored.  +
 +
 To customize the programming model, use `facets.exclude` and `facets.include`.
-See xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the 
programming model] for more details.
+See xref:../ugbtb/ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning 
the programming model] for more details.
 
 
 
@@ -629,7 +629,7 @@ See 
xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the programmi
 |`FQCN`,`FQCN2`,...
 |Fully qualified class names of (existing, built-in) facet factory classes to 
be included to the programming model. +
 
-See xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the 
programming model] for more details.
+See xref:../ugbtb/ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning 
the programming model] for more details.
 
 
 |`isis.reflector.facets.` +
@@ -650,15 +650,15 @@ To be safe, we recommend that you first run your 
application using `isis.reflect
 `include`
 |`FQCN`,`FQCN2`,...
 |Fully qualified class names of (new, custom) facet factory classes to be 
included to the programming model. +
-See xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the 
programming model] for more details.
+See xref:../ugbtb/ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning 
the programming model] for more details.
 
 
 |`isis.reflector.` +
 `layoutMetadataReaders`
 |`FQCN`,`FQCN2`,...
-|Fully qualified class names of classes to be instantiated to read layout 
metadata, as used in for xref:ugvw.adoc#_ugvw_layout_file-based[file-based 
layout]s. +
+|Fully qualified class names of classes to be instantiated to read layout 
metadata, as used in for 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[file-based layout]s. +
 
-See xref:ugbtb.adoc#_ugbtb_programming-model_layout-metadata-reader[Layout 
Metadata Reader] for more information.
+See 
xref:../ugbtb/ugbtb.adoc#_ugbtb_programming-model_layout-metadata-reader[Layout 
Metadata Reader] for more information.
 
 
 
@@ -717,7 +717,7 @@ By default this configuration property is enabled.  To 
disable the visibility fi
 isis.reflector.facet.filterVisibility=false
 ----
 
-Filtering is supported by the xref:ugvw.adoc#[Wicket viewer] and the 
xref:ugvro.adoc#[Restful Objects viewer], and also by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`] domain 
service (provided the wrapper's execution mode is __not__ "skip rules").
+Filtering is supported by the xref:../ugvw/ugvw.adoc#[Wicket viewer] and the 
xref:../ugvro/ugvro.adoc#[Restful Objects viewer], and also by the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`] domain 
service (provided the wrapper's execution mode is __not__ "skip rules").
 
 [NOTE]
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
index b29d0f4..42d3c64 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_deployment-types.adoc
@@ -15,7 +15,7 @@ When running in development/prototyping mode, certain 
capabilities are enabled;
 
 == Using the Wicket Viewer
 
-Most of the you're likely to run Apache Isis using the xref:ugvw.adoc#[Wicket 
viewer].  In this case Apache Isis' "deployment type" concept maps to Wicket's 
"configuration" concept:
+Most of the you're likely to run Apache Isis using the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].  In this case Apache Isis' "deployment 
type" concept maps to Wicket's "configuration" concept:
 
 .Apache Isis' deployment type corresponds to Apache Wicket's configuration
 [cols="1,1,2", options="header"]
@@ -64,9 +64,9 @@ Wicket's mechanism for specifying the "configuration" is to 
use a context parame
 
 == Restful Objects viewer only
 
-Most Apache Isis applications will consist of at least the 
xref:ugvw.adoc#[Wicket viewer] and optionally the 
xref:ugvro.adoc#[RestfulObjects viewer].  When both viewers are deployed in the 
same app, then the bootstrapping is performed by Wicket, and so the deployment 
type is configured as described in the previous section.
+Most Apache Isis applications will consist of at least the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] and optionally the 
xref:../ugvro/ugvro.adoc#[RestfulObjects viewer].  When both viewers are 
deployed in the same app, then the bootstrapping is performed by Wicket, and so 
the deployment type is configured as described in the previous section.
 
-In some cases though you may be using Apache Isis to provide a REST API only, 
that is, you won't have deployed the Wicket viewer.  In these cases your app 
will be bootstrapped using  Apache Isis' 
xref:ugbtb.adoc#__ugbtb_web-xml_servlet-context-listeners[ 
`IsisWebAppBootstrapper`].
+In some cases though you may be using Apache Isis to provide a REST API only, 
that is, you won't have deployed the Wicket viewer.  In these cases your app 
will be bootstrapped using  Apache Isis' 
xref:../ugbtb/ugbtb.adoc#__ugbtb_web-xml_servlet-context-listeners[ 
`IsisWebAppBootstrapper`].
 
 In this case the deployment type is specified through an Apache Isis-specific 
context parameter, called `isis.deploymentType`:
 
@@ -96,7 +96,7 @@ In this case the deployment type is specified through an 
Apache Isis-specific co
 
 == Overriding the deployment type
 
-If bootstrapping the application using Apache Isis' 
xref:ugbtb.adoc#_ugbtb_deployment_cmd-line[`org.apache.isis.WebServer`] then it 
is possible to override the deployment type using the `-t` (or `--type`) flag.
+If bootstrapping the application using Apache Isis' 
xref:../ugbtb/ugbtb.adoc#_ugbtb_deployment_cmd-line[`org.apache.isis.WebServer`]
 then it is possible to override the deployment type using the `-t` (or 
`--type`) flag.
 
 For example:
 
@@ -107,5 +107,5 @@ java -jar ... org.apache.isis.WebServer -t SERVER
 
 where "..." is the (usually rather long) list of JAR files and class 
directories that will make up your application.
 
-This works for both the xref:ugvw.adoc#[Wicket viewer] and the 
xref:ugvro.adoc#[RestfulObjects viewer].
+This works for both the xref:../ugvw/ugvw.adoc#[Wicket viewer] and the 
xref:../ugvro/ugvro.adoc#[RestfulObjects viewer].
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
index 00af60a..436702d 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/_rgcfg_specifying-components.adoc
@@ -98,7 +98,7 @@ If the `AppManifest` is _not_ being used then there are 
number of other configur
 
 == Viewer Configuration
 
-Viewers are specified by way of the filters and servlets in the 
xref:ugbtb.adoc#_ugbtb_web-xml[`web.xml`] file; these are not bootstrapped by 
the framework, rather it is the other way around.
+Viewers are specified by way of the filters and servlets in the 
xref:../ugbtb/ugbtb.adoc#_ugbtb_web-xml[`web.xml`] file; these are not 
bootstrapped by the framework, rather it is the other way around.
 
 In versions prior to `1.13.0`, the "isis.viewers" context parameter was used 
to hint which configuration files should be read (corresponding to the viewers 
in use).  As of `1.13.0`, however, the configuration property has no effect: 
the `viewer_wicket.properties` and `viewer_restulobjects.properties` are always 
loaded if available.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcfg/rgcfg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg/rgcfg.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgcfg/rgcfg.adoc
index 69d1dea..2cd064c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg/rgcfg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg/rgcfg.adoc
@@ -16,15 +16,15 @@ This guide describes how to configure an Apache Isis 
application.
 [NOTE]
 ====
 This guide covers only the core configuration properties (relating to Apache 
Isis' metamodel and runtime management).
-Configuration properties for the viewers can be found in the 
xref:ugvw.adoc#[Wicket Viewer] guide and the xref:ugvro.adoc#[RestfulObjects 
viewer] guide.
+Configuration properties for the viewers can be found in the 
xref:../ugvw/ugvw.adoc#[Wicket Viewer] guide and the 
xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] guide.
 Likewise details of configuring security (Apache Shiro) can be
-found in the xref:ugsec.adoc#[Security] guide, and details for configuring the 
DataNucleus Object Store can be found in the xref:ugodn.adoc#[DataNucleus] 
guide.
+found in the xref:../ugsec/ugsec.adoc#[Security] guide, and details for 
configuring the DataNucleus Object Store can be found in the 
xref:../ugodn/ugodn.adoc#[DataNucleus] guide.
 ====
 
 [TIP]
 ====
 By default the configuration values are part of the built WAR file.
-Details on how to override these configuration properties externally for 
different environments can be found in the 
xref:ugbtb.adoc#_ugbtb_deployment[Beyond the Basics] guide, (deployment 
chapter).
+Details on how to override these configuration properties externally for 
different environments can be found in the 
xref:../ugbtb/ugbtb.adoc#_ugbtb_deployment[Beyond the Basics] guide, 
(deployment chapter).
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
index 213d973..9aa0866 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-This chapter describes the usage of various classes and interfaces that are 
not otherwise associated with xref:../rgsvc/rgsvc.adoc[domain services], 
xref:ugvw.adoc#_ugvw_layout[object layout] or 
xref:../rgcfg/rgcfg.adoc#_rgcfg[configuration].
+This chapter describes the usage of various classes and interfaces that are 
not otherwise associated with xref:../rgsvc/rgsvc.adoc[domain services], 
xref:../ugvw/ugvw.adoc#_ugvw_layout[object layout] or 
xref:../rgcfg/rgcfg.adoc#_rgcfg[configuration].
 
 
 include::_rgcms_classes_AppManifest-bootstrapping.adoc[leveloffset=+1]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
index d80fd36..b200e09 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
@@ -105,7 +105,7 @@ If this method returns a non-`null` value, then it 
overrides the value of `isis.
 
 If non-`null`, this method specifies the authentication mechanism to use.  The 
valid values are currently `"shiro"`  or `"bypass"`.  If null is returned then 
the value of the `isis.authentication` configuration property (in 
`isis.properties` file) is used instead.
 
-See the xref:ugsec.adoc#[security guide] for further details on configuring 
shiro or bypass security.
+See the xref:../ugsec/ugsec.adoc#[security guide] for further details on 
configuring shiro or bypass security.
 
 [NOTE]
 ====
@@ -118,7 +118,7 @@ This property is ignored for integration tests (which 
always uses the `"bypass"`
 
 If non-`null`, this method specifies the authorization mechanism to use.  The 
valid values are currently `"shiro"`  or `"bypass"`.  If null is returned then 
the value of the `isis.authorization` configuration property (in 
`isis.properties` file) is used instead.
 
-See the xref:ugsec.adoc#[security guide] for further details on configuring 
shiro or bypass security.
+See the xref:../ugsec/ugsec.adoc#[security guide] for further details on 
configuring shiro or bypass security.
 
 [NOTE]
 ====
@@ -244,7 +244,7 @@ configuration properties.  This class is still supported, 
but is deprecated.
 
 === Webapps
 
-To bootstrap an Apache Isis webapp (using the xref:ugvw.adoc#[Wicket viewer]), 
there are two choices:
+To bootstrap an Apache Isis webapp (using the xref:../ugvw/ugvw.adoc#[Wicket 
viewer]), there are two choices:
 
 * either specify the `AppManifest` by overriding the 
`IsisWicketApplication#newWicketModule()`, eg: +
 +
@@ -276,7 +276,7 @@ The first (programmatic) approach takes precedence over the 
second approach (con
 
 [TIP]
 ====
-If you use the `org.apache.isis.WebServer` class to launch your application 
from the xref:ugbtb.adoc#_ugbtb_deployment_cmd-line[command line], then note 
that you can specify the `AppManifest` using the `-m` (or `--manifest`) flag:
+If you use the `org.apache.isis.WebServer` class to launch your application 
from the xref:../ugbtb/ugbtb.adoc#_ugbtb_deployment_cmd-line[command line], 
then note that you can specify the `AppManifest` using the `-m` (or 
`--manifest`) flag:
 
 [source,ini]
 ----

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_i18n_TranslatableString.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_i18n_TranslatableString.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_i18n_TranslatableString.adoc
index 0c77849..8745506 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_i18n_TranslatableString.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_i18n_TranslatableString.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-IMPORTANT: FIXME - see xref:ugbtb.adoc#_ugbtb_i18n[user guide, i18n].
+IMPORTANT: FIXME - see xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[user guide, i18n].
 
 The `TranslatableString` utility class ...
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_layout.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_layout.adoc 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_layout.adoc
index bcd821d..6f860f8 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_layout.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_layout.adoc
@@ -12,7 +12,7 @@ The `org.apache.isis.applib.layout` package defines a number 
of classes that all
 
 * common component classes, that capture the layout metadata for an object's 
properties, collections and actions.  These are bound (or associated) to the 
regions of the grid
 
-The framework provides an implementation of the grid classes modelled closely 
on link:http://getbootstrap.com[Bootstrap 3], along with xref:ugvw.adoc[Wicket 
viewer] components capable of rendering that grid system.  In principle it is
+The framework provides an implementation of the grid classes modelled closely 
on link:http://getbootstrap.com[Bootstrap 3], along with 
xref:../ugvw/ugvw.adoc[Wicket viewer] components capable of rendering that grid 
system.  In principle it is
 also possible to extend the layout architecture for other grid systems.  The 
component classes, though, are intended to be reusable across all grid systems.
 
 The component classes, meanwhile, are broadly equivalent to the "layout" 
annotations (xref:../rgant/rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], 
xref:../rgant/rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`], 
xref:../rgant/rgant.adoc#_rgant-ActionLayout[`@ActionLayout`] and 
xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`]
@@ -89,6 +89,6 @@ responsive designs.
 
 As you can probably guess, the `BS3Grid` is the top-level object (that is, it 
is JAXB `@XmlRootElement`); this is the object that is serialized to/from XML.
 
-All of these classes also allow custom CSS to be specified; these are added to 
the CSS classes for the corresponding `<div`> in the rendered page.  The 
xref:ugvw.adoc#_ugvw_customisation_tweaking-css-classes[`application.css`] file 
can then be used for application-specific CSS, allowing arbitrary fine-tuning 
of the layout of the page.
+All of these classes also allow custom CSS to be specified; these are added to 
the CSS classes for the corresponding `<div`> in the rendered page.  The 
xref:../ugvw/ugvw.adoc#_ugvw_customisation_tweaking-css-classes[`application.css`]
 file can then be used for application-specific CSS, allowing arbitrary 
fine-tuning of the layout of the page.
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Dto.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Dto.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Dto.adoc
index 9c4585a..31e709e 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Dto.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Dto.adoc
@@ -7,7 +7,7 @@
 
 The `Dto` role interface is intended to be implemented by JAXB-annotated view 
models, that is, annotated using
 xref:../rgant/rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`].  It enables 
the ability to download the XML and
-XSD schema of those objects using two 
xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixins],
+XSD schema of those objects using two 
xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixins],
 `Dto_downloadXml` and `Dto_downloadXsd`.
 
 The interface is just a marker interface (with no members), and is defined as:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
index ef0b283..db37617 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_mixins_Object.adoc
@@ -14,7 +14,7 @@ The framework provides a single mixin that contributes to 
simply `java.lang.Obje
 
 When a domain object is rendered the end-user can select different tabs, and 
for collections can sort the columns,
 navigate to second pages, or select different views of collections.  If the 
user revisits that object, the
-xref:ugvw.adoc[Wicket viewer] will remember these hints and render the domain 
object in the same state.  These
+xref:../ugvw/ugvw.adoc[Wicket viewer] will remember these hints and render the 
domain object in the same state.  These
 rendering hints are also included if the user copies the URL using the anchor 
link (to right hand of the object's
 title).
 
@@ -47,7 +47,7 @@ each rendered object, per user.
 [[__rgcms_classes_mixins_Object_downloadLayoutXml]]
 == `downloadLayoutXml()`
 
-The `Object_downloadLayoutXml` mixin provides an action to download the 
xref:ugvw.adoc#_ugvw_layout_file-based[layout XML] for the current domain 
object.  It has the following signature:
+The `Object_downloadLayoutXml` mixin provides an action to download the 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[layout XML] for the current 
domain object.  It has the following signature:
 
 [source,java]
 ----
@@ -60,7 +60,7 @@ public Object downloadLayoutXml(
 ----
 <1> either current, complete, normalized or minimal.
 
-See the documentation on xref:ugvw.adoc#_ugvw_layout_file-based[layout XML] 
and also
+See the documentation on xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[layout 
XML] and also
 the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_LayoutService[`LayoutService`] for 
more information on these styles
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScript.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScript.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScript.adoc
index 69a16a9..fe29442 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScript.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScript.adoc
@@ -17,5 +17,5 @@ protected abstract void execute(final ExecutionContext 
executionContext);
 In this method the fixture script can in theory do anything, but in practice 
it is recommended that it uses injected
 domain services to set up data.  The provided `ExecutionContext` is used to 
invoke child fixture scripts, and alsocan be used to store references to any 
created objects (so that the calling test can access these objects/so that they 
are rendered in the view model).
 
-See the see the xref:ugtst.adoc#_ugtst_fixture-scripts[user guide's testing 
chapter] for further discussion on the use of fixture scripts, in particular 
xref:ugtst.adoc#_ugtst_fixture-scripts_api-and-usage[fixture scripts' API and 
usage].
+See the see the xref:../ugtst/ugtst.adoc#_ugtst_fixture-scripts[user guide's 
testing chapter] for further discussion on the use of fixture scripts, in 
particular 
xref:../ugtst/ugtst.adoc#_ugtst_fixture-scripts_api-and-usage[fixture scripts' 
API and usage].
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScripts.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScripts.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScripts.adoc
index 04a8e60..8bca805 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScripts.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_super_FixtureScripts.adoc
@@ -9,4 +9,4 @@ This abstract class is intended to allow a domain service that 
can execute xref:
 However, it has now been deprecated; instead we recommend that the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_FixtureScriptsSpecificationProvider[`FixtureScriptsSpecificationProvider`]
 service is
 implemented instead.  The framework will then automatically use 
xref:../rgsvc/rgsvc.adoc#_rgsvc_api_FixtureScriptsDefault[`FixtureScriptsDefault`]
 as a fallback implementation of this class.
 
-See the see the xref:ugtst.adoc#_ugtst_fixture-scripts[user guide's testing 
chapter] for further discussion on the use of fixture scripts, in particular 
xref:ugtst.adoc#_ugtst_fixture-scripts_api-and-usage[fixture scripts' API and 
usage].
+See the see the xref:../ugtst/ugtst.adoc#_ugtst_fixture-scripts[user guide's 
testing chapter] for further discussion on the use of fixture scripts, in 
particular 
xref:../ugtst/ugtst.adoc#_ugtst_fixture-scripts_api-and-usage[fixture scripts' 
API and usage].

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes.adoc
index 25cde24..f63cab2 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes.adoc
@@ -44,7 +44,7 @@ Param
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].
 ====
 
 See also 
xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_removeFrom[`removeFrom...()`]`
@@ -142,7 +142,7 @@ See also 
xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_clear[`clear...()`]`.
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].
 ====
 
 See also xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_addTo[`addTo...()`]`
@@ -177,7 +177,7 @@ AddTo...()`]
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].
 ====
 
 See also 
xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_validateRemoveFrom[`validateRemoveFrom...()`],
 and xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_validate[`validate...()`] 
for properties and actions.
@@ -193,7 +193,7 @@ RemoveFrom...()`]
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].
 ====
 
 See also 
xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_validateAddTo[`validateAddTo...()`],
 and xref:../rgcms/rgcms.adoc#_rgcms_methods_prefixes_validate[`validate...()`] 
for properties and actions.

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_addTo.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_addTo.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_addTo.adoc
index 5ab34de..ba67ff6 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_addTo.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_addTo.adoc
@@ -11,7 +11,7 @@ The `addTo...()` supporting method is called whenever an 
object is added to a co
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply define 
an action.
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply 
define an action.
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_disable.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_disable.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_disable.adoc
index 16ca889..b4e4e86 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_disable.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_disable.adoc
@@ -12,14 +12,14 @@ It allows the modification of the property/collection to be 
vetoed (ie made read
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer]; they are always implicitly disabled.
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer]; they are always implicitly disabled.
 ====
 
 Typically modification/invocation is vetoed based on the state of the domain 
object being interacted with, though it could be any reason at all (eg the 
current date/time of the interaction, or the state of some other related data 
such as stock levels, or the identity of the calling user).
 
 
 The reason for vetoing a modification/invocation is normally returned as a 
string.
-However, Apache Isis' xref:ugbtb.adoc#_ugbtb_i18n[i18n support] extends this 
so that reasons can be internationalized.
+However, Apache Isis' xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[i18n support] 
extends this so that reasons can be internationalized.
 
 
 
@@ -89,6 +89,6 @@ public class Customer {
 In the case of actions, the framework will also search for supporting method 
that has the exact same parameter types as the action itself.
 Enabling `isis.reflector.validator.noParamsOnly` configuration property 
switches this off, so that the framework will only search for supporting method 
with no parameters.
 
-Note that enabling this configuration property in effect means that 
xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins[mixins] must be used instead of 
xref:ugbtb.adoc#_ugbtb_decoupling_contributions[contributed services] (because 
contributed actions are the one case where the value of a parameter to a 
supporting method may be non-null).
+Note that enabling this configuration property in effect means that 
xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins[mixins] must be used instead of 
xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_contributions[contributed services] 
(because contributed actions are the one case where the value of a parameter to 
a supporting method may be non-null).
 ====
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_hide.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_hide.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_hide.adoc
index 7566041..7c90d4b 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_hide.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_hide.adoc
@@ -65,6 +65,6 @@ public class Customer {
 In the case of actions, the framework will also search for supporting method 
that has the exact same parameter types as the action itself.
 Enabling `isis.reflector.validator.noParamsOnly` configuration property 
switches this off, so that the framework will only search for supporting method 
with no parameters.
 
-Note that enabling this configuration property in effect means that 
xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins[mixins] must be used instead of 
xref:ugbtb.adoc#_ugbtb_decoupling_contributions[contributed services] (because 
contributed actions are the one case where the value of a parameter to a 
supporting method may be non-null).
+Note that enabling this configuration property in effect means that 
xref:../rgcms/rgcms.adoc#_rgcms_classes_mixins[mixins] must be used instead of 
xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_contributions[contributed services] 
(because contributed actions are the one case where the value of a parameter to 
a supporting method may be non-null).
 ====
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_removeFrom.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_removeFrom.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_removeFrom.adoc
index e7e07fa..a95aa44 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_removeFrom.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_removeFrom.adoc
@@ -11,7 +11,7 @@ The `removeFrom...()` supporting method is called whenever an 
object is removed
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply define 
an action.
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply 
define an action.
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validate.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validate.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validate.adoc
index 4bf3c75..7f3587d 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validate.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validate.adoc
@@ -11,7 +11,7 @@ It allows the proposed new value for a property to be 
rejected, or the proposed
 
 
 The reason for vetoing a modification/invocation is normally returned as a 
string.
-However, Apache Isis' xref:ugbtb.adoc#_ugbtb_i18n[i18n support] extends this 
so that reasons can be internationalized if required.
+However, Apache Isis' xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[i18n support] 
extends this so that reasons can be internationalized if required.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateAddTo.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateAddTo.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateAddTo.adoc
index afb2550..50e11ec 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateAddTo.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateAddTo.adoc
@@ -11,7 +11,7 @@ The `validateAddTo...()` supporting method is called whenever 
an object is to be
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply define 
an action.
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply 
define an action.
 ====
 
 
@@ -22,7 +22,7 @@ The signature of the supporting method for a collection with 
element type `E` is
 public String validateAddToXxx(E element) { ... }
 ----
 
-where the returned string is the reason the collection modification invocation 
is vetoed (or `null` if not vetoed).  Apache Isis' 
xref:ugbtb.adoc#_ugbtb_i18n[i18n support] extends this so that reasons can be 
internationalized if required.
+where the returned string is the reason the collection modification invocation 
is vetoed (or `null` if not vetoed).  Apache Isis' 
xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[i18n support] extends this so that reasons 
can be internationalized if required.
 
 
 For example:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateRemoveFrom.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateRemoveFrom.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateRemoveFrom.adoc
index acbd98e..cec48a7 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateRemoveFrom.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_prefixes_validateRemoveFrom.adoc
@@ -11,7 +11,7 @@ The `validateRemoveFrom...()` supporting method is called 
whenever an object is
 
 [NOTE]
 ====
-Directly mutable collections are not currently supported by the 
xref:ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply define 
an action.
+Directly mutable collections are not currently supported by the 
xref:../ugvw/ugvw.adoc#[Wicket viewer].  The suggested workaround is to simply 
define an action.
 ====
 
 
@@ -22,7 +22,7 @@ The signature of the supporting method for a collection with 
element type `E` is
 public String validateRemoveFromXxx(E element) { ... }
 ----
 
-where the returned string is the reason the collection modification invocation 
is vetoed (or `null` if not vetoed).  Apache Isis' 
xref:ugbtb.adoc#_ugbtb_i18n[i18n support] extends this so that reasons can be 
internationalized if required.
+where the returned string is the reason the collection modification invocation 
is vetoed (or `null` if not vetoed).  Apache Isis' 
xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[i18n support] extends this so that reasons 
can be internationalized if required.
 
 
 For example:

Reply via email to