You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/09/18 10:01:36 UTC
isis git commit: ISIS-1708: fixes some broken links
Repository: isis
Updated Branches:
refs/heads/master 7d06ccc50 -> 4912a4d93
ISIS-1708: fixes some broken links
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4912a4d9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4912a4d9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4912a4d9
Branch: refs/heads/master
Commit: 4912a4d9367b733b461212b36d07db6a68b47ab3
Parents: 7d06ccc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Sep 18 11:01:06 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Sep 18 11:01:06 2017 +0100
----------------------------------------------------------------------
.../asciidoc/guides/dg/_dg_asciidoc-syntax.adoc | 8 ++++----
.../asciidoc/guides/dg/_dg_asciidoc-templates.adoc | 16 ++++++++--------
.../guides/dg/_dg_asciidoc_writing-the-docs.adoc | 2 +-
.../main/asciidoc/guides/dg/_dg_git-cookbook.adoc | 2 +-
.../main/asciidoc/guides/dg/_dg_ide_intellij.adoc | 4 ++--
.../main/asciidoc/guides/dg/_dg_project-lombok.adoc | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4912a4d9/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
index 97da93f..ddfd707 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
@@ -243,15 +243,15 @@ xref:dg.adoc#__dg_asciidoc_links-and-xrefs#[background]
|Cross-reference to section in same asciidoc document
|....
-xref:../../setting-up/concepts/concepts.adoc#[concepts]
+xref:../ugfun/ugfun.adoc#[Fundamentals]
....
-|xref:../../setting-up/concepts/concepts.adoc#[concepts]
+|xref:../ugfun/ugfun.adoc#[Fundamentals]
|Cross-reference to top-level of different asciidoc document
|....
-xref:../../setting-up/concepts/concepts.adoc#_concepts_ci-as-a-service[CI as a service]
+xref:../ugfun/ugfun.adoc#_ugfun_core-concepts[Core Concepts]
....
-|xref:../../setting-up/concepts/concepts.adoc#_concepts_ci-as-a-service[CI as a service]
+|xref:../ugfun/ugfun.adoc#_ugfun_core-concepts[Core Concepts]
|Cross-reference to section within different asciidoc document
|===
http://git-wip-us.apache.org/repos/asf/isis/blob/4912a4d9/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
index 1be5bc2..fb7bff8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
@@ -159,9 +159,9 @@ a hyperlink to a bookmark within the reference guide for annotations, where:
for example:
-`\xref:../rgant/rgant.adoc#_rgant-aaa_main[Core annotations]`
+`\xref:../rgant/rgant.adoc#_rgant_aaa_main[Core annotations]`
-|xref:../rgant/rgant.adoc#_rgant-aaa_main[Core annotations]
+|xref:../rgant/rgant.adoc#_rgant_aaa_main[Core annotations]
@@ -207,9 +207,9 @@ a hyperlink to a bookmark within the reference guide for domain services, where:
for example:
-`\xref:../rgsvc/rgsvc.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest` bootstrapping]`
+`\xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest` bootstrapping]`
-|xref:../rgsvc/rgsvc.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest` bootstrapping]
+|xref:../rgcms/rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest` bootstrapping]
@@ -269,9 +269,9 @@ a hyperlink to the "man page" for an (API) domain service within the reference g
for example:
-`\xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]`
+`\xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`]`
-|xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]
+|xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`]
@@ -284,9 +284,9 @@ a hyperlink to the "man page" for an (SPI) domain service within the reference g
for example:
-`\xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]`
+`\xref:../rgsvc/rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`]`
-|xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`]
+|xref:../rgsvc/rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingServicef[`ContentMappingService`]
http://git-wip-us.apache.org/repos/asf/isis/blob/4912a4d9/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_writing-the-docs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_writing-the-docs.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_writing-the-docs.adoc
index 311144c..7f8060a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_writing-the-docs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_writing-the-docs.adoc
@@ -11,4 +11,4 @@
We highly recommend that you install the (IntelliJ) live templates for Asciidoctor, as described in xref:../dg/dg.adoc#__dg_ide_intellij_live-templates[IDE templates]. These provide a large number of helper templates.
-An xref:../dg/dg.adoc#_dg_appendix_asciidoc-templates[appendix] lists all the templates available, demonstrating their intended usage and output.
+An xref:../dg/dg.adoc#_dg_asciidoc-templates[appendix] lists all the templates available, demonstrating their intended usage and output.
http://git-wip-us.apache.org/repos/asf/isis/blob/4912a4d9/adocs/documentation/src/main/asciidoc/guides/dg/_dg_git-cookbook.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_git-cookbook.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_git-cookbook.adoc
index b2d7249..74476c5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_git-cookbook.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_git-cookbook.adoc
@@ -12,7 +12,7 @@ This appendix describes the commands often used while working with git. In addi
* xref:../dg/dg.adoc#_dg_building-isis[building Apache Isis]
* xref:../dg/dg.adoc#_dg_contributing[Contributing]
-* xref:../dg/dg.adoc#_cgcom_policies_git-policy[Git policy]
+* xref:../cgcom/cgcom.adoc#_cgcom_policies_git-policy[Git policy]
http://git-wip-us.apache.org/repos/asf/isis/blob/4912a4d9/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
index aecc99a..e494a6f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
@@ -183,7 +183,7 @@ On the *Annotation Processors* page, enable and adjust for the 'default' setting
image::{_imagesdir}intellij-idea/040-other-settings-compiler/020-annotation-processor.png[width="700px",link="{_imagesdir}intellij-idea/040-other-settings-compiler/020-annotation-processor.png"]
This setting enables the generation of the `Q*` classes for DataNucleus type-safe queries, as well as being required
-for frameworks such as xref:../cgcom/cgcom.adoc#_cgcom_ide_project-lombok[Project Lombok].
+for frameworks such as xref:../dg/dg.adoc#_dg_project-lombok[Project Lombok].
[NOTE]
====
@@ -485,7 +485,7 @@ If you hit an error of "duplicate classes":
image::{_imagesdir}intellij-idea/060-troubleshooting/010-duplicate-classes.png[width="600px",link="{_imagesdir}intellij-idea/060-troubleshooting/010-duplicate-classes.png"]
-then make sure you have correctly configured the xref:../dg/dg.adoc#_dg_ide_intellij_other-settings-compiler[annotation processor]
+then make sure you have correctly configured the xref:../dg/dg.adoc#__dg_ide_intellij_other-settings-compiler[annotation processor]
settings. Pay attention in particular to the "Production sources directory" and "Test sources directory", that these
are set up correctly.
http://git-wip-us.apache.org/repos/asf/isis/blob/4912a4d9/adocs/documentation/src/main/asciidoc/guides/dg/_dg_project-lombok.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_project-lombok.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_project-lombok.adoc
index d8e86fe..9ad6d85 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_project-lombok.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_project-lombok.adoc
@@ -31,7 +31,7 @@ private String name;
----
Under the covers it is implemented as an annotation processor; it basically hooks into the Java compiler
-so that it can emit additional bytecode (eg for the getter and setter). See xref:../dg/dg.adoc#_dg_ide_intellij_other-settings-compiler[here] for details of setting up in IntelliJ (Eclipse has very similar support).
+so that it can emit additional bytecode (eg for the getter and setter). See xref:../dg/dg.adoc#__dg_ide_intellij_other-settings-compiler[here] for details of setting up in IntelliJ (Eclipse has very similar support).
Apache Isis supports link:https://projectlombok.org/[Project Lombok], in that the annotations that would normally be placed on the getter (namely xref:../rgant/rgant.adoc#_rgant-Property[`Property`], xref:../rgant/rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:../rgant/rgant.adoc#_rgant-Collection[`@Collection`], xref:../rgant/rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`] and xref:../rgant/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`]) can be placed on the field instead.