You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/04/20 08:12:41 UTC

[32/58] [abbrv] isis git commit: ISIS-1521: fixes further xref links between guides

ISIS-1521: fixes further xref links between guides


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b2b87ca4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b2b87ca4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b2b87ca4

Branch: refs/heads/wip
Commit: b2b87ca4a0d8c5eb76347415bd26539ac8ccaaab
Parents: 252c2f8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Apr 14 15:30:05 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 20 09:09:30 2017 +0100

----------------------------------------------------------------------
 .../guides/dg/_dg_asciidoc-templates.adoc       | 30 ++++++++++----------
 .../asciidoc/guides/dg/_dg_hints-and-tips.adoc  |  2 +-
 ...nd-tips_how-run-fixtures-on-app-startup.adoc |  2 +-
 ...ts-and-tips_i18n-label-in-wicket-viewer.adoc |  2 +-
 .../guides/dg/_dg_working-with-many-repos.adoc  |  2 +-
 .../asciidoc/guides/rgant/_rgant-Action.adoc    |  2 +-
 .../guides/rgant/_rgant-ActionLayout.adoc       |  4 +--
 .../rgant/_rgant-ActionLayout_bookmarking.adoc  |  8 +++---
 .../rgant/_rgant-ActionLayout_cssClass.adoc     |  2 +-
 .../rgant/_rgant-ActionLayout_cssClassFa.adoc   |  2 +-
 .../rgant/_rgant-ActionLayout_describedAs.adoc  |  4 +--
 .../rgant/_rgant-ActionLayout_hidden.adoc       |  2 +-
 .../guides/rgant/_rgant-ActionLayout_named.adoc |  4 +--
 .../rgant/_rgant-ActionLayout_position.adoc     |  4 +--
 .../guides/rgant/_rgant-Action_command.adoc     |  4 +--
 .../guides/rgant/_rgant-Action_semantics.adoc   |  2 +-
 .../guides/rgant/_rgant-CollectionLayout.adoc   |  2 +-
 .../rgant/_rgant-CollectionLayout_cssClass.adoc |  2 +-
 .../_rgant-CollectionLayout_defaultView.adoc    |  4 +--
 .../_rgant-CollectionLayout_describedAs.adoc    |  4 +--
 .../rgant/_rgant-CollectionLayout_hidden.adoc   |  2 +-
 .../rgant/_rgant-CollectionLayout_named.adoc    |  4 +--
 .../rgant/_rgant-CollectionLayout_paged.adoc    |  4 +--
 .../rgant/_rgant-CollectionLayout_render.adoc   |  2 +-
 .../rgant/_rgant-CollectionLayout_sortedBy.adoc |  4 +--
 .../rgant/_rgant-Collection_domainEvent.adoc    |  2 +-
 .../guides/rgant/_rgant-Collection_editing.adoc |  2 +-
 .../guides/rgant/_rgant-Collection_hidden.adoc  |  6 ++--
 .../guides/rgant/_rgant-Discriminator.adoc      |  6 ++--
 .../guides/rgant/_rgant-DomainObjectLayout.adoc |  2 +-
 .../_rgant-DomainObjectLayout_bookmarking.adoc  |  4 +--
 ...gant-DomainObjectLayout_cssClassUiEvent.adoc |  4 +--
 .../_rgant-DomainObjectLayout_describedAs.adoc  |  2 +-
 .../_rgant-DomainObjectLayout_iconUiEvent.adoc  |  4 +--
 .../rgant/_rgant-DomainObjectLayout_named.adoc  |  2 +-
 .../rgant/_rgant-DomainObjectLayout_paged.adoc  |  2 +-
 .../_rgant-DomainObjectLayout_titleUiEvent.adoc |  4 +--
 .../rgant/_rgant-DomainObject_bounded.adoc      |  2 +-
 .../rgant/_rgant-DomainObject_nature.adoc       |  2 +-
 .../rgant/_rgant-DomainObject_objectType.adoc   |  6 ++--
 .../guides/rgant/_rgant-DomainService.adoc      |  2 +-
 .../rgant/_rgant-DomainServiceLayout.adoc       |  4 +--
 .../_rgant-DomainServiceLayout_menuBar.adoc     |  4 +--
 .../_rgant-DomainServiceLayout_menuOrder.adoc   |  2 +-
 .../rgant/_rgant-DomainService_nature.adoc      |  2 +-
 .../rgant/_rgant-DomainService_objectType.adoc  |  6 ++--
 .../asciidoc/guides/rgant/_rgant-HomePage.adoc  |  2 +-
 .../asciidoc/guides/rgant/_rgant-Inject.adoc    |  2 +-
 .../guides/rgant/_rgant-MemberGroupLayout.adoc  |  2 +-
 .../guides/rgant/_rgant-MemberOrder.adoc        |  2 +-
 .../asciidoc/guides/rgant/_rgant-Mixin.adoc     |  2 +-
 .../guides/rgant/_rgant-ParameterLayout.adoc    |  2 +-
 .../_rgant-ParameterLayout_describedAs.adoc     |  2 +-
 .../_rgant-ParameterLayout_labelPosition.adoc   |  2 +-
 .../rgant/_rgant-ParameterLayout_named.adoc     |  2 +-
 .../_rgant-ParameterLayout_typicalLength.adoc   |  2 +-
 .../guides/rgant/_rgant-PersistenceCapable.adoc |  6 ++--
 .../guides/rgant/_rgant-PostConstruct.adoc      |  2 +-
 .../guides/rgant/_rgant-PropertyLayout.adoc     |  2 +-
 .../rgant/_rgant-PropertyLayout_cssClass.adoc   |  2 +-
 .../_rgant-PropertyLayout_describedAs.adoc      |  4 +--
 .../rgant/_rgant-PropertyLayout_hidden.adoc     |  6 ++--
 .../_rgant-PropertyLayout_labelPosition.adoc    |  4 +--
 .../rgant/_rgant-PropertyLayout_multiLine.adoc  |  2 +-
 .../rgant/_rgant-PropertyLayout_named.adoc      |  4 +--
 ...gant-PropertyLayout_renderedAsDayBefore.adoc |  2 +-
 .../_rgant-PropertyLayout_typicalLength.adoc    |  2 +-
 .../guides/rgant/_rgant-Property_hidden.adoc    |  2 +-
 .../guides/rgant/_rgant-ViewModelLayout.adoc    |  2 +-
 .../_rgant-ViewModelLayout_describedAs.adoc     |  2 +-
 .../rgant/_rgant-ViewModelLayout_named.adoc     |  2 +-
 .../rgant/_rgant-ViewModelLayout_paged.adoc     |  2 +-
 .../rgant/_rgant-ViewModel_objectType.adoc      |  6 ++--
 .../guides/rgant/_rgant-XmlJavaTypeAdapter.adoc |  2 +-
 .../guides/rgant/_rgant-XmlRootElement.adoc     |  8 +++---
 .../guides/rgant/_rgant_aaa_deprecated.adoc     | 10 +++----
 .../asciidoc/guides/rgant/_rgant_aaa_jdo.adoc   |  6 ++--
 .../asciidoc/guides/rgant/_rgant_aaa_jee.adoc   |  2 +-
 .../asciidoc/guides/rgant/_rgant_aaa_main.adoc  |  4 +--
 .../asciidoc/guides/rgant/_rgant_aaa_other.adoc |  2 +-
 .../rgcfg/_rgcfg_configuration-files.adoc       |  4 +--
 .../guides/rgcfg/_rgcfg_configuring-core.adoc   | 22 +++++++-------
 .../guides/rgcfg/_rgcfg_deployment-types.adoc   | 10 +++----
 .../rgcfg/_rgcfg_specifying-components.adoc     |  2 +-
 .../src/main/asciidoc/guides/rgcfg/rgcfg.adoc   |  6 ++--
 .../asciidoc/guides/rgcms/_rgcms_classes.adoc   |  2 +-
 ...rgcms_classes_AppManifest-bootstrapping.adoc |  8 +++---
 .../_rgcms_classes_i18n_TranslatableString.adoc |  2 +-
 .../guides/rgcms/_rgcms_classes_layout.adoc     |  4 +--
 .../guides/rgcms/_rgcms_classes_mixins_Dto.adoc |  2 +-
 .../rgcms/_rgcms_classes_mixins_Object.adoc     |  6 ++--
 .../_rgcms_classes_super_FixtureScript.adoc     |  2 +-
 .../_rgcms_classes_super_FixtureScripts.adoc    |  2 +-
 .../guides/rgcms/_rgcms_methods_prefixes.adoc   |  8 +++---
 .../rgcms/_rgcms_methods_prefixes_addTo.adoc    |  2 +-
 .../rgcms/_rgcms_methods_prefixes_disable.adoc  |  6 ++--
 .../rgcms/_rgcms_methods_prefixes_hide.adoc     |  2 +-
 .../_rgcms_methods_prefixes_removeFrom.adoc     |  2 +-
 .../rgcms/_rgcms_methods_prefixes_validate.adoc |  2 +-
 .../_rgcms_methods_prefixes_validateAddTo.adoc  |  4 +--
 ...cms_methods_prefixes_validateRemoveFrom.adoc |  4 +--
 .../rgcms/_rgcms_methods_reserved_cssClass.adoc |  2 +-
 .../rgcms/_rgcms_methods_reserved_disable.adoc  |  2 +-
 .../rgcms/_rgcms_methods_reserved_getId.adoc    |  6 ++--
 .../rgcms/_rgcms_methods_reserved_iconName.adoc |  2 +-
 .../rgcms/_rgcms_methods_reserved_title.adoc    |  2 +-
 .../rgcms/_rgcms_methods_reserved_validate.adoc |  2 +-
 .../_rgfis_spi_ContentNegotiationService.adoc   |  8 +++---
 .../rgfis/_rgfis_spi_RepresentationService.adoc |  2 +-
 .../asciidoc/guides/rgmvn/_rgmvn_intro.adoc     |  2 +-
 .../asciidoc/guides/rgmvn/_rgmvn_swagger.adoc   |  2 +-
 .../asciidoc/guides/rgmvn/_rgmvn_validate.adoc  |  2 +-
 .../main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc  |  2 +-
 .../rgsvc/_rgsvc_api_AcceptHeaderService.adoc   |  2 +-
 .../_rgsvc_api_ActionInvocationContext.adoc     |  2 +-
 .../guides/rgsvc/_rgsvc_api_CommandContext.adoc |  4 +--
 .../rgsvc/_rgsvc_api_DeepLinkService.adoc       |  6 ++--
 ..._api_DomainObjectContainer_messages-api.adoc |  8 +++---
 ..._api_DomainObjectContainer_security-api.adoc |  4 +--
 .../guides/rgsvc/_rgsvc_api_EmailService.adoc   |  4 +--
 .../rgsvc/_rgsvc_api_FixtureScriptsDefault.adoc |  2 +-
 .../rgsvc/_rgsvc_api_GuiceBeanProvider.adoc     |  8 +++---
 .../rgsvc/_rgsvc_api_InteractionContext.adoc    |  2 +-
 .../guides/rgsvc/_rgsvc_api_IsisJdoSupport.adoc |  2 +-
 .../guides/rgsvc/_rgsvc_api_JaxbService.adoc    |  2 +-
 .../guides/rgsvc/_rgsvc_api_MementoService.adoc |  4 +--
 .../guides/rgsvc/_rgsvc_api_MessageService.adoc |  8 +++---
 .../guides/rgsvc/_rgsvc_api_Scratchpad.adoc     |  4 +--
 .../guides/rgsvc/_rgsvc_api_SudoService.adoc    |  6 ++--
 .../guides/rgsvc/_rgsvc_api_SwaggerService.adoc |  6 ++--
 .../rgsvc/_rgsvc_api_SwitchUserService.adoc     |  2 +-
 .../rgsvc/_rgsvc_api_TransactionService.adoc    |  2 +-
 .../guides/rgsvc/_rgsvc_api_UserService.adoc    |  4 +--
 .../guides/rgsvc/_rgsvc_api_WrapperFactory.adoc |  4 +--
 .../rgsvc/_rgsvc_application-layer-api.adoc     |  2 +-
 .../asciidoc/guides/rgsvc/_rgsvc_intro.adoc     |  4 +--
 .../guides/rgsvc/_rgsvc_metadata-api.adoc       |  2 +-
 .../rgsvc/_rgsvc_presentation-layer-spi.adoc    |  2 +-
 .../guides/rgsvc/_rgsvc_spi_AuditerService.adoc |  2 +-
 .../rgsvc/_rgsvc_spi_AuditingService.adoc       |  2 +-
 .../_rgsvc_spi_BackgroundCommandService.adoc    |  4 +--
 .../guides/rgsvc/_rgsvc_spi_CommandService.adoc |  4 +--
 .../rgsvc/_rgsvc_spi_ContentMappingService.adoc |  4 +--
 .../_rgsvc_spi_EmailNotificationService.adoc    |  4 +--
 .../rgsvc/_rgsvc_spi_ExceptionRecognizer.adoc   |  2 +-
 .../rgsvc/_rgsvc_spi_GridSystemService.adoc     |  2 +-
 .../guides/rgsvc/_rgsvc_spi_HintStore.adoc      |  4 +--
 .../guides/rgsvc/_rgsvc_spi_LocaleProvider.adoc |  8 +++---
 .../rgsvc/_rgsvc_spi_PublisherService.adoc      |  2 +-
 .../rgsvc/_rgsvc_spi_PublishingService.adoc     |  2 +-
 .../guides/rgsvc/_rgsvc_spi_RoutingService.adoc |  2 +-
 .../rgsvc/_rgsvc_spi_TranslationService.adoc    |  6 ++--
 .../rgsvc/_rgsvc_spi_TranslationsResolver.adoc  |  8 +++---
 .../rgsvc/_rgsvc_spi_UrlEncodingService.adoc    |  2 +-
 .../rgsvc/_rgsvc_spi_UserProfileService.adoc    |  2 +-
 .../_rgsvc_spi_UserRegistrationService.adoc     |  4 +--
 .../ugbtb/_ugbtb_decoupling_contributions.adoc  |  2 +-
 .../ugbtb/_ugbtb_decoupling_db-schemas.adoc     |  2 +-
 .../guides/ugbtb/_ugbtb_decoupling_mixins.adoc  |  4 +--
 .../_ugbtb_decoupling_pushing-changes.adoc      |  2 +-
 ...b_deployment_externalized-configuration.adoc |  4 +--
 .../ugbtb/_ugbtb_deployment_jvm-flags.adoc      |  2 +-
 .../guides/ugbtb/_ugbtb_deployment_tomcat.adoc  |  4 +--
 .../guides/ugbtb/_ugbtb_headless-access.adoc    |  4 +--
 ...dless-access_BackgroundCommandExecution.adoc |  2 +-
 .../main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc | 12 ++++----
 ...ther-techniques_transactions-and-errors.adoc |  8 +++---
 .../_ugbtb_programming-model_finetuning.adoc    |  2 +-
 ...rogramming-model_layout-metadata-reader.adoc |  2 +-
 .../guides/ugbtb/_ugbtb_view-models_jaxb.adoc   | 20 ++++++-------
 .../ugbtb/_ugbtb_view-models_use-cases.adoc     | 12 ++++----
 .../asciidoc/guides/ugbtb/_ugbtb_web-xml.adoc   |  6 ++--
 .../src/main/asciidoc/guides/ugbtb/ugbtb.adoc   |  4 +--
 ...ugfun_core-concepts_apache-isis-vs_cqrs.adoc |  6 ++--
 ...core-concepts_apache-isis-vs_metawidget.adoc |  2 +-
 ...ache-isis-vs_mvc-server-side-frameworks.adoc |  4 +--
 .../_ugfun_core-concepts_building-blocks.adoc   | 18 ++++++------
 ..._core-concepts_other-deployment-options.adoc |  2 +-
 .../_ugfun_core-concepts_philosophy_aop.adoc    |  4 +--
 .../ugfun/_ugfun_core-concepts_principles.adoc  |  4 +--
 ...e-concepts_principles_for-the-long-term.adoc |  2 +-
 ...fun_getting-started_simpleapp-archetype.adoc | 12 ++++----
 .../ugfun/_ugfun_how-tos_class-structure.adoc   |  4 +--
 ...ow-tos_class-structure_class-definition.adoc |  6 ++--
 ...fun_how-tos_class-structure_collections.adoc |  4 +--
 ...gfun_how-tos_class-structure_properties.adoc |  4 +--
 .../ugfun/_ugfun_how-tos_domain-services.adoc   |  2 +-
 ...n_how-tos_ui-hints_action-icons-and-css.adoc |  2 +-
 .../ugfun/_ugfun_how-tos_ui-hints_layout.adoc   |  2 +-
 ...how-tos_ui-hints_names-and-descriptions.adoc |  2 +-
 ...ow-tos_ui-hints_object-titles-and-icons.adoc |  4 +--
 .../ugfun/_ugfun_how-tos_ui_are-you-sure.adoc   |  2 +-
 .../src/main/asciidoc/guides/ugfun/ugfun.adoc   |  2 +-
 .../guides/ugodn/_ugodn_configuring.adoc        |  2 +-
 ...onfiguring_eagerly-registering-entities.adoc |  2 +-
 .../ugodn/_ugodn_configuring_properties.adoc    |  4 +--
 .../_ugsec_configuring-isis-to-use-shiro.adoc   |  2 +-
 .../guides/ugsec/_ugsec_shiro-ini-realm.adoc    |  2 +-
 ...shiro-isis-enhanced-wildcard-permission.adoc |  2 +-
 .../ugsec/_ugsec_usage-by-isis-viewers.adoc     | 12 ++++----
 .../_ugtst_bdd-spec-support_key-classes.adoc    |  2 +-
 ...tst_bdd-spec-support_writing-a-bdd-spec.adoc |  2 +-
 .../_ugtst_fixture-scripts_api-and-usage.adoc   |  4 +--
 ..._ugtst_integ-test-support_bootstrapping.adoc |  6 ++--
 ...gtst_integ-test-support_wrapper-factory.adoc |  2 +-
 .../guides/ugvro/_ugvro_architecture.adoc       |  4 +--
 .../ugvro/_ugvro_configuration-properties.adoc  |  8 +++---
 .../asciidoc/guides/ugvro/_ugvro_ro-spec.adoc   |  6 ++--
 .../_ugvro_simplified-representations.adoc      |  6 ++--
 ...epresentations_configuration-properties.adoc |  2 +-
 .../ugvw/_ugvw_configuration-properties.adoc    | 16 +++++------
 ...guration-properties_abbreviating-titles.adoc |  2 +-
 ...ration-properties_showing-theme-chooser.adoc |  4 +--
 ...n-properties_suppressing-password-reset.adoc |  2 +-
 ...guration-properties_suppressing-sign-up.adoc |  2 +-
 .../ugvw/_ugvw_customisation_about-page.adoc    |  2 +-
 ...vw_customisation_cheap-n-cheerful-theme.adoc |  2 +-
 .../_ugvw_customisation_custom-javascript.adoc  |  2 +-
 .../ugvw/_ugvw_customisation_default-theme.adoc |  2 +-
 ...ugvw_customisation_tweaking-css-classes.adoc |  6 ++--
 .../asciidoc/guides/ugvw/_ugvw_extending.adoc   | 12 ++++----
 .../_ugvw_extending_custom-bootstrap-theme.adoc |  2 +-
 .../ugvw/_ugvw_extending_custom-pages.adoc      |  2 +-
 ..._ugvw_extending_replacing-page-elements.adoc |  2 +-
 .../ugvw/_ugvw_features_blob-attachments.adoc   |  2 +-
 .../ugvw/_ugvw_features_bookmarked-pages.adoc   |  4 +--
 .../ugvw/_ugvw_features_hints-and-copy-url.adoc |  2 +-
 .../ugvw/_ugvw_features_recent-pages.adoc       |  4 +--
 .../ugvw/_ugvw_features_titles-in-tables.adoc   |  2 +-
 .../ugvw/_ugvw_features_user-registration.adoc  |  2 +-
 .../asciidoc/guides/ugvw/_ugvw_isis-addons.adoc |  2 +-
 .../ugvw/_ugvw_layout_annotation-based.adoc     |  4 +--
 .../ugvw/_ugvw_layout_application-menu.adoc     |  2 +-
 .../guides/ugvw/_ugvw_layout_file-based.adoc    |  4 +--
 234 files changed, 455 insertions(+), 455 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
