http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_eagerly-registering-entities.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_eagerly-registering-entities.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_eagerly-registering-entities.adoc
index c947ae6..3865041 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_eagerly-registering-entities.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_eagerly-registering-entities.adoc
@@ -18,6 +18,6 @@ The framework thus provide mechanisms to search for all 
`@PersistenceCapable` en
 
 * for earlier versions the 
`isis.persistor.datanucleus.RegisterEntities.packagePrefix` configuration 
property can be specified.  To bootstrap as a webapp this is usually specified 
in `persistor_datanucleus.properties`.  (This is also supported in 1.9.0 if no 
`AppManifest` is specified.  For integration testing this can be specified 
programatically.
 
-Further discussion on specifying the package(s) in integration testing (for 
either approach) can be found in the 
xref:ugtst.adoc#_ugtst_integ-test-support_bootstrapping[user guide].
+Further discussion on specifying the package(s) in integration testing (for 
either approach) can be found in the 
xref:../ugtst/ugtst.adoc#_ugtst_integ-test-support_bootstrapping[user guide].
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_properties.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_properties.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_properties.adoc
index ff1be04..8e5c83e 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_properties.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_configuring_properties.adoc
@@ -28,7 +28,7 @@ These configuration properties are typically stored in 
`WEB-INF/persistor_datanu
 |`isis.persistor.datanucleus.` +
 `RegisterEntities.packagePrefix`
 |fully qualified package names (CSV)
-|that specifies the entities early rather than allow DataNucleus to find the 
entities lazily.  Further 
xref:ugodn.adoc#_ugodn_configuring_eagerly-registering-entities[discussion 
below].
+|that specifies the entities early rather than allow DataNucleus to find the 
entities lazily.  Further 
xref:../ugodn/ugodn.adoc#_ugodn_configuring_eagerly-registering-entities[discussion
 below].
 
 This property is IGNORED if the 
xref:../rgcfg/rgcfg.adoc#_rgcfg_configuring-components[`isis.appManifest`] 
configuration property is specified, or if an 
xref:../rgcms/rgcms.adoc#_rgcms_classes_super_AppManifest[`AppManifest`] is 
provided programmatically.
 
@@ -60,7 +60,7 @@ This property is IGNORED if the 
xref:../rgcfg/rgcfg.adoc#_rgcfg_configuring-comp
 `datanucleus.persistenceByReachabilityAtCommit`
 |`false`
 |We recommend this setting is disabled.  +
-Further 
xref:ugodn.adoc#_ugodn_configuring_disabling-persistence-by-reachability[discussion
 below].
+Further 
xref:../ugodn/ugodn.adoc#_ugodn_configuring_disabling-persistence-by-reachability[discussion
 below].
 
 |===
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_configuring-isis-to-use-shiro.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_configuring-isis-to-use-shiro.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_configuring-isis-to-use-shiro.adoc
index 62645cd..f1aa95d 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_configuring-isis-to-use-shiro.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_configuring-isis-to-use-shiro.adoc
@@ -38,7 +38,7 @@ be configured in `authentication_shiro.properties` file:
 isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false
 ----
 
-This configuration property only comes into effect for the 
xref:ugvro.adoc#[Restful Objects viewer]; if set then
+This configuration property only comes into effect for the 
xref:../ugvro/ugvro.adoc#[Restful Objects viewer]; if set then
 the Shiro subject - if found to be still authenticated - will be logged out 
anyway and then re-authenticated.
 
 [WARNING]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-ini-realm.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-ini-realm.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-ini-realm.adoc
index 306ecb3..3e3ce94 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-ini-realm.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-ini-realm.adoc
@@ -105,7 +105,7 @@ com.mycompany.myapp                          # ditto
 
 [TIP]
 ====
-The format of the permissions string is configurable in Shiro, and Apache Isis 
uses this to provide an extended wildcard format, described 
xref:ugsec.adoc#_ugsec_shiro-isis-enhanced-wildcard-permission[here].
+The format of the permissions string is configurable in Shiro, and Apache Isis 
uses this to provide an extended wildcard format, described 
xref:../ugsec/ugsec.adoc#_ugsec_shiro-isis-enhanced-wildcard-permission[here].
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-isis-enhanced-wildcard-permission.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-isis-enhanced-wildcard-permission.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-isis-enhanced-wildcard-permission.adoc
index 35ae045..241a297 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-isis-enhanced-wildcard-permission.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_shiro-isis-enhanced-wildcard-permission.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-If using the text-based xref:ugsec.adoc#_ugsec_shiro-ini-realm[`IniRealm`] or 
xref:ugsec.adoc#_ugsec_shiro-isis-ldap-realm[Isis' LDAP realm], then note that 
Shiro also allows the string representation of the permissions to be mapped 
(resolved) to alternative `Permission` instances.  Apache Isis provides its own 
`IsisPermission` which introduces the concept of a "veto".
+If using the text-based 
xref:../ugsec/ugsec.adoc#_ugsec_shiro-ini-realm[`IniRealm`] or 
xref:../ugsec/ugsec.adoc#_ugsec_shiro-isis-ldap-realm[Isis' LDAP realm], then 
note that Shiro also allows the string representation of the permissions to be 
mapped (resolved) to alternative `Permission` instances.  Apache Isis provides 
its own `IsisPermission` which introduces the concept of a "veto".
 
 A vetoing permission is one that prevents access to a feature, rather than 
grants it.  This is useful in some situations where most users have access to 
most features, and only a small number of features are particularly sensitive.  
The configuration can therefore be set up to grant fairly broad-brush 
permissions and then veto permission for the sensitive features for those users 
that do not have access.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
index 06c3dab..f6a8fa4 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugsec/_ugsec_usage-by-isis-viewers.adoc
@@ -6,7 +6,7 @@
 
 
 
-By and large the security mechanisms within Isis are transparent to the rest 
of the framework (the xref:ugvw.adoc#[Wicket Viewer] and 
xref:ugvro.adoc#[Restful Objects viewer], and the overall 
xref:../rgcfg/rgcfg.adoc#_rgcfg[runtime]).
+By and large the security mechanisms within Isis are transparent to the rest 
of the framework (the xref:../ugvw/ugvw.adoc#[Wicket Viewer] and 
xref:../ugvro/ugvro.adoc#[Restful Objects viewer], and the overall 
xref:../rgcfg/rgcfg.adoc#_rgcfg[runtime]).
 
 That said, it is the responsibility of the viewers to ensure that there is a 
viewers to ensure that for each request there is a valid user session present.  
The sections below explain how this works.
 
@@ -15,7 +15,7 @@ That said, it is the responsibility of the viewers to ensure 
that there is a vie
 
 == Wicket Viewer
 
-The xref:ugvw.adoc#[Wicket viewer] defines a relatively small number of pages 
(by which we mean subclasses of 
link:http://ci.apache.org/projects/wicket/apidocs/6.0.x/org/apache/wicket/markup/html/WebPage.html[`org.apache.wicket.markup.html.WebPage`]):
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] defines a relatively small number 
of pages (by which we mean subclasses of 
link:http://ci.apache.org/projects/wicket/apidocs/6.0.x/org/apache/wicket/markup/html/WebPage.html[`org.apache.wicket.markup.html.WebPage`]):
 
 * about page
 * action prompt page
@@ -37,7 +37,7 @@ which means that they can only be accessed by a user with an 
authenticated sessi
 
 [TIP]
 ====
-The sign-in page to render is pluggable; see 
xref:ugvw.adoc#_ugvw_extending_custom-pages[extensions chapter] for details.
+The sign-in page to render is pluggable; see 
xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-pages[extensions chapter] for 
details.
 ====
 
 In the sign-in page the viewer calls to the Isis Authenticator API, and 
obtains back a user/role.  It also adds in its special reserved role (per the 
annotation above) and then continues on to whichever page the user was 
attempting to access (usually the home page).
@@ -49,11 +49,11 @@ Similarly, for those object members that _are_ visible, the 
viewer also checks i
 
 === User-registration
 
-As well as providing a sign-in screen, the Wicket viewer also provides the 
ability for xref:_user_registration[users to self-register].  By and large this 
operates outside of Apache Isis' security mechanisms; indeed the various pages 
(sign-up, sign-up verification, password reset) are all rendered _without_ 
there being any current user session.  These pages all "reach inside" Apache 
Isis framework using a mechanism similar to 
xref:ugbtb.adoc#_ugbtb_headless-access[Headless access] in order to actually do 
their stuff.
+As well as providing a sign-in screen, the Wicket viewer also provides the 
ability for xref:_user_registration[users to self-register].  By and large this 
operates outside of Apache Isis' security mechanisms; indeed the various pages 
(sign-up, sign-up verification, password reset) are all rendered _without_ 
there being any current user session.  These pages all "reach inside" Apache 
Isis framework using a mechanism similar to 
xref:../ugbtb/ugbtb.adoc#_ugbtb_headless-access[Headless access] in order to 
actually do their stuff.
 
 [TIP]
 ====
-The sign-in verification page to render is pluggable; see 
xref:ugvw.adoc#_ugvw_extending_custom-pages[extensions chapter] for details.
+The sign-in verification page to render is pluggable; see 
xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-pages[extensions chapter] for 
details.
 ====
 
 User registration is only available if the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_UserRegistrationService[`UserRegistrationService`]
 is configured; this is used by the framework to actually create new instances 
of the user as accessed by the corresponding (Shiro) realm.
@@ -66,7 +66,7 @@ If you are using an LDAP realm and want to enable user-self 
registration then yo
 
 == Restful Objects Viewer
 
-Unlike the Wicket viewer, the xref:ugvro.adoc#[Restful Objects viewer] does 
*not* provide any sort of login page; rather it provides a pluggable 
authentication strategy, delegated to by the `IsisSessionFilter` filter defined 
in `web.xml`.  The authentication strategy is responsible for ensuring that a 
session is available for the REST resource.
+Unlike the Wicket viewer, the xref:../ugvro/ugvro.adoc#[Restful Objects 
viewer] does *not* provide any sort of login page; rather it provides a 
pluggable authentication strategy, delegated to by the `IsisSessionFilter` 
filter defined in `web.xml`.  The authentication strategy is responsible for 
ensuring that a session is available for the REST resource.
 
 The API of `AuthenticationSessionStrategy` is simply:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_key-classes.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_key-classes.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_key-classes.adoc
index b6fdf5e..fba3f67 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_key-classes.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_key-classes.adoc
@@ -9,7 +9,7 @@
 
 There are some key framework classes that make up the spec support; these are 
discussed below.
 
-NOTE: some of these are also used by Apache Isis' 
xref:ugtst.adoc#_ugtst_integ-test-support[Integration Test support].
+NOTE: some of these are also used by Apache Isis' 
xref:../ugtst/ugtst.adoc#_ugtst_integ-test-support[Integration Test support].
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
index cc5246d..d4a7be0 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
@@ -21,7 +21,7 @@ For example, given a feature that involves `Customer` and 
`Order`, have the step
 +
 The `glue` attribute of the Cucumber-JVM JUnit runner eallows you to indicate 
which package(s) should be recursively searched to find any glue.
 
-* a system initializer class.  You can reuse the  system initializer from any 
integration tests (as described in 
xref:ugtst.adoc#_ugtst_integ-test-support[Integration Test Support], 
bootstrapping section).
+* a system initializer class.  You can reuse the  system initializer from any 
integration tests (as described in 
xref:../ugtst/ugtst.adoc#_ugtst_integ-test-support[Integration Test Support], 
bootstrapping section).
 
 
 Here's an example of a feature from the 
xref:../ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp 
archetype]:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
index b94a39a..d7a21d2 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_fixture-scripts_api-and-usage.adoc
@@ -42,7 +42,7 @@ public class DomainAppFixturesProvider implements 
FixtureScriptsSpecificationPro
 }
 ----
 <1> search for all fixture scripts under the package containing this class
-<2> if the same fixture script (class) is encountered more than once, then run 
anyway; more on this in 
xref:ugtst.adoc#__ugtst_fixture-scripts_api-and-usage_organizing[Organizing 
Fixture scripts]], below.
+<2> if the same fixture script (class) is encountered more than once, then run 
anyway; more on this in 
xref:../ugtst/ugtst.adoc#__ugtst_fixture-scripts_api-and-usage_organizing[Organizing
 Fixture scripts]], below.
 <3> specify the fixture script class to provide as the default for the 
service's "run fixture script" action
 <4> whether the service's "run fixture script" action should display other 
fixture scripts using a choices drop down or (if there are very many of them) 
using an auto-complete
 <5> if present, enables a "recreate objects and return first" action to be 
displayed in the UI
@@ -80,7 +80,7 @@ public class DomainAppFixturesService extends FixtureScripts 
{     // <3>
 <2> ... under the "Prototyping" menu
 <3> inherit from `org.apache.isis.applib.fixturescripts.FixtureScripts`
 <4> search for all fixture scripts under the "domainapp" package; in your code 
this would probably be "com.mycompany.myapp" or similar
-<5> if the same fixture script (class) is encountered more than once, then run 
anyway; more on this in 
xref:ugtst.adoc#__ugtst_fixture-scripts_api-and-usage_organizing[Organizing 
Fixture scripts]], below.
+<5> if the same fixture script (class) is encountered more than once, then run 
anyway; more on this in 
xref:../ugtst/ugtst.adoc#__ugtst_fixture-scripts_api-and-usage_organizing[Organizing
 Fixture scripts]], below.
 <6> (optional) specify a default fixture script to run, in this case 
`RecreateSimpleObjects` fixture script (see below)
 <7> make all fixture scripts found available as a drop-down (by increasing the 
visibility of this method to `public`)
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_bootstrapping.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_bootstrapping.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_bootstrapping.adoc
index 8ce55e3..d9b3939 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_bootstrapping.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_bootstrapping.adoc
@@ -259,7 +259,7 @@ public abstract class DomainAppIntegTest {
 ----
 <1> ensure that logging messages don't get swallowed
 <2> initialize the Apache Isis runtime
-<3> primarily exists to support the writing of 
xref:ugtst.adoc#_ugtst_bdd-spec-support[BDD specifications], but also enables 
finer-grained management of sessions/transactions (discussed below).
+<3> primarily exists to support the writing of 
xref:../ugtst/ugtst.adoc#_ugtst_bdd-spec-support[BDD specifications], but also 
enables finer-grained management of sessions/transactions (discussed below).
 
 
 [[__ugtst_integ-test-support_bootstrapping_IntegrationTestAbstract]]
@@ -292,9 +292,9 @@ Although not mandatory, this provides a number of 
helper/convenience methods and
         ExceptionRecognizerTranslate.create();
 ----
 <1> ensures an Apache Isis session/transaction running for each test
-<2> sets up a JMock context (using Apache Isis' extension to JMock as 
described in xref:ugtst.adoc#_ugtst_unit-test-support_jmock-extensions[JMock 
Extensions].
+<2> sets up a JMock context (using Apache Isis' extension to JMock as 
described in 
xref:../ugtst/ugtst.adoc#_ugtst_unit-test-support_jmock-extensions[JMock 
Extensions].
 <3> standard JUnit rule for writing tests that throw exceptions
-<4> to capture messages that require translation, as described in 
xref:ugbtb.adoc#_ugbtb_i18n[i18 support].
+<4> to capture messages that require translation, as described in 
xref:../ugbtb/ugbtb.adoc#_ugbtb_i18n[i18 support].
 
 All of these rules could be inlined in your own base class; as we say, they 
are a convenience.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_wrapper-factory.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_wrapper-factory.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_wrapper-factory.adoc
index cfaa0be..6cd7ec7 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_wrapper-factory.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugtst/_ugtst_integ-test-support_wrapper-factory.adoc
@@ -86,7 +86,7 @@ If there is a supporting `addTo...()` or `removeFrom...()` 
method, then these ca
 +
 [NOTE]
 ====
-In this respect the wrapper is more functional than the xref:ugvw.adoc#[Wicket 
viewer] (which does not expose the ability to mutate collections directly).
+In this respect the wrapper is more functional than the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] (which does not expose the ability to 
mutate collections directly).
 ====
 
 * for *_object actions_* the test can call the action method itself.

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_architecture.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_architecture.adoc 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_architecture.adoc
index 24c3228..5f089e7 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_architecture.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_architecture.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The xref:ugvro.adoc#[RestfulObjects viewer] implements the 
http://restfulobjects.org[Restful Object spec], meaning
+The xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] implements the 
http://restfulobjects.org[Restful Object spec], meaning
 that it defines a well-defined set of endpoint URLs as resources, and 
generates a well-defined set of (JSON)
 representations when these resources are accessed.
 
@@ -33,7 +33,7 @@ 
xref:../rgfis/rgfis.adoc#_rgfis_spi_ContentNegotiationService[`ContentNegotiatio
 HTTP `Accept` header.  If the implementation does not recognize the value of 
the header, if can simply return `null`. +
 +
 The framework provides a number of implementations; an implementation that 
handles the
-xref:ugvro.adoc#_ugvro_simplified-representations[simplified representation] 
of the Apache Isis profile; an implementation that provides support for the 
`x-ro-domain-type` parameter, and a
+xref:../ugvro/ugvro.adoc#_ugvro_simplified-representations[simplified 
representation] of the Apache Isis profile; an implementation that provides 
support for the `x-ro-domain-type` parameter, and a
 default/fallback implementation that returns the representations defined by 
