You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/12/13 10:38:05 UTC
[26/50] [abbrv] isis git commit: ISIS-1243: renamed ug.adoc to
ugfun.adoc. Added standard section to each of the guides so can navigate
between each easily.
ISIS-1243: renamed ug.adoc to ugfun.adoc. Added standard section to each of the guides so can navigate between each easily.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1ad82470
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1ad82470
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1ad82470
Branch: refs/heads/ISIS-1223-upgrade-to-wicket-7
Commit: 1ad824700c01b17b78753f5659b3598a67571636
Parents: 43fc7bc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Dec 3 18:01:31 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Dec 3 18:01:31 2015 +0000
----------------------------------------------------------------------
README.adoc | 8 +-
...o-1.9.0_bootstrapping-using-AppManifest.adoc | 2 +-
...n-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc | 2 +-
...tion-notes_1.8.0-to-1.9.0_war-packaging.adoc | 4 +-
.../src/main/asciidoc/common-use-cases.adoc | 4 +-
.../src/main/asciidoc/documentation.adoc | 2 +-
.../asciidoc/guides/_cg_asciidoc-templates.adoc | 20 +-
.../main/asciidoc/guides/_cg_ide_eclipse.adoc | 2 +-
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 2 +-
.../guides/_cg_isis-maven-plugin_validate.adoc | 2 +-
.../asciidoc/guides/_rgant-ActionLayout.adoc | 2 +-
.../guides/_rgant-ActionLayout_bookmarking.adoc | 2 +-
.../_rgant-ActionLayout_contributedAs.adoc | 2 +-
.../guides/_rgant-ActionLayout_cssClass.adoc | 2 +-
.../guides/_rgant-ActionLayout_cssClassFa.adoc | 2 +-
.../guides/_rgant-ActionLayout_describedAs.adoc | 2 +-
.../guides/_rgant-ActionLayout_hidden.adoc | 2 +-
.../guides/_rgant-ActionLayout_named.adoc | 2 +-
.../guides/_rgant-ActionLayout_position.adoc | 2 +-
.../asciidoc/guides/_rgant-Action_hidden.adoc | 2 +-
.../guides/_rgant-CollectionLayout.adoc | 2 +-
.../_rgant-CollectionLayout_cssClass.adoc | 2 +-
.../_rgant-CollectionLayout_defaultView.adoc | 2 +-
.../_rgant-CollectionLayout_describedAs.adoc | 2 +-
.../guides/_rgant-CollectionLayout_hidden.adoc | 2 +-
.../guides/_rgant-CollectionLayout_named.adoc | 2 +-
.../guides/_rgant-CollectionLayout_paged.adoc | 2 +-
.../guides/_rgant-CollectionLayout_render.adoc | 4 +-
.../_rgant-CollectionLayout_sortedBy.adoc | 2 +-
.../guides/_rgant-Collection_hidden.adoc | 2 +-
.../guides/_rgant-DomainObjectLayout.adoc | 2 +-
.../guides/_rgant-DomainServiceLayout.adoc | 4 +-
.../main/asciidoc/guides/_rgant-HomePage.adoc | 2 +-
.../src/main/asciidoc/guides/_rgant-Inject.adoc | 2 +-
.../guides/_rgant-MemberGroupLayout.adoc | 2 +-
.../asciidoc/guides/_rgant-MemberOrder.adoc | 2 +-
.../asciidoc/guides/_rgant-ParameterLayout.adoc | 2 +-
.../asciidoc/guides/_rgant-PostConstruct.adoc | 2 +-
.../asciidoc/guides/_rgant-PropertyLayout.adoc | 2 +-
.../guides/_rgant-PropertyLayout_cssClass.adoc | 2 +-
.../_rgant-PropertyLayout_describedAs.adoc | 2 +-
.../guides/_rgant-PropertyLayout_hidden.adoc | 4 +-
.../_rgant-PropertyLayout_labelPosition.adoc | 2 +-
.../guides/_rgant-PropertyLayout_multiLine.adoc | 2 +-
.../guides/_rgant-PropertyLayout_named.adoc | 2 +-
...gant-PropertyLayout_renderedAsDayBefore.adoc | 2 +-
.../asciidoc/guides/_rgant-ViewModelLayout.adoc | 2 +-
.../asciidoc/guides/_rgant-XmlRootElement.adoc | 2 +-
.../asciidoc/guides/_rgant_aaa_deprecated.adoc | 2 +-
.../main/asciidoc/guides/_rgant_aaa_jee.adoc | 2 +-
.../main/asciidoc/guides/_rgant_aaa_main.adoc | 4 +-
.../main/asciidoc/guides/_rgant_aaa_other.adoc | 2 +-
.../guides/_rgcfg_configuring-core.adoc | 6 +-
...s_disabling-persistence-by-reachability.adoc | 2 +-
.../guides/_rgcfg_specifying-components.adoc | 2 +-
.../main/asciidoc/guides/_rgcms_classes.adoc | 2 +-
...rgcms_classes_AppManifest-bootstrapping.adoc | 2 +-
.../guides/_rgcms_methods_prefixes_choices.adoc | 2 +-
.../guides/_rgcms_methods_prefixes_default.adoc | 2 +-
.../asciidoc/guides/_rgcms_schema-common.adoc | 2 +-
.../_rgsvc-api_ActionInvocationContext.adoc | 2 +-
.../guides/_rgsvc-api_BackgroundService.adoc | 2 +-
.../guides/_rgsvc-api_BookmarkService.adoc | 2 +-
.../guides/_rgsvc-api_CommandContext.adoc | 2 +-
.../guides/_rgsvc-api_DeepLinkService.adoc | 2 +-
.../guides/_rgsvc-api_EmailService.adoc | 2 +-
.../guides/_rgsvc-api_EventBusService.adoc | 2 +-
.../guides/_rgsvc-api_GuiceBeanProvider.adoc | 2 +-
.../guides/_rgsvc-api_IsisJdoSupport.adoc | 2 +-
.../asciidoc/guides/_rgsvc-api_JaxbService.adoc | 2 +-
.../guides/_rgsvc-api_MementoService.adoc | 2 +-
.../guides/_rgsvc-api_MetamodelService.adoc | 2 +-
.../guides/_rgsvc-api_QueryResultsCache.adoc | 2 +-
.../asciidoc/guides/_rgsvc-api_Scratchpad.adoc | 2 +-
.../asciidoc/guides/_rgsvc-api_SudoService.adoc | 2 +-
.../guides/_rgsvc-api_WrapperFactory.adoc | 2 +-
.../guides/_rgsvc-api_XmlSnapshotService.adoc | 2 +-
.../_rgsvc-spi_ClassDiscoveryService.adoc | 4 +-
.../_rgsvc-spi_ContentNegotiationService.adoc | 2 +-
.../_rgsvc-spi_EmailNotificationService.adoc | 2 +-
...spi_FixtureScriptsSpecificationProvider.adoc | 2 +-
.../guides/_rgsvc-spi_LocaleProvider.adoc | 2 +-
.../_rgsvc-spi_RepresentationService.adoc | 2 +-
.../guides/_rgsvc-spi_TranslationService.adoc | 2 +-
.../guides/_rgsvc-spi_TranslationsResolver.adoc | 2 +-
.../guides/_rgsvc-spi_UrlEncodingService.adoc | 2 +-
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 2 +-
.../_tg_stop-scaffolding-start-coding.adoc | 24 +-
.../main/asciidoc/guides/_ug_core-concepts.adoc | 22 --
.../guides/_ug_core-concepts_add-ons.adoc | 35 --
.../_ug_core-concepts_building-blocks.adoc | 335 -------------------
...re-concepts_framework-provided-services.adoc | 54 ---
..._core-concepts_other-deployment-options.adoc | 81 -----
.../guides/_ug_core-concepts_philosophy.adoc | 21 --
.../_ug_core-concepts_philosophy_aop.adoc | 36 --
.../_ug_core-concepts_philosophy_dci.adoc | 9 -
...oncepts_philosophy_domain-driven-design.adoc | 79 -----
...cepts_philosophy_hexagonal-architecture.adoc | 29 --
..._core-concepts_philosophy_how-eases-ddd.adoc | 74 ----
...ncepts_philosophy_naked-objects-pattern.adoc | 60 ----
...bjects-pattern_object-interface-mapping.adoc | 18 -
.../guides/_ug_core-concepts_principles.adoc | 16 -
...core-concepts_principles_apache-isis-vs.adoc | 16 -
...concepts_principles_apache-isis-vs_cqrs.adoc | 28 --
...rinciples_apache-isis-vs_event-sourcing.adoc | 19 --
...ts_principles_apache-isis-vs_metawidget.adoc | 16 -
...ache-isis-vs_mvc-server-side-frameworks.adoc | 19 --
...ug_core-concepts_principles_isis-itself.adoc | 47 ---
.../_ug_core-concepts_principles_your-apps.adoc | 39 ---
.../src/main/asciidoc/guides/_ug_faqs.adoc | 16 -
.../guides/_ug_faqs_enabling-logging.adoc | 39 ---
.../asciidoc/guides/_ug_faqs_enhance-only.adoc | 17 -
.../guides/_ug_faqs_per-user-themes.adoc | 85 -----
.../guides/_ug_faqs_restful-image-property.adoc | 20 --
...faqs_subtype-entity-not-fully-populated.adoc | 67 ----
.../asciidoc/guides/_ug_getting-started.adoc | 37 --
...ug_getting-started_datanucleus-enhancer.adoc | 107 ------
..._ug_getting-started_simpleapp-archetype.adoc | 304 -----------------
.../src/main/asciidoc/guides/_ug_how-tos.adoc | 22 --
.../guides/_ug_how-tos_bulk-actions.adoc | 8 -
.../guides/_ug_how-tos_business-rules.adoc | 72 ----
.../guides/_ug_how-tos_class-structure.adoc | 38 ---
...w-tos_class-structure_action-parameters.adoc | 26 --
.../_ug_how-tos_class-structure_actions.adoc | 19 --
...ow-tos_class-structure_class-definition.adoc | 24 --
..._ug_how-tos_class-structure_collections.adoc | 26 --
...ow-tos_class-structure_ignoring-methods.adoc | 16 -
...how-tos_class-structure_inject-services.adoc | 83 -----
...lass-structure_properties-vs-parameters.adoc | 45 ---
.../_ug_how-tos_class-structure_properties.adoc | 299 -----------------
.../guides/_ug_how-tos_contributed-members.adoc | 69 ----
.../main/asciidoc/guides/_ug_how-tos_crud.adoc | 29 --
.../guides/_ug_how-tos_derived-members.adoc | 48 ---
.../guides/_ug_how-tos_domain-services.adoc | 313 -----------------
.../_ug_how-tos_drop-downs-and-defaults.adoc | 65 ----
.../_ug_how-tos_entity-relationships.adoc | 15 -
...aged-1-to-m-bidirectional-relationships.adoc | 59 ----
...how-tos_render-all-properties-in-tables.adoc | 49 ---
...ow-tos_simulating-collections-of-values.adoc | 23 --
.../asciidoc/guides/_ug_how-tos_ui-hints.adoc | 15 -
...g_how-tos_ui-hints_action-icons-and-css.adoc | 58 ----
.../_ug_how-tos_ui-hints_eager-rendering.adoc | 58 ----
.../guides/_ug_how-tos_ui-hints_layout.adoc | 9 -
...how-tos_ui-hints_names-and-descriptions.adoc | 47 ---
...ow-tos_ui-hints_object-titles-and-icons.adoc | 97 ------
.../guides/_ug_how-tos_ui_are-you-sure.adoc | 76 -----
.../main/asciidoc/guides/_ug_object-layout.adoc | 18 -
.../_ug_object-layout_application-menu.adoc | 171 ----------
.../guides/_ug_object-layout_dynamic.adoc | 113 -------
.../_ug_object-layout_static-vs-dynamic.adoc | 26 --
.../guides/_ug_object-layout_static.adoc | 159 ---------
.../guides/_ugbtb_deployment_neo4j.adoc | 6 +-
..._more-advanced_decoupling_contributions.adoc | 2 +-
.../guides/_ugbtb_more-advanced_i18n.adoc | 2 +-
...btb_more-advanced_view-models_use-cases.adoc | 2 +-
...gbtb_programming-model_custom-validator.adoc | 2 +-
...rogramming-model_layout-metadata-reader.adoc | 2 +-
.../asciidoc/guides/_ugfun_core-concepts.adoc | 22 ++
.../guides/_ugfun_core-concepts_add-ons.adoc | 35 ++
.../_ugfun_core-concepts_building-blocks.adoc | 335 +++++++++++++++++++
...re-concepts_framework-provided-services.adoc | 54 +++
..._core-concepts_other-deployment-options.adoc | 81 +++++
.../guides/_ugfun_core-concepts_philosophy.adoc | 21 ++
.../_ugfun_core-concepts_philosophy_aop.adoc | 36 ++
.../_ugfun_core-concepts_philosophy_dci.adoc | 9 +
...oncepts_philosophy_domain-driven-design.adoc | 79 +++++
...cepts_philosophy_hexagonal-architecture.adoc | 29 ++
..._core-concepts_philosophy_how-eases-ddd.adoc | 74 ++++
...ncepts_philosophy_naked-objects-pattern.adoc | 60 ++++
...bjects-pattern_object-interface-mapping.adoc | 18 +
.../guides/_ugfun_core-concepts_principles.adoc | 16 +
...core-concepts_principles_apache-isis-vs.adoc | 16 +
...concepts_principles_apache-isis-vs_cqrs.adoc | 28 ++
...rinciples_apache-isis-vs_event-sourcing.adoc | 19 ++
...ts_principles_apache-isis-vs_metawidget.adoc | 16 +
...ache-isis-vs_mvc-server-side-frameworks.adoc | 19 ++
...un_core-concepts_principles_isis-itself.adoc | 47 +++
...gfun_core-concepts_principles_your-apps.adoc | 39 +++
.../src/main/asciidoc/guides/_ugfun_faqs.adoc | 16 +
.../guides/_ugfun_faqs_enabling-logging.adoc | 39 +++
.../guides/_ugfun_faqs_enhance-only.adoc | 17 +
.../guides/_ugfun_faqs_per-user-themes.adoc | 85 +++++
.../_ugfun_faqs_restful-image-property.adoc | 20 ++
...faqs_subtype-entity-not-fully-populated.adoc | 67 ++++
.../asciidoc/guides/_ugfun_getting-started.adoc | 37 ++
...un_getting-started_datanucleus-enhancer.adoc | 107 ++++++
...fun_getting-started_simpleapp-archetype.adoc | 304 +++++++++++++++++
.../main/asciidoc/guides/_ugfun_how-tos.adoc | 22 ++
.../guides/_ugfun_how-tos_bulk-actions.adoc | 8 +
.../guides/_ugfun_how-tos_business-rules.adoc | 72 ++++
.../guides/_ugfun_how-tos_class-structure.adoc | 38 +++
...w-tos_class-structure_action-parameters.adoc | 26 ++
.../_ugfun_how-tos_class-structure_actions.adoc | 19 ++
...ow-tos_class-structure_class-definition.adoc | 24 ++
...fun_how-tos_class-structure_collections.adoc | 26 ++
...ow-tos_class-structure_ignoring-methods.adoc | 16 +
...how-tos_class-structure_inject-services.adoc | 83 +++++
...lass-structure_properties-vs-parameters.adoc | 45 +++
...gfun_how-tos_class-structure_properties.adoc | 299 +++++++++++++++++
.../_ugfun_how-tos_contributed-members.adoc | 69 ++++
.../asciidoc/guides/_ugfun_how-tos_crud.adoc | 29 ++
.../guides/_ugfun_how-tos_derived-members.adoc | 48 +++
.../guides/_ugfun_how-tos_domain-services.adoc | 313 +++++++++++++++++
.../_ugfun_how-tos_drop-downs-and-defaults.adoc | 65 ++++
.../_ugfun_how-tos_entity-relationships.adoc | 15 +
...aged-1-to-m-bidirectional-relationships.adoc | 59 ++++
...how-tos_render-all-properties-in-tables.adoc | 49 +++
...ow-tos_simulating-collections-of-values.adoc | 23 ++
.../guides/_ugfun_how-tos_ui-hints.adoc | 15 +
...n_how-tos_ui-hints_action-icons-and-css.adoc | 58 ++++
..._ugfun_how-tos_ui-hints_eager-rendering.adoc | 58 ++++
.../guides/_ugfun_how-tos_ui-hints_layout.adoc | 9 +
...how-tos_ui-hints_names-and-descriptions.adoc | 47 +++
...ow-tos_ui-hints_object-titles-and-icons.adoc | 97 ++++++
.../guides/_ugfun_how-tos_ui_are-you-sure.adoc | 76 +++++
.../asciidoc/guides/_ugfun_object-layout.adoc | 18 +
.../_ugfun_object-layout_application-menu.adoc | 171 ++++++++++
.../guides/_ugfun_object-layout_dynamic.adoc | 113 +++++++
.../_ugfun_object-layout_static-vs-dynamic.adoc | 26 ++
.../guides/_ugfun_object-layout_static.adoc | 159 +++++++++
.../_ugsec_configuring-isis-to-use-shiro.adoc | 2 +-
.../asciidoc/guides/_ugsec_shiro-ini-realm.adoc | 2 +-
...st_bdd-spec-support_maven-configuration.adoc | 2 +-
...tst_bdd-spec-support_writing-a-bdd-spec.adoc | 6 +-
.../_ugtst_fixture-scripts_api-and-usage.adoc | 12 +-
..._ugtst_integ-test-support_bootstrapping.adoc | 2 +-
..._integ-test-support_maven-configuration.adoc | 2 +-
..._ugtst_unit-test-support_contract-tests.adoc | 4 +-
...t_unit-test-support_maven-configuration.adoc | 2 +-
.../guides/_ugvw_customisation_about-page.adoc | 2 +-
...ugvw_customisation_tweaking-css-classes.adoc | 2 +-
.../src/main/asciidoc/guides/_ugvw_layout.adoc | 6 +-
.../src/main/asciidoc/guides/cg.adoc | 30 +-
.../src/main/asciidoc/guides/rg.adoc | 27 ++
.../src/main/asciidoc/guides/rgant.adoc | 35 +-
.../src/main/asciidoc/guides/rgcfg.adoc | 30 +-
.../src/main/asciidoc/guides/rgcms.adoc | 21 +-
.../src/main/asciidoc/guides/rgsvc.adoc | 21 +-
.../asciidoc/guides/simpleapp-archetype.adoc | 2 +-
.../src/main/asciidoc/guides/ug.adoc | 33 +-
.../src/main/asciidoc/guides/ugbtb.adoc | 19 +-
.../src/main/asciidoc/guides/ugfun.adoc | 50 +++
.../src/main/asciidoc/guides/ugsec.adoc | 21 +-
.../src/main/asciidoc/guides/ugtst.adoc | 18 +-
.../src/main/asciidoc/guides/ugvro.adoc | 18 +-
.../src/main/asciidoc/guides/ugvw.adoc | 18 +-
246 files changed, 4380 insertions(+), 4143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index c72e3bf..5432332 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,8 +1,8 @@
= Apache Isis
-_http://isis.apache.org[Apache Isis]� software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API._
+_http://isis.apache.org[Apache Isis]� software is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API._
-Get started using our "simpleapp" https://isis.apache.org/guides/ug.html#_ug_getting-started_simpleapp-archetype[Maven archetype].
+Get started using our "simpleapp" https://isis.apache.org/guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype[Maven archetype].
For help and support, join the http://isis.apache.org/support.html[mailing lists]. To contribute to our documentation, see our https://github.com/apache/isis/tree/master/adocs/documentation[Asciidoctor source].
@@ -16,7 +16,7 @@ The todoapp also integrates with a number of other http://www.isisaddons.org[Isi
=== Sign-in
-Apache Isis integrates with http://shiro.apache.org[Apache Shiro]�. The core framework supports file-based realms, while the Isis Addons http://github.com/isisaddons/isis-module-security[security module] provides a well-features subdomain of users, roles and permissions against features derived from the Isis metamodel. The example todoapp integrates with the security module.
+Apache Isis integrates with http://shiro.apache.org[Apache Shiro]�. The core framework supports file-based realms, while the Isis Addons http://github.com/isisaddons/isis-module-security[security module] provides a well-features subdomain of users, roles and permissions against features derived from the Isis metamodel. The example todoapp integrates with the security module.
image::https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/010-login.png[link="https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/010-login.png"]
@@ -79,7 +79,7 @@ image::https://raw.github.com/apache/isis/master/adocs/documentation/src/main/as
== Extensible Views
-The Apache Isis viewer is implemented using http://wicket.apache.org[Apache Wicket]�, and has been architected to be extensible. For example, when a collection of objects is rendered, this is just one several views, as shown in the selector drop-down:
+The Apache Isis viewer is implemented using http://wicket.apache.org[Apache Wicket]�, and has been architected to be extensible. For example, when a collection of objects is rendered, this is just one several views, as shown in the selector drop-down:
image::https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/070-pluggable-views.png[link="https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/070-pluggable-views.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
index 16fe795..0617439 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
@@ -8,7 +8,7 @@
Apache Isis 1.9.0 provides a simplified programmatic way of bootstrapping the application, that also unifies bootstrapping for integration tests.
-For now this new bootstrapping mechanism is optional (you don't have to change your code), but it may become mandatory in future releases. The xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated to use this new mechanism.
+For now this new bootstrapping mechanism is optional (you don't have to change your code), but it may become mandatory in future releases. The xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated to use this new mechanism.
The instructions below assume that your application is structured as per the simpleapp archetype. Adjust accordingly.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
index 63f1200..7fd697d 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
@@ -8,7 +8,7 @@
Apache Isis 1.9.0 updates to DataNucleus 4.0.0, which requires some changes (simplifications) to the Maven configuration.
-If you starting a new app then you can start from the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype]; its Maven configuration has been updated.
+If you starting a new app then you can start from the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]; its Maven configuration has been updated.
If you have an existing Apache Isis app that you want to upgrade, then you'll need to make some changes.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
index a71e83d..5e72ba0 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
@@ -6,7 +6,7 @@
-As discussed in xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype] and elsewhere, the `org.apache.isis.WebServer` provides the ability to run your app from an embedded jetty. This is great for prototyping. The class resides in the `isis-core-webserver` module, which also has the dependency on jetty.
+As discussed in xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] and elsewhere, the `org.apache.isis.WebServer` provides the ability to run your app from an embedded jetty. This is great for prototyping. The class resides in the `isis-core-webserver` module, which also has the dependency on jetty.
In 1.9.0 we have upgraded the jetty dependency to use Jetty 9.2.0 (`org.eclipse.jetty.aggregate:jetty-all:9.2.11.v20150529`, to be precise). One consequence of this is that the packaged WAR file will not boot on Tomcat.
@@ -31,4 +31,4 @@ Alternatively you can change your webapp's `pom.xml` so that when the war is pac
----
-For future projects the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated with this change.
+For future projects the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated with this change.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/common-use-cases.adoc b/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
index 2c5acc2..6e32b6d 100644
--- a/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
+++ b/adocs/documentation/src/main/asciidoc/common-use-cases.adoc
@@ -26,7 +26,7 @@ Once you've sketched out your domain model, you can then either start-over using
One of the original motivations for Apache Isis itself was to be able automatically generate a user interface for a domain object model.
-Apache Isis' has a pluggable architecture allowing different user interface technologies. The principal implementation (as configured by the link:./simple-archetype.html[simple archetype]) is the link:guides/ug.html#_ug_wicket-viewer[Wicket viewer]. This provides an appealing default user interface, with the ability to customize the user interface by writing new http://wicket.apache.org[Apache Wicket] components. Some third-party components can be found in the (non-ASF) link:http://isisaddons.org[Isis Addons] (non-ASF) project, integrating the Wicket viewer with https://github.com/isisaddons/isis-wicket-gmap3[google maps], https://github.com/isisaddons/isis-wicket-fullcalendar2[a full calendar] and a https://github.com/isisaddons/isis-wicket-excel[export to Excel] component.
+Apache Isis' has a pluggable architecture allowing different user interface technologies. The principal implementation (as configured by the link:./simple-archetype.html[simple archetype]) is the link:guides/ugvw.html#[Wicket viewer]. This provides an appealing default user interface, with the ability to customize the user interface by writing new http://wicket.apache.org[Apache Wicket] components. Some third-party components can be found in the (non-ASF) link:http://isisaddons.org[Isis Addons] (non-ASF) project, integrating the Wicket viewer with https://github.com/isisaddons/isis-wicket-gmap3[google maps], https://github.com/isisaddons/isis-wicket-fullcalendar2[a full calendar] and a https://github.com/isisaddons/isis-wicket-excel[export to Excel] component.
Deploying on Apache Isis means that the framework also manages object persistence. Again this is pluggable, but the principal implementation is the JDO/DataNucleus objectstore. Because JDO supports both SQL and NoSQL databases, you can then deploy on a variety of platforms, including the link:https://developers.google.com/appengine/[Google App Engine (GAE)] and link:http://neo4j.com/[Neo4J].
@@ -38,7 +38,7 @@ Deploying on Apache Isis means that the framework also manages object persistenc
REST (Representation State Transfer) is an architectural style for building highly scalable distributed systems, using the same principles as the World Wide Web. Many commercial web APIs (twitter, facebook, Amazon) are implemented as either pure REST APIs or some approximation therein.
-The http://restfulobjects.org[Restful Objects specification] defines a means by a domain object model can be exposed as RESTful resources using JSON representations over HTTP. Apache Isis' link:guides/ugvro.html[RestfulObjects viewer] is an implementation of that spec, making any Apache Isis domain object automatically available via REST.
+The http://restfulobjects.org[Restful Objects specification] defines a means by a domain object model can be exposed as RESTful resources using JSON representations over HTTP. Apache Isis' link:guides/ugvro.html#[RestfulObjects viewer] is an implementation of that spec, making any Apache Isis domain object automatically available via REST.
There are two main use cases for deploying Apache Isis as a RESTful web service are:
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index 6e8d6de..5e1b2d8 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -59,7 +59,7 @@ pass:[<br/>]
|*User Guides:*
-* *link:./guides/ug.html[Fundamentals^]*
+* *link:./guides/ugfun.html[Fundamentals^]*
* link:./guides/ugvw.html[Wicket Viewer^]
* link:./guides/ugvro.html[Restful Objects Viewer^]
* link:./guides/ugsec.html[Security^]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
index 5b6e3ea..6a97968 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
@@ -185,9 +185,9 @@ a hyperlink to a level 2 (chapter and section) within the reference guide, where
for example:
-pass:[<pre>xref:ug.adoc#_ug_object-layout_dynamic_[Dynamic object layout]</pre>]
+pass:[<pre>xref:ug.adoc#_ugfun_object-layout_dynamic_[Dynamic object layout]</pre>]
-|xref:ug.adoc#_ug_object-layout_dynamic[Dynamic object layout]
+|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic object layout]
@@ -385,9 +385,9 @@ a hyperlink to a level 1 (chapter) within the users' guide, where:
for example:
-pass:[<pre>xref:ug.adoc#_ug_core-concepts[Core concepts\]</pre>]
+pass:[<pre>xref:ug.adoc#_ugfun_core-concepts[Core concepts\]</pre>]
-|xref:ug.adoc#_ug_core-concepts[Core concepts]
+|xref:ug.adoc#_ugfun_core-concepts[Core concepts]
@@ -418,19 +418,19 @@ a hyperlink to a level 3 (chapter, section, subsection) within the users' guide,
for example:
-pass:[<pre>xref:ug.adoc#_ug_core-concepts_philosophy_naked-objects-pattern[Naked objects pattern\]</pre>]
+pass:[<pre>xref:ug.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[Naked objects pattern\]</pre>]
-|xref:ug.adoc#_ug_core-concepts_philosophy_naked-objects-pattern[Naked objects pattern]
+|xref:ug.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[Naked objects pattern]
|`adugsimpleapp`
-|pass:[<pre>xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype\]</pre>]
+|pass:[<pre>xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype\]</pre>]
A hyperlink to the `simpleapp` archetype in the "getting started" chapter.
-|xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype]
+|xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]
|`adugvro`
@@ -769,11 +769,11 @@ defines an inline anchor to any heading, where:
For example:
-pass:[<pre>= anchor:[_ug_i18n\] Internationalization</pre>]
+pass:[<pre>= anchor:[_ugfun_i18n\] Internationalization</pre>]
An alternative (more commonly used in our documentation) is to use the `[[...]]` directly above the heading:
-pass:[<pre>[[_ug_i18n\]\]
+pass:[<pre>[[_ugfun_i18n\]\]
= Internationalization</pre>]
|
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
index 793d27c..bbf0d98 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
@@ -62,7 +62,7 @@ image::{_imagesdir}appendices/dev-env/eclipse/eclipse-110-project-support.png[wi
DataNucleus' enhancer uses the domain object model's own classpath to reference DataNucleus JARs. So, even though your domain objects are unlikely to depend on DataNucleus, these references must still be present.
-See the earlier section on xref:ug.adoc#_ug_getting-started_datanucleus-enhancer[DataNucleus enhancer] for details of the contents of the `pom.xml`. Chances are it is already set up from running the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype].
+See the earlier section on xref:ug.adoc#_ugfun_getting-started_datanucleus-enhancer[DataNucleus enhancer] for details of the contents of the `pom.xml`. Chances are it is already set up from running the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
Then, tell DataNucleus to use the project classpath:
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
index b46dfdd..6b9a13d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
@@ -29,7 +29,7 @@ it knows how to bootstrap an Isis runtime. This is discussed below, followed by
As noted in the introduction, both goals require an xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`]
to point the plugin at, so that it knows how to bootstrap an Isis runtime.
-This can be extremely minimal. For example, the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp]'s
+This can be extremely minimal. For example, the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp]'s
manifest is:
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
index 51d6d2a..9771752 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
@@ -110,7 +110,7 @@ mvn test -Dskip.isis-validate
== Example of failure
-In the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp] application the `SimpleObject` defines an `updateName` action. This has a supporting method:
+In the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp] application the `SimpleObject` defines an `updateName` action. This has a supporting method:
[source,java]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
index 963c41c..cc16e56 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
@@ -100,7 +100,7 @@ public class ToDoItems {
-As an alternative to using the `@ActionLayout` annotation, a dynamic layout using xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@ActionLayout` annotation, a dynamic layout using xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
index 2655d6d..6a646dc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
@@ -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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
index 983987d..13b1fe8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
@@ -49,6 +49,6 @@ In such cases, though, it would probably make more sense to annotate the action
[NOTE]
====
-Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified dynamically in the `.layout.json` xref:ug.adoc#_ug_object-layout_dynamic[dynamic layout file] because it relates to the contributor domain service, not the contributee domain object.
+Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified dynamically in the `.layout.json` xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layout file] because it relates to the contributor domain service, not the contributee domain object.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc
index fb090cf..e2f0bac 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc
index 0702f30..3e393c7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
index d4ec9cc..f1543f8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class Customer {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc
index 8ba695a..bb28835 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
index 13993a3..7813dca 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
@@ -25,7 +25,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
index 596530f..c3d09c0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
@@ -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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
index dc3add8..f65b28c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
@@ -11,7 +11,7 @@ Actions can be hidden at the domain-level, indicating that they are not visible
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ug.adoc#_ug_object-layout_dynamic[dynamic layouts] such that the action 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.
+It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the action 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.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
index 3362a94..0ff2f80 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
@@ -94,7 +94,7 @@ public class ToDoItem {
-As an alternative to using the `@CollectionLayout` annotation, a dynamic layout using xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@CollectionLayout` annotation, a dynamic layout using xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
index c8d3d19..e18e3e1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
index de4108a..9641d78 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
@@ -24,7 +24,7 @@ public class BusRoute {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
index 5f27ca0..effc006 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc
index 810f530..ad906c3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
index 79fd145..9fe50e2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
@@ -33,7 +33,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
index f371d7a..2551458 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
@@ -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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
index 375dc08..121e185 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
@@ -20,7 +20,7 @@ public class Order {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
@@ -35,7 +35,7 @@ can be used instead, eg:
[NOTE]
====
-Note that xref:ug.adoc#_ug_how-tos_contributed-members[contributed collections] (which, under the covers are just action invocations against a domain service) are always rendered eagerly.
+Note that xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed collections] (which, under the covers are just action invocations against a domain service) are always rendered eagerly.
Also, if a xref:rgant.adoc#_rgant-CollectionLayout_defaultView[`@CollectionLayout#defaultView()`] attribute has been specified then that will take precedence over the value of the `render()` attribute.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
index 2d39a71..2083be4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
@@ -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:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc
index 66d4f69..c16c14a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or xref:ug.adoc#_ug_object-layout_dynamic[dynamic layouts] 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.
+It is also possible to use xref:rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] 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.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc
index 0f5a3d3..e49a5f5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout_dynamic[`.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:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc
index 78d799b..240951e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout_application-menu[object layout] chapter.
+You will also find some additional material in the xref:ug.adoc#_ugfun_object-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:ug.adoc#_ug_object-layout_dynamic[`.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:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
index c14ec11..159caae 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
@@ -45,7 +45,7 @@ public class ToDoAppDashboard {
public Blob exportToWordDoc() { ... } // <1>
}
----
-<1> associated using xref:ug.adoc#_ug_object-layout_dynamic[dynamic layouts] with the `notYetComplete` collection.
+<1> associated using xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] 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/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
index b2791ff..77dc434 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
@@ -27,7 +27,7 @@ public class Customer {
OrderRepository orders; // <2>
}
----
-<1> an alternative implementation would be to implement `findRecentOrders()` as a xref:ug.adoc#_ug_how-tos_contributed-members[contributed action].
+<1> an alternative implementation would be to implement `findRecentOrders()` as a xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed action].
<2> we recommend default (rather than `private`) visibility so that unit tests can easily mock out the service
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc
index 353f3ca..f93af0d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:ug.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc
index 01f1fb0..c642d84 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_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:ug.adoc#_ug_object-layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:ug.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
index 09fc3e7..fd7cc1c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
@@ -96,7 +96,7 @@ public class ToDoItem {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.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:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PostConstruct.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PostConstruct.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PostConstruct.adoc
index bf2eb25..c7d216f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PostConstruct.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PostConstruct.adoc
@@ -7,7 +7,7 @@
The `@javax.annotation.PostConstruct` annotation, as defined in link:https://jcp.org/en/jsr/detail?id=250[JSR-250], is recognized by Apache Isis as a callback method on domain services to be called just after they have been constructed, in order that they initialize themselves.
-It is also recognized for xref:ug.adoc#http://localhost:4000/guides/ug.html#_ugbtb_more-advanced_view-models[view models] (eg annotated with xref:rgant.adoc#_rgant-ViewModel[`@ViewModel`]).
+It is also recognized for xref:ugbtb.adoc#_ugbtb_more-advanced_view-models[view models] (eg annotated with xref:rgant.adoc#_rgant-ViewModel[`@ViewModel`]).
For the default application-scoped (singleton) domain services, this means that the method, if present, is called during the bootstrapping of the application. For xref:rgant.adoc#_rgant-RequestScoped[`@RequestScoped`] domain services, the method is called at the beginning of the request.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
index 4ab9658..9687634 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
@@ -102,7 +102,7 @@ It is also possible to apply the annotation to actions of domain services that a
-As an alternative to using the `@PropertyLayout` annotation, a dynamic layout using xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@PropertyLayout` annotation, a dynamic layout using xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
index a522810..0c31226 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
@@ -23,7 +23,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
index f93ac69..8c63f37 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
@@ -20,7 +20,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
index 72c2f6e..2e83211 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
@@ -10,7 +10,7 @@ The `hidden()` attribute indicates where (in the UI) the property should be hidd
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or xref:ug.adoc#_ug_object-layout_dynamic[dynamic layouts] such that the property can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the property can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
@@ -67,7 +67,7 @@ The xref:ugvro.adoc#[RestfulObjects viewer] has only partial support for these `
====
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
index f711de9..7eef03e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
@@ -58,7 +58,7 @@ image::{_imagesdir}reference-annotations/PropertyLayout/labelPosition-boolean-RI
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
index c6d92a0..f506d24 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
@@ -25,7 +25,7 @@ Here the `stepsToReproduce` will be displayed in a text area of 10 rows.
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
index 8d63fd6..43fc46d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
index aded30d..d041d5a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
@@ -32,7 +32,7 @@ public class Tenancy {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
index ca7efaf..a7406c1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
@@ -82,7 +82,7 @@ public class CategoryPieChart { ... }
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ug.adoc#_ug_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant-XmlRootElement.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-XmlRootElement.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-XmlRootElement.adoc
index d5874f1..3169161 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-XmlRootElement.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-XmlRootElement.adoc
@@ -42,7 +42,7 @@ The memento string for view models is converted into a form compatible with use
xref:rgsvc.adoc#_rgsvc-spi_UrlEncodingService[`UrlEncodingService`], the default implementation of which
simply encodes to base 64. If the view model XML graph is too large to be serialized to a string, then an alternative
implementation (eg which maps XML strings to a GUID, say) can be configured using the technique described in
-xref:rg.adoc#_ug_how-tos_replacing-default-service-implementations[here] in the user guide.
+xref:rg.adoc#_ugfun_how-tos_replacing-default-service-implementations[here] in the user guide.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
index d90dcae..b40bdeb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
@@ -19,7 +19,7 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|Purpose
|Use instead
|Layer
-|xref:ug.adoc#_ug_object-layout_dynamic[Dynamic layout]?
+|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|`@ActionOrder`
|Order of buttons and menu items representing actions.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
index 3e7f6ab..a68682c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
@@ -16,7 +16,7 @@ The table below lists the JEE annotations currently recognized. Expect to see m
|Annotation
|Purpose
|Layer
-|xref:ug.adoc#_ug_object-layout_dynamic[Dynamic layout]?
+|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Digits[`@javax.validation.` +
`constraints.` +
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
index 6dd8bfb..42a19f5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
@@ -11,7 +11,7 @@ For each of these domain types and members there are two annotations. One cover
[TIP]
====
-Most UI semantics can also be specified using xref:ug.adoc#_ug_object-layout_dynamic[dynamic object layout].
+Most UI semantics can also be specified using xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic object layout].
====
@@ -24,7 +24,7 @@ The table below summarizes these most commonly used annotations in Apache Isis.
|Annotation
|Purpose
|Layer
-|xref:ug.adoc#_ug_object-layout_dynamic[Dynamic layout]?
+|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Action[`@Action`]
|Domain semantics for actions
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
index 6ce4bc5..824d77b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
@@ -13,7 +13,7 @@ These annotations are also commonly used, but relate _not_ to objects or object
|Annotation
|Purpose
|Layer
-|xref:ug.adoc#_ug_object-layout_dynamic[Dynamic layout]?
+|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Facets[`@Facets`]
|Install arbitrary facets within the Apache Isis metamodel.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
index 4462047..224be40 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
@@ -55,14 +55,14 @@ Only intended for "emergency use" as a workaround while pending fix/patch to Apa
|regex:css1, regex2:css2,...
|Comma separated list of key:value pairs, where the key is a regex matching action names (eg `delete.*`) and the value is a link:http://getbootstrap.com/css/[Bootstrap] CSS button class (eg `btn-warning) to be applied (as per `@CssClass()`) to all action members matching the regex. +
-See xref:ug.adoc#_ug_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
+See xref:ug.adoc#_ugfun_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
|`isis.reflector.facet.` +
`cssClassFa.patterns`
|regex:fa-icon,regex2:fa-icon2,...
|Comma separated list of key:value pairs, where the key is a regex matching action names (eg `create.*`) and the value is a link:http://fortawesome.github.io/Font-Awesome/icons/[font-awesome] icon name (eg `fa-plus`) to be applied (as per `@CssClassFa()`) to all action members matching the regex. +
-See xref:ug.adoc#_ug_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
+See xref:ug.adoc#_ugfun_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
|`isis.reflector.facet.` +
`domainObjectAnnotation.` +
@@ -189,7 +189,7 @@ See xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the programmi
|`isis.reflector.` +
`layoutMetadataReaders`
|`FQCN`,`FQCN2`,...
-|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ug.adoc#_ug_object-layout_dynamic[dynamic layout]s. +
+|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layout]s. +
See xref:ugbtb.adoc#_ugbtb_programming-model_layout-metadata-reader[Layout Metadata Reader] for more information.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
index afc22c0..fa994ce 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
@@ -23,7 +23,7 @@ We therefore recommend that you disable persistence-by-reachability by adding th
isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
----
-This change has been made to the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype]
+This change has been made to the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]
If you do disable this feature, then you will (of course) need to ensure that you explicitly persist all entities using the `DomainObjectContainer#persist(.)` or `DomainObjectContainer#persistIfNotAlready(.)` methods.
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
index a984e9f..ad20bb1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
@@ -27,7 +27,7 @@ To specify the `AppManifest` as a configuration property, use:
|`FQCN`
|`o.a.i.applib.AppManifest` +
-By convention this implementation resides in an `myapp-app` Maven module (as opposed to `myapp-dom` or `myapp-fixture`). See the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype] for details.
+By convention this implementation resides in an `myapp-app` Maven module (as opposed to `myapp-dom` or `myapp-fixture`). See the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] for details.
|===
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
index 72964eb..071d8b6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rgsvc.adoc#_rgsvc-api[domain] xref:rgsvc.adoc#_rgsvc-spi[services], xref:ug.adoc#_ug_object-layout[object layout] or xref:rgcfg.adoc#_rgcfg[configuration].
+This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rgsvc.adoc#_rgsvc-api[domain] xref:rgsvc.adoc#_rgsvc-spi[services], xref:ug.adoc#_ugfun_object-layout[object layout] or xref:rgcfg.adoc#_rgcfg[configuration].
include::_rgcms_classes_AppManifest-bootstrapping.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
index 25fd561..19a4e4f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
@@ -183,7 +183,7 @@ What then remains is to update the bootstrapping code itself.
Bootstrapping integration tests is still performed using the `IsisSystemForTest.Builder`, but very often the bootstrapping code can be substantially simplified (compared to not using an `AppManifest`, that is).
-For example, this is the bootstrapping code for the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype] looks something like:
+For example, this is the bootstrapping code for the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] looks something like:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
index e20a470..eefc9ba 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
@@ -60,7 +60,7 @@ image::{_imagesdir}reference-methods/prefixes/choices/dependent.png[width="800px
-This functionality is actually implemented as a xref:ug.adoc#_ug_how-tos_contributed-members[contributed action], so the code for this is:
+This functionality is actually implemented as a xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed action], so the code for this is:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/1ad82470/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
index 36b18de..037538a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
@@ -58,7 +58,7 @@ public class ShoppingCartItem {
-Defaults are also supported (of course) for xref:ug.adoc#_ug_how-tos_contributed-members[contributed actions]. For example, here is a contributed action for updating category/subcategory of the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
+Defaults are also supported (of course) for xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed actions]. For example, here is a contributed action for updating category/subcategory of the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
[source,java]
----