index 8c8fc58..8ccd418 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
@@ -309,7 +309,7 @@ for example:
 
 
 |`adugvw`
-|`\xref:ugvw.adoc#xxx[ttt]`
+|`\xref:../ugvw/ugvw.adoc#xxx[ttt]`
 
 A hyperlink to a bookmark within the Wicket viewer guide, where:
 
@@ -318,13 +318,13 @@ A hyperlink to a bookmark within the Wicket viewer guide, where:
 
 for example:
 
-`\xref:ugvw.adoc#_ugvw_customisation[Customisation]`
+`\xref:../ugvw/ugvw.adoc#_ugvw_customisation[Customisation]`
 
-|xref:ugvw.adoc#_ugvw_customisation[Customisation]
+|xref:../ugvw/ugvw.adoc#_ugvw_customisation[Customisation]
 
 
 |`adugvro`
-|`\xref:ugvro.adoc#xxx[ttt]`
+|`\xref:../ugvro/ugvro.adoc#xxx[ttt]`
 
 A hyperlink to a bookmark within the Restful Objects viewer guide, where:
 
@@ -333,14 +333,14 @@ A hyperlink to a bookmark within the Restful Objects viewer guide, where:
 
 for example:
 
-`\xref:ugvro.adoc#_ugvro_ro-spec[RestfulObjects specification]`
+`\xref:../ugvro/ugvro.adoc#_ugvro_ro-spec[RestfulObjects specification]`
 