the RO spec.
 
 * `ContentMappingService` +

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_configuration-properties.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_configuration-properties.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_configuration-properties.adoc
index 9480a90..6d88120 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_configuration-properties.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_configuration-properties.adoc
@@ -29,7 +29,7 @@ The following configuration properties are supported:
 |`isis.viewer.restfulobjects.` +
 `honorUiHints`
 | `true`,`false` (`_false_`)
-|A mechanism for reducing the number of round-trips by eagerly rendering 
collections; discussed 
xref:ugvro.adoc#___ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints[here].
+|A mechanism for reducing the number of round-trips by eagerly rendering 
collections; discussed 
xref:../ugvro/ugvro.adoc#___ugvro_ro-spec_extensions_minimizing-round-trips_honor-ui-hints[here].
 
 |`isis.viewer.restfulobjects.` +
 `strictAcceptChecking`
@@ -38,7 +38,7 @@ The following configuration properties are supported:
 `ContentNegotiationServiceForRestfulObjectsV1_0` service). Will otherwise 
accept anything.  +
 
 This is convenient because it allows the `Accept` header to be set to that of 
the
-xref:ugvro.adoc#_ugvro_simplified-representations[Apache Isis profile] for all 
resources, rather than simply the
+xref:../ugvro/ugvro.adoc#_ugvro_simplified-representations[Apache Isis 
profile] for all resources, rather than simply the
 handful of resources that supported that profile.
 
 |===
