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 2019/06/02 16:48:55 UTC
[isis] 41/47: ISIS-2062: fixes xrefs for ugbtb
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 124f52f3d53f1127f7da17baddffb4911fd767ac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jun 2 16:18:39 2019 +0100
ISIS-2062: fixes xrefs for ugbtb
---
.../support/modules/dg/pages/_partials/_dg_asciidoc-templates.adoc | 2 +-
antora/components/support/modules/dg/pages/dg.adoc | 2 +-
antora/components/toc/modules/ROOT/pages/about.adoc | 2 +-
antora/components/ug/modules/btb/pages/about.adoc | 2 +-
antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc | 2 +-
.../fun/pages/building-blocks/types-of-domain-objects/view-models.adoc | 2 +-
.../ug/modules/vw/pages/customisation/cheap-n-cheerful-theme.adoc | 2 +-
.../ug/modules/vw/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/antora/components/support/modules/dg/pages/_partials/_dg_asciidoc-templates.adoc b/antora/components/support/modules/dg/pages/_partials/_dg_asciidoc-templates.adoc
index d836e77..901f8e9 100644
--- a/antora/components/support/modules/dg/pages/_partials/_dg_asciidoc-templates.adoc
+++ b/antora/components/support/modules/dg/pages/_partials/_dg_asciidoc-templates.adoc
@@ -368,7 +368,7 @@ include::_attributes.adoc[]
//
//
//|`adugbtb`
-//|`\xref:ug:btb:ugbtb.adoc#xxx[ttt]`
+//|`\xref:ug:btb:about.adoc#xxx[ttt]`
//
//A hyperlink to a bookmark within the 'Beyond the Basics' user guide, where:
//
diff --git a/antora/components/support/modules/dg/pages/dg.adoc b/antora/components/support/modules/dg/pages/dg.adoc
index 510a56e..8799b0e 100644
--- a/antora/components/support/modules/dg/pages/dg.adoc
+++ b/antora/components/support/modules/dg/pages/dg.adoc
@@ -31,7 +31,7 @@ The user guides available are:
* xref:ug:odn:ugodn.adoc#[DataNucleus object store]
* xref:ug:sec:ugsec.adoc#[Security]
* xref:ug:tst:ugtst.adoc#[Testing]
-* xref:ug:btb:ugbtb.adoc#[Beyond the Basics]
+* xref:ug:btb:about.adoc#[Beyond the Basics]
The reference guides are:
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index f8eb4e1..2e22909 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -38,7 +38,7 @@ include::_attributes.adoc[]
* xref:ug:odn:ugodn.adoc[DataNucleus Object Store]
* xref:ug:sec:ugsec.adoc[Security]
* *xref:ug:tst:ugtst.adoc[Testing]*
-* xref:ug:btb:ugbtb.adoc[Beyond the Basics]
+* xref:ug:btb:about.adoc[Beyond the Basics]
|*Reference Guides:*
diff --git a/antora/components/ug/modules/btb/pages/about.adoc b/antora/components/ug/modules/btb/pages/about.adoc
index c9fdf6c..c342727 100644
--- a/antora/components/ug/modules/btb/pages/about.adoc
+++ b/antora/components/ug/modules/btb/pages/about.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
This guide provides xref:ug:btb:other-techniques.adoc[more advanced] guidance on writing maintainable larger
applications.
-Later chapters discuss how to xref:ug:btb:deployment.adoc[deploy] your app, and discuss other ways in which you can xref:ug:btb:ugbtb.adoc#[extend] or adapt the framework itself to your particular needs.
+Later chapters discuss how to xref:ug:btb:deployment.adoc[deploy] your app, and discuss other ways in which you can xref:ug:btb:programming-model.adoc[extend] or adapt the framework itself to your particular needs.
== Other Guides
diff --git a/antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc b/antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc
index 480580a..54359e7 100644
--- a/antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc
+++ b/antora/components/ug/modules/btb/pages/deployment/jvm-flags.adoc
@@ -46,5 +46,5 @@ There are also a whole bunch of GC-related flags, that you might want to explore
## Configuring in Tomcat
-If using Tomcat, update the `CATALINA_OPTS` variable. (This variable is also updated if xref:ug:btb:ugbtb.adoc#__ugbtb_deployment_externalized-configuration_Log4j[configuring logging to run externally]).
+If using Tomcat, update the `CATALINA_OPTS` variable. (This variable is also updated if xref:ug:btb:deployment/externalized-configuration.adoc#log4j[configuring logging to run externally]).
diff --git a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
index 2a6cf2b..b90b348 100644
--- a/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
+++ b/antora/components/ug/modules/fun/pages/building-blocks/types-of-domain-objects/view-models.adoc
@@ -119,7 +119,7 @@ In such cases, exposing domain entities over xref:ug:vro:ugvro.adoc#[RestfulObje
To support this use case, a view model can be defined such that it can act as a DTO.
This is done by annotating the class using JAXB annotations; this allows the consumer to obtain the DTO in XML format along with a corresponding XSD schema describing the structure of that XML.
-A discussion of how that might be done using an ESB such as link:http://camel.apache.org[Apache Camel(TM)] follows xref:ug:btb:ugbtb.adoc#__ugfun_building-blocks_view-models_dtos_consumers[below].
+A discussion of how that might be done using an ESB such as link:http://camel.apache.org[Apache Camel(TM)] follows xref:ug:fun:building-blocks/types-of-domain-objects/view-models.adoc#dtos_consumers[below].
In case it's not obvious, these DTOs are still usable as "regular" view models; they will render in the xref:ug:vw:ugvw.adoc#[Wicket viewer] just like any other.
In fact (as the xref:ug:fun:programming-model/view-models/jaxb.adoc[programming model] section below makes clear), these JAXB-annotated view models are in many regards the most powerful of all the alternative ways of writing view models.
diff --git a/antora/components/ug/modules/vw/pages/customisation/cheap-n-cheerful-theme.adoc b/antora/components/ug/modules/vw/pages/customisation/cheap-n-cheerful-theme.adoc
index 0bbbfff..9e1ba32 100644
--- a/antora/components/ug/modules/vw/pages/customisation/cheap-n-cheerful-theme.adoc
+++ b/antora/components/ug/modules/vw/pages/customisation/cheap-n-cheerful-theme.adoc
@@ -20,7 +20,7 @@ You can therefore use this CSS class as a way of building your own "theme" for t
[TIP]
====
-Alternatively you could "do it properly" and create your xref:ug:vw:extending/custom-bootstrap-theme.adoc[own Bootstrap theme], as described in the xref:ug:btb:ugbtb.adoc#[Extending] chapter.
+Alternatively you could "do it properly" and create your xref:ug:vw:extending/custom-bootstrap-theme.adoc[own Bootstrap theme], as described in the xref:ug:vw:extending.adoc[extending] chapter.
====
diff --git a/antora/components/ug/modules/vw/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc b/antora/components/ug/modules/vw/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
index 5f9b725..a0ff761 100644
--- a/antora/components/ug/modules/vw/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
+++ b/antora/components/ug/modules/vw/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
@@ -13,5 +13,5 @@ Can this be done?_
Yes, it _is_ 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:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_TranslationService[`TranslationService`].
-Full details of the ``msgId``s that must be added to the `translations.po` file can be found in xref:ug:btb:i18n.adoc#wicket-viewer[i18n] section of the xref:ug:btb: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:ug:btb:i18n.adoc#wicket-viewer[i18n] section of the xref:ug:btb:about.adoc[beyond the basics] guide.