-|xref:ugvro.adoc#_ugvro_ro-spec[RestfulObjects specification]
+|xref:../ugvro/ugvro.adoc#_ugvro_ro-spec[RestfulObjects specification]
 
 
 
 |`adugsec`
-|`\xref:ugsec.adoc#xxx[ttt]`
+|`\xref:../ugsec/ugsec.adoc#xxx[ttt]`
 
 A hyperlink to a bookmark within the Secrurity guide, where:
 
@@ -349,13 +349,13 @@ A hyperlink to a bookmark within the Secrurity guide, where:
 
 for example:
 
-`\xref:ugsec.adoc#_ugsec_shiro-caching[Caching and other Shiro Features]`
+`\xref:../ugsec/ugsec.adoc#_ugsec_shiro-caching[Caching and other Shiro Features]`
 
-|xref:ugsec.adoc#_ugsec_shiro-caching[Caching and other Shiro Features]
+|xref:../ugsec/ugsec.adoc#_ugsec_shiro-caching[Caching and other Shiro Features]
 
 
 |`adugtst`
-|`\xref:ugtst.adoc#xxx[ttt]`
+|`\xref:../ugtst/ugtst.adoc#xxx[ttt]`
 
 A hyperlink to a bookmark within the Testing guide, where:
 
@@ -364,13 +364,13 @@ A hyperlink to a bookmark within the Testing guide, where:
 
 for example:
 