@@ -98,7 +98,7 @@ Nevertheless, those configuration properties are:
 |`isis.viewer.restfulobjects.` +
 `objectPropertyValuesOnly`
 | `true`,`false` (`_false_`)
-| See 
xref:ugvro.adoc#__ugvro_simplified-representations_configuration-properties_object-property-values-only[discussion]
 below.
+| See 
xref:../ugvro/ugvro.adoc#__ugvro_simplified-representations_configuration-properties_object-property-values-only[discussion]
 below.
 |
 
 |===
@@ -120,7 +120,7 @@ isis.viewer.restfulobjects.suppressMemberDisabledReason=true
 [NOTE]
 ====
 If these configuration settings are set in conjunction with using the
-xref:ugvro.adoc#__ugvro_simplified-representations_apache-isis-profile[Apache 
Isis profile], then the special `$$ro`
+xref:../ugvro/ugvro.adoc#__ugvro_simplified-representations_apache-isis-profile[Apache
 Isis profile], then the special `$$ro`
 property in the representations with reflect these settings.
 ====
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_ro-spec.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_ro-spec.adoc 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_ro-spec.adoc
index ff033e5..52bd922 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_ro-spec.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_ro-spec.adoc
@@ -132,7 +132,7 @@ Accept: 
application/xml;x-ro-domain-type="com.mycompany.viewmodels.v2.CustomerVi
 
 The server will use the 
xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]
 to attempt to
 transform the domain object into the requested `x-ro-domain-type`.  The whole 
process is discussed in more detail in
-the xref:ugvro.adoc#_ugvro_architecture[architecture] chapter.
+the xref:../ugvro/ugvro.adoc#_ugvro_architecture[architecture] chapter.
 
 
 [[___ugvro_ro-spec_extensions_content-negotiation_apache-isis-profile]]
@@ -145,7 +145,7 @@ link:http://angular-ui.github.io/bootstrap/[Angular 
Bootstrap],
 link:http://vitalets.github.io/angular-xeditable/[Angular XEditable],
 link:https://github.com/mgcrea/angular-strap[Angular Strap].
 
-This support is discussed further in the 
xref:ugvro.adoc#_ugvro_simplified-representations[simplified representations]
+This support is discussed further in the 
xref:../ugvro/ugvro.adoc#_ugvro_simplified-representations[simplified 
representations]
 chapter.
 
 
@@ -154,7 +154,7 @@ chapter.
 
 The Restful Objects viewer supports the `x-ro-follow-links` query parameter in 
a way very similar to that suggested
 in the RO spec, the main point being to avoid the "N+1" problem of too many 
(slow) network calls.  For example, using
-this feature one can load a grid of data in a single call.  (That said, the 
xref:ugvro.adoc#_ugvro_simplified-representations[simplified representations]
+this feature one can load a grid of data in a single call.  (That said, the 
xref:../ugvro/ugvro.adoc#_ugvro_simplified-representations[simplified 
representations]
 supported by Restful Objects viewer also support this use case, albeit in way 
that deviates from the RO spec).
 
 This link:https://www.youtube.com/watch?v=hSKnqqBQ7Zo[screencast] demonstrates 
the Restful Object viewer's support for `x-ro-follow-links` parameter, using the

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations.adoc
index e43ffd5..3a61eb3 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations.adoc
@@ -16,7 +16,7 @@ link:https://github.com/mgcrea/angular-strap[Angular Strap].
 
 As of `1.11.0`, Apache Isis provides support for its own simplified 
representation for the most commonly-used
 representations.  This is implemented using the `ContentNegotiationService` 
described in the
-xref:ugvro.adoc#_ugvro_architecture[architecture] chapter.
+xref:../ugvro/ugvro.adoc#_ugvro_architecture[architecture] chapter.
 
 
 
@@ -222,7 +222,7 @@ When an action is invoked, it can return a domain object, a 
list, a scalar, or r
 === Returning an Object
 
 If the action returned an object, then the domain object representation 
described
-xref:ugvro.adoc#__ugvro_simplified-representations_domain-object[above] is 
returned.
+xref:../ugvro/ugvro.adoc#__ugvro_simplified-representations_domain-object[above]
 is returned.
 
 For example, using the (non-ASF) 
http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing
 this resource:
@@ -273,7 +273,7 @@ Content-Type: 
application/json;profile="urn:org.apache.isis/v1";repr-type="objec
 
 On the other hand if the action returned a list (a "standalone" collection, 
then an array representation is returned.
 This is very similar to that returned by a
-xref:ugvro.adoc#__ugvro_simplified-representations_object-collection[(parented)
 object collection], though with a
+xref:../ugvro/ugvro.adoc#__ugvro_simplified-representations_object-collection[(parented)
 object collection], though with a
 slightly different `Content-Type` to distinguish.
 
 For example, using the (non-ASF) 