-`\xref:ugtst.adoc#_ugtst_bdd-spec-support[BDD Spec Support]`
+`\xref:../ugtst/ugtst.adoc#_ugtst_bdd-spec-support[BDD Spec Support]`
 
-|xref:ugtst.adoc#_ugtst_bdd-spec-support[BDD Spec Support]
+|xref:../ugtst/ugtst.adoc#_ugtst_bdd-spec-support[BDD Spec Support]
 
 
 |`adugbtb`
-|`\xref:ugbtb.adoc#xxx[ttt]`
+|`\xref:../ugbtb/ugbtb.adoc#xxx[ttt]`
 
 A hyperlink to a bookmark within the 'Beyond the Basics' user guide, where:
 
@@ -379,9 +379,9 @@ A hyperlink to a bookmark within the 'Beyond the Basics' user guide, where:
 
 for example:
 
-`\xref:ugbtb.adoc#_ugbtb_deployment_externalized-configuration[Externalized Configuration]`
+`\xref:../ugbtb/ugbtb.adoc#_ugbtb_deployment_externalized-configuration[Externalized Configuration]`
 
-|xref:ugbtb.adoc#_ugbtb_deployment_externalized-configuration[Externalized Configuration]
+|xref:../ugbtb/ugbtb.adoc#_ugbtb_deployment_externalized-configuration[Externalized Configuration]
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
index 67d89bd..78cfee4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
@@ -10,7 +10,7 @@
 This chapter has FAQs (with solutions) for problems we've encountered ourselves or have been raised on the
 Apache Isis mailing lists.
 
-See also xref:ugvro.adoc#_ugvro_hints-and-tips[Restful Objects hints-n-tips].
+See also xref:../ugvro/ugvro.adoc#_ugvro_hints-and-tips[Restful Objects hints-n-tips].
 
 include::_dg_hints-and-tips_enabling-logging.adoc[leveloffset=+1]
 include::_dg_hints-and-tips_subtype-entity-not-fully-populated.adoc[leveloffset=+1]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
index 89a1547..cc930e4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
@@ -13,7 +13,7 @@ Hook up into the webapp start?
 Use events?_
 
 