http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations_configuration-properties.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations_configuration-properties.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations_configuration-properties.adoc
index fd63969..02862e7 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations_configuration-properties.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_simplified-representations_configuration-properties.adoc
@@ -13,6 +13,6 @@ are limited by the fact that they are global configuration 
settings, so cannot b
 basis (as is the case with the `Accept` header used for the Apache Isis 
profile). They have therefore been
 deprecated, and may be removed in the future.
 
-Details can be found in 
xref:ugvro.adoc#__ugvro_configuration-properties_deprecated[here].
+Details can be found in 
xref:../ugvro/ugvro.adoc#__ugvro_configuration-properties_deprecated[here].
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
index c33b46c..04be24b 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
@@ -108,19 +108,19 @@ for further details).
 `maxTitleLengthInParentedTables`
 | +ve integer +
 (`_12_`)
-| See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[below].
+| See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[below].
 
 |`isis.viewer.wicket.` +
 `maxTitleLengthInStandaloneTables`
 | +ve integer, +
 (`_12_`)
-| See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[below].
+| See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[below].
 
 |`isis.viewer.wicket.` +
 `maxTitleLengthInTables`
 | +ve integer, +
 (`_12_`)
-| See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[below].
+| See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[below].
 
 |`isis.viewer.wicket.` +
 `preventDoubleClickForFormSubmit`
@@ -182,13 +182,13 @@ In prototype mode, though, a fixed key will still be 
used; this saves the develo
 `stripWicketTags`
 | `true`,`false` +
 (`_true_`)
-| Whether to force Wicket tags to be stripped in prototype/development mode.  
See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_stripped-wicket-tags[below].
+| Whether to force Wicket tags to be stripped in prototype/development mode.  
See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_stripped-wicket-tags[below].
 
 |`isis.viewer.wicket.` +
 `suppressPasswordReset`
 | `true`,`false` +
 (`_false_`)
-|If user registration is enabled, whether to suppress the "password reset" 
link on the login page.  See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_suppressing-password-reset[below].
+|If user registration is enabled, whether to suppress the "password reset" 
link on the login page.  See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_suppressing-password-reset[below].
 
 |`isis.viewer.wicket.` +
 `suppressRememberMe`
@@ -200,7 +200,7 @@ In prototype mode, though, a fixed key will still be used; 
this saves the develo
 `suppressSignUp`
 | `true`,`false` +
 (`_false_`)
-|If user registration is enabled, whether to suppress the "sign up" link on 
the login page.  See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_suppressing-sign-up[below].
+|If user registration is enabled, whether to suppress the "sign up" link on 
the login page.  See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_suppressing-sign-up[below].
 
 |`isis.viewer.wicket.` +
 `timestampPattern`
@@ -212,13 +212,13 @@ In prototype mode, though, a fixed key will still be 
used; this saves the develo
 |`isis.viewer.wicket.` +
 `themes.enabled`
 | comma separated list ...
-| ... of bootswatch themes.  Only applies if `themes.showChooser`==`true`.  
See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_showing-theme-chooser[below].
+| ... of bootswatch themes.  Only applies if `themes.showChooser`==`true`.  
See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_showing-theme-chooser[below].
 
 |`isis.viewer.wicket.` +
 `themes.showChooser`
 | `true`,`false` +
 (`_false_`)
-| Whether to show chooser for Bootstrap themes.  See discussion 
xref:ugvw.adoc#_ugvw_configuration-properties_showing-theme-chooser[below]
+| Whether to show chooser for Bootstrap themes.  See discussion 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_showing-theme-chooser[below]
 
 |`isis.viewer.wicket.` +
 `useIndicatorForFormSubmit`

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_abbreviating-titles.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_abbreviating-titles.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_abbreviating-titles.adoc
index cd612b7..1aedb81 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_abbreviating-titles.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_abbreviating-titles.adoc
@@ -6,7 +6,7 @@
 
 
 
-Objects whose title is overly long can be cumbersome in titles.  The Wicket 
viewer has a xref:ugvw.adoc#_ugvw_features_titles-in-tables[mechanism to 
automatically shorten] the titles of objects specified using `@Title`.  As an 
alternative/in addition, the viewer can also be configured to simply truncate 
titles longer than a certain length.
+Objects whose title is overly long can be cumbersome in titles.  The Wicket 
viewer has a xref:../ugvw/ugvw.adoc#_ugvw_features_titles-in-tables[mechanism 
to automatically shorten] the titles of objects specified using `@Title`.  As 
an alternative/in addition, the viewer can also be configured to simply 
truncate titles longer than a certain length.
 
 The properties themselves are:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
index afeffc4..5b4c004 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_showing-theme-chooser.adoc
@@ -8,7 +8,7 @@
 
 The Wicket viewer uses http://getbootstrap.com/[Bootstrap] styles and 
components (courtesy of the 
https://github.com/l0rdn1kk0n/wicket-bootstrap[Wicket Bootstrap] integration).
 
-Unless a xref:ugvw.adoc#_ugvw_customisation_default-theme[default theme has 
been specified], the viewer uses the default bootstrap theme. However,
+Unless a xref:../ugvw/ugvw.adoc#_ugvw_customisation_default-theme[default 
theme has been specified], the viewer uses the default bootstrap theme. However,
 the viewer can also be configured to allow the end-user to switch theme to 