-The standard approach is to use xref:ugtst.adoc#_ugtst_fixture-scripts[fixture scripts].
+The standard approach is to use xref:../ugtst/ugtst.adoc#_ugtst_fixture-scripts[fixture scripts].
 These can be run in on start-up typically by being specified in the xref:rgcsm.adoc#_rgcsm_classes_AppManifest-bootstrapping[`AppManifest`], see for
 example the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype].
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_i18n-label-in-wicket-viewer.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_i18n-label-in-wicket-viewer.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_i18n-label-in-wicket-viewer.adoc
index 6a6b6ac..d4d16e0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_i18n-label-in-wicket-viewer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_i18n-label-in-wicket-viewer.adoc
@@ -15,7 +15,7 @@ Can this be done?_
 
 The above FAQ was raised against `1.10.0`.  As of `1.11.0` (due to link:https://issues.apache.org/jira/browse/ISIS-1093[ISIS-1093]) it _is_ now possible to internationalize both the Wicket viewer's labels as well as the regular translations of the domain object metadata using the `.po` translation files as supported by the xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_TranslationService[`TranslationService`].
 
-Full details of the ``msgId``s that must be added to the `translations.po` file can be found in xref:guides/ugbtb.adoc#__ugbtb_i18n_wicket-viewer[i18n] section of the xref:ugbtb.adoc#[beyond the basics] guide.
+Full details of the ``msgId``s that must be added to the `translations.po` file can be found in xref:guides/ugbtb.adoc#__ugbtb_i18n_wicket-viewer[i18n] section of the xref:../ugbtb/ugbtb.adoc#[beyond the basics] guide.
 
 In prior releases (`1.10.0` and earlier) it was necessary to use link:https://ci.apache.org/projects/wicket/guide/6.x/guide/i18n.html#i18n_3[Wicket's internationalization support], namely resource bundles.  This is still supported (as a fallback):
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
index 383341b..086f329 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
@@ -8,7 +8,7 @@
 
 Applications built with Apache Isis often (should) consist of multiple modules, each in separate git repositories.  For example, there are the various (non-ASF) link:http://isisaddons.org[Isis Addons] that provide various cross-cutting concerns/technical services (security, mail-merge etc), as well the modules eg as provided by the (non-ASF) link:http://catalog.incode.org[Incode Catalog], which provides generic business subdomains (communication channels, documents etc).
 
-In addition, your own application may well be structured as a number of distinct modules (probably with the entities in each module being mapped to a different schema), and using such techniques as the xref:ugbtb.adoc#_ugbtb_decoupling_event-bus[event bus] and xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] so that these modules are decoupled from each other.
+In addition, your own application may well be structured as a number of distinct modules (probably with the entities in each module being mapped to a different schema), and using such techniques as the xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_event-bus[event bus] and xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] so that these modules are decoupled from each other.
 
 All of which is a preamble to say that you will likely have multiple directories on your local development computer, for each such git repository that you contribute to.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
index 4ee7904..907d042 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
@@ -81,7 +81,7 @@ Currently this is only supported for no-arg actions.
 (`NON_IDEMPOTENT`)
 |the action's semantics (ie whether objects are modified as the result of invoking this action, and if so whether reinvoking the action would result in no further change; if not whether the results can be cached for the remainder of the request).
 
-The `...ARE_YOU_SURE` variants cause a confirmation dialog to be displayed in the xref:ugvw.adoc#[Wicket viewer].
+The `...ARE_YOU_SURE` variants cause a confirmation dialog to be displayed in the xref:../ugvw/ugvw.adoc#[Wicket viewer].
 
 |xref:../rgant/rgant.adoc#_rgant-Action_typeOf[`typeOf()`]
 |(none)

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
index ef22d3c..7dd4a26 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout.adoc
@@ -36,7 +36,7 @@ For a domain service action to be contributed, the domain services must have a x
 |Any string valid as a CSS class
 |an additional CSS class around the HTML that represents for the action, to allow targetted styling in xref:../rgcfg/rgcfg.adoc#_rgcfg_application-specific_application-css[`application.css`]. +
 
-Supported by the xref:ugvw.adoc#[Wicket viewer] but currently ignored by the xref:ugvro.adoc#[RestfulObjects viewer].
+Supported by the xref:../ugvw/ugvw.adoc#[Wicket viewer] but currently ignored by the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer].
 
 
 |xref:../rgant/rgant.adoc#_rgant-ActionLayout_cssClassFa[`cssClassFa()`]