another theme, in particular one of those provided by 
http://bootswatch.com[bootswatch.com].
 
 This is done using the following configuration property (in 
`WEB-INF/viewer_wicket.properties`):
@@ -37,7 +37,7 @@ where the value is the list of themes (from 
http://bootswatch.com[bootswatch.com
 
 [TIP]
 ====
-You can also develop and install a custom themes (eg to fit your company's 
look-n-feel/interface guidelines); see the 
xref:ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[Extending] chapter for 
further details.
+You can also develop and install a custom themes (eg to fit your company's 
look-n-feel/interface guidelines); see the 
xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[Extending] 
chapter for further details.
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
index 240e7e4..daf1226 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-password-reset.adoc
@@ -39,7 +39,7 @@ Typically this should be added to the 
`viewer_wicket.properties` file (in `WEB-I
 
 == See also
 
-The xref:ugvw.adoc#_ugvw_configuration-properties_suppressing-sign-up[sign up 
link] can be suppressed in a similar manner.
+The 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_suppressing-sign-up[sign 
up link] can be suppressed in a similar manner.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
index 4afb734..6d20fea 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties_suppressing-sign-up.adoc
@@ -41,7 +41,7 @@ isis.viewer.wicket.suppressSignUp=true
 
 == See also
 
-The 
xref:ugvw.adoc#_ugvw_configuration-properties_suppressing-password-reset[password
 reset link] can be suppressed in a similar manner.
+The 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_suppressing-password-reset[password
 reset link] can be suppressed in a similar manner.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
index 7218453..3e4f01b 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_about-page.adoc
@@ -17,7 +17,7 @@ 
image::{_imagesdir}about-page/about-page.png[width="800px",link="{_imagesdir}abo
 
 [NOTE]
 ====
-Note that this screenshot shows an earlier version of the 
xref:ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot shows an earlier version of the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 Note that the `Build-Time` attribute has been used as the version number. The 
Wicket viewer is hard-coded to search for specific attributes and use as the 
application version. In order, it searches for:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_cheap-n-cheerful-theme.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_cheap-n-cheerful-theme.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_cheap-n-cheerful-theme.adoc
index 67f3313..0bd3795 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_cheap-n-cheerful-theme.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_cheap-n-cheerful-theme.adoc
@@ -22,7 +22,7 @@ You can therefore use this CSS class as a way of building 
your own "theme" for t
 
 [TIP]
 ====
-Alternatively you could "do it properly" and create your 
xref:ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[own Bootstrap theme], as 
described in the xref:ugbtb.adoc#[Extending] chapter.
+Alternatively you could "do it properly" and create your 
xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[own Bootstrap 
theme], as described in the xref:../ugbtb/ugbtb.adoc#[Extending] chapter.
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_custom-javascript.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_custom-javascript.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_custom-javascript.adoc
index 36d303d..cee1faf 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_custom-javascript.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_custom-javascript.adoc
@@ -12,7 +12,7 @@ The Wicket viewer ships with embedded JQuery, so this can be 
leveraged to perfor
 ====
 Just because something is possible, it doesn't necessarily mean we encourage 
it.  Please be aware that there is no formal API for any custom javascript that 
you might implement to target; future versions of Apache Isis might break your 
code.
 
-If possible, consider using the `ComponentFactory` API described in the 
xref:ugvw.adoc#_ugvw_extending[Extending] chapter.
+If possible, consider using the `ComponentFactory` API described in the 
xref:../ugvw/ugvw.adoc#_ugvw_extending[Extending] chapter.
 ====
 
 To register your Javascript code, adjusting the Guice bindings (part of Apache 
Isis' bootstrapping) in your custom subclass of `IsisWicketApplication`:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc
index 9de200f..837c941 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_default-theme.adoc
@@ -21,7 +21,7 @@ protected void init() {
 }
 ----
 
-If you have developed a custom Bootstrap theme (as described 
xref:ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[here]) then this can also 
be specified using the 
https://github.com/l0rdn1kk0n/wicket-bootstrap/wiki/Themes[Wicket Bootstrap 
API].
+If you have developed a custom Bootstrap theme (as described 
xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[here]) then this 
can also be specified using the 
https://github.com/l0rdn1kk0n/wicket-bootstrap/wiki/Themes[Wicket Bootstrap 
API].
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
index 1413b91..14921f4 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_customisation_tweaking-css-classes.adoc
@@ -92,7 +92,7 @@ div.x-myapp-highlight span.scalarName {
 }
 ----
 
-Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, 
you can also specify the CSS style using a 
xref:ugvw.adoc#_ugvw_layout_file-based[layout file].
+Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, 
you can also specify the CSS style using a 
xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[layout file].
 
 
 
@@ -188,7 +188,7 @@ For example:
 </div>
 ----
 <1> the parent class identifier
-<2> the collection identifier. This element's class also has the entity type 
within the collection (as 
xref:ugvw.adoc#__ugvw_customisation_tweaking-css-classes_columns-in-tables_globally[discussed
 above]).
+<2> the collection identifier. This element's class also has the entity type 
within the collection (as 
xref:../ugvw/ugvw.adoc#__ugvw_customisation_tweaking-css-classes_columns-in-tables_globally[discussed
 above]).
 
 Using this, the `productRef` property could be targeted using:
 
@@ -232,7 +232,7 @@ Standalone collections will be wrapped in a ``<div>`` that 
identifies the action
     </div>
 </div>
 ----
-<1> action identifier.  This element's class also identifies the entity type 
within the collection (as 
xref:ugvw.adoc#__ugvw_customisation_tweaking-css-classes_columns-in-tables_globally[discussed
 above]).
+<1> action identifier.  This element's class also identifies the entity type 
within the collection (as 
xref:../ugvw/ugvw.adoc#__ugvw_customisation_tweaking-css-classes_columns-in-tables_globally[discussed
 above]).
 
 Using this, the `quantity` property could be targeted using:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending.adoc 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending.adoc
index 6100909..d35b10c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending.adoc
@@ -7,13 +7,13 @@
 
 The Wicket viewer allows you to customize the GUI in several (progressively 
more sophisticated) ways:
 
-* by xref:ugvw.adoc#_ugvw_customisation_tweaking-css-classes[tweaking the UI 
using CSS]
-* by xref:ugvw.adoc#_ugvw_customisation_custom-javascript[tweaking the UI 
using Javascript]
-* by writing a xref:ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[custom 
bootstrap theme]
-* by xref:ugvw.adoc#_ugvw_extending_replacing-page-elements[replacing elements 
of the page] using the `ComponentFactory` interface
-* by implementing xref:ugvw.adoc#_ugvw_extending_custom-pages[replacement page 
implementations] for the standard page types
+* by xref:../ugvw/ugvw.adoc#_ugvw_customisation_tweaking-css-classes[tweaking 
the UI using CSS]
+* by xref:../ugvw/ugvw.adoc#_ugvw_customisation_custom-javascript[tweaking the 
UI using Javascript]
+* by writing a 
xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-bootstrap-theme[custom bootstrap 
theme]
+* by xref:../ugvw/ugvw.adoc#_ugvw_extending_replacing-page-elements[replacing 
elements of the page] using the `ComponentFactory` interface
+* by implementing 
xref:../ugvw/ugvw.adoc#_ugvw_extending_custom-pages[replacement page 
implementations] for the standard page types
 
-The first two of these options are discussed in the xref:ugvw.adoc#[Wicket 
viewer] chapter.  This chapter describes the remaining "heavier-weight/more 
powerful" options.
+The first two of these options are discussed in the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] chapter.  This chapter describes the 
remaining "heavier-weight/more powerful" options.
 
 The chapter wraps up with a technique for prototyping, allowing user/passwords 
to be specified as query arguments.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-bootstrap-theme.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-bootstrap-theme.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-bootstrap-theme.adoc
index 472fdd6..e52d7d5 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-bootstrap-theme.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-bootstrap-theme.adoc
@@ -8,7 +8,7 @@
 
 The Apache Isis Wicket viewer uses http://getbootstrap.com/[Bootstrap] styles 
and components (courtesy of the 
https://github.com/l0rdn1kk0n/wicket-bootstrap[Wicket Bootstrap] integration).
 
-By default the viewer uses the default bootstrap theme. It is possible to 
configure the Wicket viewer to allow the user to 
xref:ugvw.adoc#_ugvw_configuration-properties_showing-theme-chooser[select 
other themes] provided by http://bootswatch.com[bootswatch.com], and if 
required one of these can be 
xref:ugvw.adoc#_ugvw_customisation_default-theme[set as the default].
+By default the viewer uses the default bootstrap theme. It is possible to 
configure the Wicket viewer to allow the user to 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_showing-theme-chooser[select
 other themes] provided by http://bootswatch.com[bootswatch.com], and if 
required one of these can be 
xref:../ugvw/ugvw.adoc#_ugvw_customisation_default-theme[set as the default].
 
 However, you may instead want to write your own custom theme, for example to 
fit your company's look-n-feel/interface guidelines. This is done by 
implementing https://github.com/l0rdn1kk0n/wicket-bootstrap[Wicket 
Bootstrap]’s `de.agilecoders.wicket.core.settings.ITheme` class. This defines:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-pages.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-pages.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-pages.adoc
index 1f143c1..0a37f43 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-pages.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_custom-pages.adoc
@@ -6,7 +6,7 @@
 
 
 
-In the vast majority of cases customization should be sufficient by 
xref:ugvw.adoc#_ugvw_extending_replacing-page-elements[replacing elements of a 
page]. However, it is also possible to define an entirely new page for a given 
page type.
+In the vast majority of cases customization should be sufficient by 
xref:../ugvw/ugvw.adoc#_ugvw_extending_replacing-page-elements[replacing 
elements of a page]. However, it is also possible to define an entirely new 
page for a given page type.
 
 Isis defines eight page types (see the 
`org.apache.isis.viewer.wicket.model.models.PageType` enum):
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
index 782596b..bd369e1 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_extending_replacing-page-elements.adoc
@@ -27,7 +27,7 @@ There will typically be only one `ComponentFactory` capable 
of rendering a parti
 
 [NOTE]
 ====
-There is one refinement to the above algorithm where multiple component 
factories might be used to render an object; this is discussed in 
xref:ugvw.adoc#__ugvw_extending_replacing-page-elements_collections[Additional 
Views of Collections], below.
+There is one refinement to the above algorithm where multiple component 
factories might be used to render an object; this is discussed in 
xref:../ugvw/ugvw.adoc#__ugvw_extending_replacing-page-elements_collections[Additional
 Views of Collections], below.
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
index 59579a3..8114efd 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_blob-attachments.adoc
@@ -28,7 +28,7 @@ 
image::{_imagesdir}blob-attachments/010-attachment-field-940.png[width="800px",l
 
 [NOTE]
 ====
-Note that these screenshots show an earlier version of the 
xref:ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that these screenshots show an earlier version of the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
index 9ce7313..2424d19 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_bookmarked-pages.adoc
@@ -23,7 +23,7 @@ 
image::{_imagesdir}bookmarked-pages/panel.png[width="800px",link="{_imagesdir}bo
 
 [NOTE]
 ====
-Note that these screenshots show an earlier version of the 
xref:ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that these screenshots show an earlier version of the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 Note how the list contains both domain objects and an action ("not yet 
complete").
@@ -92,7 +92,7 @@ Alternatively, `alt+[` will toggle open/close the panel; it 
can also be closed u
 
 === Related functionality
 
-The xref:ugvw.adoc#_ugvw_features_recent-pages[Recent Pages] also lists 
recently visited pages, selected from a drop-down.
+The xref:../ugvw/ugvw.adoc#_ugvw_features_recent-pages[Recent Pages] also 
lists recently visited pages, selected from a drop-down.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
index 7948b12..c528c43 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_hints-and-copy-url.adoc
@@ -27,7 +27,7 @@ 
image::{_imagesdir}copy-link/010-copy-link-button.png[width="800px",link="{_imag
 
 [NOTE]
 ====
-Note that these screenshots show an earlier version of the 
xref:ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that these screenshots show an earlier version of the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 Clicking on this button brings up a dialog with the URL preselected:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
index 00473b1..114f29c 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_recent-pages.adoc
@@ -19,7 +19,7 @@ 
image::{_imagesdir}recent-pages/recent-pages.png[width="800px",link="{_imagesdir
 
 [NOTE]
 ====
-Note that this screenshot show an earlier version of the 
xref:ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
+Note that this screenshot show an earlier version of the 
xref:../ugvw/ugvw.adoc#[Wicket viewer] UI (specifically, pre 1.8.0).
 ====
 
 
@@ -42,7 +42,7 @@ Selecting the domain object from the list causes the viewer 
to automatically nav
 
 == Related functionality
 
-The xref:ugvw.adoc#_ugvw_features_bookmarked-pages[bookmarked pages] (sliding 
panel) also provides links to recently visited objects, but only those 
explicitly marked as `@DomainObject(bookmarking=...)`.  The bookmarks panel 
also nests related objects together hierarchically (the recent pages drop-down 
does not).
+The xref:../ugvw/ugvw.adoc#_ugvw_features_bookmarked-pages[bookmarked pages] 
(sliding panel) also provides links to recently visited objects, but only those 
explicitly marked as `@DomainObject(bookmarking=...)`.  The bookmarks panel 
also nests related objects together hierarchically (the recent pages drop-down 
does not).
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_titles-in-tables.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_titles-in-tables.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_titles-in-tables.adoc
index 0a925a0..c245791 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_titles-in-tables.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_titles-in-tables.adoc
@@ -72,5 +72,5 @@ The above annotations mean that titles usually "just work", 
altering according t
 
 [TIP]
 ====
-It is also possible to configure the Wicket viewer to 
xref:ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[abbreviate 
titles or suppress them] completely.
+It is also possible to configure the Wicket viewer to 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_abbreviating-titles[abbreviate
 titles or suppress them] completely.
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
index c9426f7..c95bec1 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_features_user-registration.adoc
@@ -74,7 +74,7 @@ There are two prerequisites:
 
 The latter is required if you are using the default email notification service 
and email service. If you are using your own alternative implementation of the 
email notification service then it may be omitted (and configure your own 
alternative implementation as required).
 
-It is also possible to configure the Wicket viewer to suppress 
xref:ugvw.adoc#_ugvw_configuration-properties_suppressing-sign-up[the sign-up 
page link] and/or the 
xref:ugvw.adoc#_ugvw_configuration-properties_suppressing-password-reset[password
 reset page].
+It is also possible to configure the Wicket viewer to suppress 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_suppressing-sign-up[the 
sign-up page link] and/or the 
xref:../ugvw/ugvw.adoc#_ugvw_configuration-properties_suppressing-password-reset[password
 reset page].
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc
index 2a43ad2..c35ed25 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_isis-addons.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The (non-ASF) link:http://www.isisaddons.org[Isis Addons] website provides a 
number of extensions to the Wicket viewer (leveraging the APIs described in 
xref:ugvw.adoc#_ugvw_extending[Extending the Wicket viewer] section, later.  
While you are free to fork and adapt any of them to your needs, they are also 
intended for use "out-of-the-box".
+The (non-ASF) link:http://www.isisaddons.org[Isis Addons] website provides a 
number of extensions to the Wicket viewer (leveraging the APIs described in 
xref:../ugvw/ugvw.adoc#_ugvw_extending[Extending the Wicket viewer] section, 
later.  While you are free to fork and adapt any of them to your needs, they 
are also intended for use "out-of-the-box".
 
 At the time of writing the addons available are:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
index efc0d0c..1261580 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_annotation-based.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-Metadata providing UI hints can be specified either using annotations, or 
using a xref:ugvw.adoc#_ugvw_layout_file-based[`layout.xml`] file.
+Metadata providing UI hints can be specified either using annotations, or 
using a xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[`layout.xml`] file.
 
 In most cases you will probably want to use the file-based approach: changes 
to file layouts are picked up dynamically, and using a file also allows tabs 
and tab groups to be specified: this is not supported using annotations.
 
@@ -106,7 +106,7 @@ The property groups/fieldsets in this case are those that 
are inferred from the
 
 [TIP]
 ====
-It is also possible to combine `@MemberOrder` with a 
xref:ugvw.adoc#_ugvw_layout_xml[file-based layout].
+It is also possible to combine `@MemberOrder` with a 
xref:../ugvw/ugvw.adoc#_ugvw_layout_xml[file-based layout].
 The layout file defines only the regions of a grid structure 
(fieldsets/columns etc), but does __not__ specify the 
properties/collections/actions within those grid regions.
 The `@MemberOrder` annotation in effect "binds" the properties or collections 
to those regions of the grid.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
index f849d66..3fb3ba5 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_application-menu.adoc
@@ -167,5 +167,5 @@ Meanwhile the 
http://github.com/isisaddons/isis-module-devutils[devutils] module
 so forth - on a "Prototyping" top-level menu, on the SECONDARY menu bar.
 
 Currently there is no facility to alter the placement of these services. 
However, their UI can be suppressed
-using security or using a 
xref:ugbtb.adoc#_ugbtb_decoupling_vetoing-visibility[vetoing subscriber].
+using security or using a 
xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_vetoing-visibility[vetoing 
subscriber].
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
index 513542a..5676d55 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_layout_file-based.adoc
@@ -6,7 +6,7 @@
 
 
 
-Metadata providing UI hints can be specified either 
xref:ugvw.adoc#_ugvw_layout_annotation-based[using annotations], or using an 
`Xxx.layout.xml` file (where `Xxx` is the entity or view model object to be 
rendered).
+Metadata providing UI hints can be specified either 
xref:../ugvw/ugvw.adoc#_ugvw_layout_annotation-based[using annotations], or 
using an `Xxx.layout.xml` file (where `Xxx` is the entity or view model object 
to be rendered).
 
 Using a file-based layout has the huge benefit that the layout can be updated 
without requiring a recompile of the code and redeploy of the app.
 Many developers also find it easier to rationalize about layout when all the 
hints are collated together in a single place (rather than scattered across the 
class members as annotations).
@@ -39,7 +39,7 @@ The layout file distinguishes between two types of element:
 
 * those that define a grid structure, of: rows, columns, tab groups and tabs. +
 +
-The rows and columns are closely modelled on link:getbootstrap.com[Bootstrap 
3] (used in the implementation of the xref:ugvw.adoc[Wicket viewer]).
+The rows and columns are closely modelled on link:getbootstrap.com[Bootstrap 
3] (used in the implementation of the xref:../ugvw/ugvw.adoc[Wicket viewer]).
 
 * those that defines common components, of: fieldsets (previously called 
member groups or property groups), properties, collections, actions and also 
the title/icon of the domain object itself.
 

Reply via email to