@@ -100,7 +100,7 @@ public class ToDoItems {
 
 [TIP]
 ====
-As an alternative to using the `@ActionLayout` 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 `@ActionLayout` 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-ActionLayout_bookmarking.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
index 643f24e..da095d4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_bookmarking.adoc
@@ -10,18 +10,18 @@ The `bookmarking()` attribute indicates if an action (with safe xref:../rgant/rg
 
 
 
-In the xref:ugvw.adoc#[Wicket viewer], a link to a bookmarked object is shown in the bookmarks panel:
+In the xref:../ugvw/ugvw.adoc#[Wicket viewer], a link to a bookmarked object is shown in the bookmarks panel:
 
 image::{_imagesdir}reference-annotations/ActionLayout/bookmarking.png[width="720px",link="{_imagesdir}reference-annotations/ActionLayout/bookmarking.png"]
 
 [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).
 ====
 
 [TIP]
 ====
-The xref:ugvw.adoc#[Wicket viewer] supports `alt-[` as a shortcut for opening the bookmark panel.  `Esc` will close.
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] supports `alt-[` as a shortcut for opening the bookmark panel.  `Esc` will close.
 ====
 
 
@@ -50,7 +50,7 @@ The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmar
 
 
 
-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-ActionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
index 56b6d84..d59294e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClass.adoc
@@ -30,7 +30,7 @@ to apply CSS, specifically to add http://fortawesome.github.io/Font-Awesome/icon
 
 
 
-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-ActionLayout_cssClassFa.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
index 2b642cd..f072cf3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_cssClassFa.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
 There can be multiple "fa-" classes, eg to mirror or rotate the icon. There is no need to include the mandatory `fa` "marker" CSS class; it will be automatically added to the list.  The `fa-` prefix can also be omitted from the class names; it will be prepended to each if required.
 
 
-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-ActionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
index 7818a0d..e9b5655 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_describedAs.adoc
@@ -6,7 +6,7 @@
 
 
 
-The `describedAs()` attribute is used to provide a short description of the action to the user.  In the xref:ugvw.adoc#[Wicket viewer] it is displayed as a 'tool tip'.
+The `describedAs()` attribute is used to provide a short description of the action to the user.  In the xref:../ugvw/ugvw.adoc#[Wicket viewer] it is displayed as a 'tool tip'.
 
 This 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-ParameterLayout_describedAs[parameters], xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[domain objects] and xref:../rgant/rgant.adoc#_rgant-ViewModelLayout_describedAs[view models].
 
@@ -24,7 +24,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-ActionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
index a1ad7d4..f5696ee 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_hidden.adoc
@@ -37,7 +37,7 @@ The action should not be hidden.
 The other values of the `Where` enum have no meaning for a collection.
 
 
-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-ActionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
index d50b1f8..9ca98f9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_named.adoc
@@ -25,7 +25,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]
@@ -38,7 +38,7 @@ 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-ActionLayout_position.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
index 89cba44..1fe7e60 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-ActionLayout_position.adoc
@@ -40,7 +40,7 @@ public class Customer {
 <3> give the action an abbreviated name, because the fact that the "status" property is to be updated is implied by its positioning
 
 
-The default is `BELOW`, which is rendered (by the xref:ugvw.adoc#[Wicket viewer]) as shown below:
+The default is `BELOW`, which is rendered (by the xref:../ugvw/ugvw.adoc#[Wicket viewer]) as shown below:
 
 image::{_imagesdir}reference-annotations/ActionLayout/position-BELOW.png[width="720px",link="{_imagesdir}reference-annotations/ActionLayout/position-BELOW.png"]
 
@@ -67,7 +67,7 @@ image::{_imagesdir}reference-annotations/ActionLayout/position-PANEL_DROPDOWN.pn
 If there are multiple actions associated with a single property then the positioning can be mix'ed-and-match'ed as required.  If the `PANEL` or `PANEL_DROPDOWN` are used, then (as the screenshots above show) the actions from potentially multiple properties grouped by that panel will be shown together.
 
 
-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-Action_command.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
index 16ab6ce..70bcb77 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
@@ -23,7 +23,7 @@ By default, actions are invoked in directly in the thread of the invocation.   I
 
 [NOTE]
 ====
-If background ``Command``s are used, then an external scheduler, using xref:ugbtb.adoc#_ugbtb_headless-access_BackgroundCommandExecution[headless access], must also be configured.
+If background ``Command``s are used, then an external scheduler, using xref:../ugbtb/ugbtb.adoc#_ugbtb_headless-access_BackgroundCommandExecution[headless access], must also be configured.
 ====
 
 
@@ -112,7 +112,7 @@ will prevent the parent `Command` object from being persisted, _even if_ a child
 
 For persisted commands, the `commandExecuteIn()` attribute determines whether the `Command` should be executed in the foreground (the default) or executed in the background.
 
-Background execution means that the command is not executed immediately, but is available for a configured xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService`] to execute, eg by way of an in-memory scheduler such as Quartz.  See xref:ugbtb.adoc#_ugbtb_headless-access_BackgroundCommandExecution[here] for further information on this topic.
+Background execution means that the command is not executed immediately, but is available for a configured xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService`] to execute, eg by way of an in-memory scheduler such as Quartz.  See xref:../ugbtb/ugbtb.adoc#_ugbtb_headless-access_BackgroundCommandExecution[here] for further information on this topic.
 
 For example:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
index e3f3a13..9a10041 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
@@ -8,7 +8,7 @@
 
 The `semantics()` attribute describes whether the invocation modifies state of the system, and if so whether it does so idempotently.  If the action invocation does _not_ modify the state of the system, in other words is safe, then it also can beused to specify whether the results of the action can be cached automatically for the remainder of the request.
 
-The attribute was originally introduced for the xref:ugvro.adoc#[RestfulObjects viewer] in order that action invocations could be using the appropriate `HTTP` verb (`GET`, `PUT` and `POST`).
+The attribute was originally introduced for the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] in order that action invocations could be using the appropriate `HTTP` verb (`GET`, `PUT` and `POST`).
 
 The table below summarizes the semantics:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
index 88a0f52..f9891c3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
@@ -96,7 +96,7 @@ public class ToDoItem {
 
 [TIP]
 ====
-As an alternative to using the `@CollectionLayout` 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 `@CollectionLayout` 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-CollectionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
index d5834c4..f9664f7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_cssClass.adoc
@@ -24,7 +24,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-CollectionLayout_defaultView.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
index 9955a3b..a3f71d2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The xref:ugvw.adoc#[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the (non-ASF) (non-ASF) link:http://isisaddons.org[Isis Addons]' (non-ASF) http://github.com/isisaddons/isis-wicket-excel[excel] view, the http://github.com/isisaddons/isis-wicket-fullcalendar2[fullcalendar2] view, and the http://github.com/isisaddons/isis-wicket-gmap3[gmap3] view.  If the objects to be rendered have the correct "shape", then the appropriate view will be made available.  For example, objects with a date can be rendered using `calendar`; objects with locations can be rendered using `map`.
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the (non-ASF) (non-ASF) link:http://isisaddons.org[Isis Addons]' (non-ASF) http://github.com/isisaddons/isis-wicket-excel[excel] view, the http://github.com/isisaddons/isis-wicket-fullcalendar2[fullcalendar2] view, and the http://github.com/isisaddons/isis-wicket-gmap3[gmap3] view.  If the objects to be rendered have the correct "shape", then the appropriate view will be made available.  For example, objects with a date can be rendered using `calendar`; objects with locations can be rendered using `map`.
 
 The `defaultView()` attribute is used to select which of these views should be used by default for a given collection.
 
@@ -24,7 +24,7 @@ public class BusRoute {
 ----
 
 
-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-CollectionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
index 7695b9b..56037be 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_describedAs.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The `describedAs()` attribute is used to provide a short description of the collection to the user.  In the xref:ugvw.adoc#[Wicket viewer] it is displayed as a 'tool tip'.
+The `describedAs()` attribute is used to provide a short description of the collection 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-PropertyLayout_describedAs[properties], 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].
 
@@ -24,7 +24,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-CollectionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
index 5156638..88b6c5a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_hidden.adoc
@@ -47,7 +47,7 @@ The collection should not be hidden.
 The other values of the `Where` enum have no meaning for a collection.
 
 
-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-CollectionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
index d58a60c..8c12d3c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_named.adoc
@@ -33,7 +33,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]
@@ -49,5 +49,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-CollectionLayout_paged.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
index f3d7569..e578a16 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_paged.adoc
@@ -10,7 +10,7 @@ The `paged()` attribute specifies the number of rows to display in a (parented)
 
 [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).
 ====
@@ -31,7 +31,7 @@ It is also possible to specify a global default for the page size of standalone
 
 
 
-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-CollectionLayout_render.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
index eaeeda2..9a1b0d4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc
@@ -20,7 +20,7 @@ public class Order {
 ----
 
 
-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-CollectionLayout_sortedBy.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
index bc01ff1..0b4e4c2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_sortedBy.adoc
@@ -37,7 +37,7 @@ image::{_imagesdir}reference-annotations/CollectionLayout/sortedby-dependencies.
 
 [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).
 ====
 
 
@@ -46,7 +46,7 @@ Without this annotation, the order would have been inverted (because the natural
 
 
 
-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-Collection_domainEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc
index 254fa62..801a584 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc
@@ -18,7 +18,7 @@ Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusSe
 
 [WARNING]
 ====
-The xref:ugvw.adoc#[Wicket viewer] does _not_ currently support the modification of collections; they are rendered read-only.  However, domain events are still relevant to determine if such collections should be hidden.
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] does _not_ currently support the modification of collections; they are rendered read-only.  However, domain events are still relevant to determine if such collections should be hidden.
 
 The workaround is to create add/remove actions and use xref:../rgant/rgant.adoc#_rgant-MemberOrder[UI hints] to render them close to the collection.
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_editing.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_editing.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_editing.adoc
index 3310952..c578545 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_editing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_editing.adoc
@@ -12,7 +12,7 @@ The related `editingDisabledReason()` attribute specifies the a hard-coded reaso
 
 [WARNING]
 ====
-The xref:ugvw.adoc#[Wicket viewer] does *not* currently support the modification of collections; they are rendered read-only.
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] does *not* currently support the modification of collections; they are rendered read-only.
 
 The workaround is to create add/remove actions and use xref:../rgant/rgant.adoc#_rgant-MemberOrder[UI hints] to render them close to the collection.
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
index 63da074..e252f41 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_hidden.adoc
@@ -9,7 +9,7 @@ Collections can be hidden at the domain-level, indicating that they are not visi
 
 [TIP]
 ====
-It is also possible to use xref:../rgant/rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or using xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] such that the collection can be hidden at the view layer.
+It is also possible to use xref:../rgant/rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or using xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[file-based layout] such that the collection 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.
 ====
 
@@ -49,7 +49,7 @@ The other values of the `Where` enum have no meaning for a collection.
 
 [NOTE]
 ====
-The xref:ugvw.adoc#[Wicket viewer] suppresses collections when displaying lists of objects.
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] suppresses collections when displaying lists of objects.
 
-The xref:ugvro.adoc#[RestfulObjects viewer] by default suppress collections when rendering a domain object.
+The xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] by default suppress collections when rendering a domain object.
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
index 6f7716d..450534c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
@@ -24,8 +24,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`]
 
 
@@ -64,7 +64,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-DomainObjectLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
index df4b445..7bef931 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
@@ -109,7 +109,7 @@ public class ToDoItem {
 
 [NOTE]
 ====
-Note that there is (currently) no support for specifying UI hints for domain objects 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 objects 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-DomainObjectLayout_bookmarking.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_bookmarking.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_bookmarking.adoc
index 5829ea1..98cb467 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_bookmarking.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_bookmarking.adoc
@@ -14,7 +14,7 @@ image::{_imagesdir}reference-annotations/DomainObjectLayout/bookmarking.png[widt
 
 [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).
 ====
 
 For example:
@@ -37,7 +37,7 @@ image::{_imagesdir}reference-annotations/DomainObjectLayout/bookmarking-nested.p
 
 [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).
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
index 0b1f983..8b948aa 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
@@ -17,8 +17,8 @@ the domain object using the event's API.
 [NOTE]
 ====
 The feature was originally introduced so that xref:../rgant/rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`]-annotated
-xref:ugbtb.adoc#_ugbtb_view-models[view model]s could be kept as minimal as possible, just defining the data.
-UI events allow subscribers to provide UI hints, while xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixin]s can be used to provide the behaviour.
+xref:../ugbtb/ugbtb.adoc#_ugbtb_view-models[view model]s could be kept as minimal as possible, just defining the data.
+UI events allow subscribers to provide UI hints, while xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixin]s can be used to provide the behaviour.
 ====
 
 By default the event raised is `CssClassUiEvent.Default`. For example:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_describedAs.adoc
index 0c026da..23c1650 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_describedAs.adoc
@@ -5,7 +5,7 @@
 :_imagesdir: images/
 
 
-The `describedAs()` attribute is used to provide a short description of the domain object 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-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-ViewModelLayout_describedAs[view models].
+The `describedAs()` attribute is used to provide a short description of the domain object 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-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-ViewModelLayout_describedAs[view models].
 
 For example:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
index 2a48a2e..21d5f81 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
@@ -18,8 +18,8 @@ the domain object using the event's API.
 [NOTE]
 ====
 The feature was originally introduced so that xref:../rgant/rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`]-annotated
-xref:ugbtb.adoc#_ugbtb_view-models[view model]s could be kept as minimal as possible, just defining the data.
-UI events allow subscribers to provide UI hints, while xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixin]s can be used to provide the behaviour.
+xref:../ugbtb/ugbtb.adoc#_ugbtb_view-models[view model]s could be kept as minimal as possible, just defining the data.
+UI events allow subscribers to provide UI hints, while xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixin]s can be used to provide the behaviour.
 ====
 
 By default the event raised is `IconUiEvent.Default`. For example:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_named.adoc
index 4302409..c5e702e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_named.adoc
@@ -31,7 +31,7 @@ It's also possible to specify a xref:../rgant/rgant.adoc#_rgant-DomainObjectLayo
 
 [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-DomainObjectLayout_paged.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_paged.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_paged.adoc
index 8380c1b..fb206ee 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_paged.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_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-DomainObjectLayout_titleUiEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc
index a36a421..aa1fb75 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc
@@ -17,8 +17,8 @@ the domain object using the event's API.
 [NOTE]
 ====
 The feature was originally introduced so that xref:../rgant/rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`]-annotated
-xref:ugbtb.adoc#_ugbtb_view-models[view model]s could be kept as minimal as possible, just defining the data.
-UI events allow subscribers to provide UI hints, while xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixin]s can be used to provide the behaviour.
+xref:../ugbtb/ugbtb.adoc#_ugbtb_view-models[view model]s could be kept as minimal as possible, just defining the data.
+UI events allow subscribers to provide UI hints, while xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixin]s can be used to provide the behaviour.
 ====
 
 By default the event raised is `TitleUiEvent.Default`. For example:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc
index 40a2c64..e81d72e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_bounded.adoc
@@ -8,7 +8,7 @@
 
 Some domain classes are immutable to the user, and moreover have only a fixed number of instances.  Often these are "reference" ("standing") data, or lookup data/pick lists.  Typical examples could include categories, countries, states, and tax or interest rate tables.
 
-Where the number of instances is relatively small, ie bounded, then the `bounded()` attribute can be used as a hint.  For such domain objects the framework will automatically allow instances to be selected; xref:ugvw.adoc#[Wicket viewer] displays these as a drop-down list.
+Where the number of instances is relatively small, ie bounded, then the `bounded()` attribute can be used as a hint.  For such domain objects the framework will automatically allow instances to be selected; xref:../ugvw/ugvw.adoc#[Wicket viewer] displays these as a drop-down list.
 
 
 For example:

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_nature.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_nature.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_nature.adoc
index a0e64c9..097e71b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_nature.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_nature.adoc
@@ -44,7 +44,7 @@ The identity of an inmemory entity is determined solely by the state of entity's
 +
 indicates that the domain object is part of the domain layer, and is contributing behaviour to objects of some other type as a mixin (also known as a trait).
 
-Equivalent to annotating with xref:../rgant/rgant.adoc#_rgant-Mixin[`@Mixin`].  For further discussion on using mixins, see xref:ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] in the user guide.
+Equivalent to annotating with xref:../rgant/rgant.adoc#_rgant-Mixin[`@Mixin`].  For further discussion on using mixins, see xref:../ugbtb/ugbtb.adoc#_ugbtb_decoupling_mixins[mixins] in the user guide.
 
 
 * `VIEW_MODEL` +

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
index adf3c50..78804b1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
@@ -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-DomainService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService.adoc
index a1e1d18..77db9f0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService.adoc
@@ -24,7 +24,7 @@ The table below summarizes the annotation's attributes.
 
 |xref:../rgant/rgant.adoc#_rgant-DomainService_nature[`nature()`]
 |`VIEW`, `VIEW_MENU_ONLY`, `VIEW_CONTRIBUTIONS_ONLY`, `VIEW_REST_ONLY`, `DOMAIN` (`VIEW`)
-|the nature of this service: providing actions for menus, or as contributed actions, or for the xref:ugvro.adoc#[RestfulObjects REST API], or neither
+|the nature of this service: providing actions for menus, or as contributed actions, or for the xref:../ugvro/ugvro.adoc#[RestfulObjects REST API], or neither
 
 
 |xref:../rgant/rgant.adoc#_rgant-DomainService_objectType[`objectType()`]

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
index 10674c7..817b8b6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout.adoc
@@ -10,7 +10,7 @@ The `@DomainServiceLayout` annotation applies to domain services, collecting tog
 
 [TIP]
 ====
-You will also find some additional material in the xref:ugvw.adoc#_ugvw_layout_application-menu[object layout] chapter.
+You will also find some additional material in the xref:../ugvw/ugvw.adoc#_ugvw_layout_application-menu[object layout] chapter.
 ====
 
 
@@ -64,7 +64,7 @@ public class ToDoItems {
 
 [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-DomainServiceLayout_menuBar.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuBar.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuBar.adoc
index f300e81..77fafe8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuBar.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuBar.adoc
@@ -19,7 +19,7 @@ public class ToDoItems {
 }
 ----
 
-In the xref:ugvw.adoc#[Wicket viewer], domain services placed on the `PRIMARY` menu bar appears to the left:
+In the xref:../ugvw/ugvw.adoc#[Wicket viewer], domain services placed on the `PRIMARY` menu bar appears to the left:
 
 image::{_imagesdir}reference-annotations/DomainServiceLayout/menuBar-primary.png[width="720px",link="{_imagesdir}reference-annotations/DomainServiceLayout/menuBar-primary.png"]
 
@@ -38,6 +38,6 @@ The grouping of multiple domain services actions within a single drop-down is ma
 
 [NOTE]
 ====
-The xref:ugvro.adoc#[RestfulObjects viewer] does not support this attribute.
+The xref:../ugvro/ugvro.adoc#[RestfulObjects viewer] does not support this attribute.
 ====
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc
index 95fc52b..60e5c2f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainServiceLayout_menuOrder.adoc
@@ -20,7 +20,7 @@ For example, the screenshot below shows the "prototyping" menu from the (non-ASF
 image::{_imagesdir}reference-annotations/DomainServiceLayout/menuOrder.png[width="500px",link="{_imagesdir}reference-annotations/DomainServiceLayout/menuOrder.png"]
 
 
-The xref:ugvw.adoc#[Wicket viewer] automatically places separators between actions from different domain services.  From this we can infer that there are actually five different domain services that are all rendered on the "prototyping" top-level menu.
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] automatically places separators between actions from different domain services.  From this we can infer that there are actually five different domain services that are all rendered on the "prototyping" top-level menu.
 
 One of these is the todoapp's `DemoDomainEventSubscriptions` service:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
index d53ca76..fa84ef3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
@@ -25,7 +25,7 @@ The related xref:../rgant/rgant.adoc#_rgant-ActionLayout_contributedAs[`@ActionL
 
 * `VIEW_REST_ONLY` +
 +
-The service's actions are intended only to be listed in the REST API exposed by the xref:ugvro.adoc#[RestfulObjects viewer].
+The service's actions are intended only to be listed in the REST API exposed by the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer].
 
 * `DOMAIN` +
 +

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
index 7ceca4d..0509a99 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
@@ -13,8 +13,8 @@ This can appear in several contexts, including:
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
  (see xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`])
 * 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] (specifically, for bookmarked actions)
+* in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
+* in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (specifically, for bookmarked actions)
 
 
 
@@ -48,7 +48,7 @@ The rules of precedence are:
 This might be obvious, but to make explicit: we recommend that you always specify an object type for your domain services.
 
 Otherwise, if you refactor your code (change class name or move package), then any externally held references to the OID of the service 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-HomePage.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
index 8875441..aa08e8a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-HomePage.adoc
@@ -45,7 +45,7 @@ public class ToDoAppDashboard {
     public Blob exportToWordDoc() { ... }  // <1>
 }
 ----
-<1> associated using xref:ugvw.adoc#_ugvw_layout_file-based[file-based layout] with the `notYetComplete` collection.
+<1> associated using xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[file-based layout] with the `notYetComplete` collection.
 
 The other two actions shown in the above screenshot -- `exportAsXml` and `downloadLayout` -- are actually contributed to the `ToDoAppDashboard` through various domain services, as is the `downloadLayout` action.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
index 6ba109e..faebc82 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
@@ -6,7 +6,7 @@
 
 
 
-Apache Isis automatically injects domain services into other domain services and also into domain objects and view models.  In fact, it also injects domain services into xref:ugtst.adoc#_ugtst_integ-test-support[integration tests] and xref:ugtst.adoc#_ugtst_fixture-scripts[fixture scripts].
+Apache Isis automatically injects domain services into other domain services and also into domain objects and view models.  In fact, it also injects domain services into xref:../ugtst/ugtst.adoc#_ugtst_integ-test-support[integration tests] and xref:../ugtst/ugtst.adoc#_ugtst_fixture-scripts[fixture scripts].
 
 [NOTE]
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
index f9400a5..22d14cd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberGroupLayout.adoc
@@ -16,5 +16,5 @@ The annotation defines two attributes, `name()` and `sequence()`.  Broadly speak
 
 [IMPORTANT]
 ====
-As this is an important topic, there is a xref:ugvw.adoc#_ugvw_layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:../ugvw/ugvw.adoc#_ugvw_layout[separate chapter] that discussed object layout in full.
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/b2b87ca4/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
index c813ea4..05d3d45 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-MemberOrder.adoc
@@ -21,7 +21,7 @@ Collections are always rendered in the "last" column.  This can appear either be
 
 [IMPORTANT]
 ====
-As this is an important topic, there is a xref:ugvw.adoc#_ugvw_layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:../ugvw/ugvw.adoc#_ugvw_layout[separate chapter] that discussed object layout in full.
 ====