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/08/01 15:30:38 UTC

[5/7] isis git commit: ISIS-1521: fixes bad links

ISIS-1521: fixes bad links


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

Branch: refs/heads/master
Commit: 91b9cb829e9e1975599e70a808b8f2575ef3bc1f
Parents: 18557ba
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 1 16:21:15 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 1 16:21:15 2017 +0100

----------------------------------------------------------------------
 .../asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc    | 2 +-
 .../src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc         | 4 ++--
 .../src/main/asciidoc/pages/screencasts/screencasts-older.adoc   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/91b9cb82/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
index 6321b97..20255ad 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
@@ -427,7 +427,7 @@ For these artifacts you will need to search http://search.maven.org[Maven centra
 == Code formatting
 
 This is also a good time to make source code has been cleaned up and formatted according to the Apache Isis and ASF conventions.
-Use link:../dg/resources/eclipse/templates/Apache-code-style-formatting.xml[this] Eclipse template and link:../dg/resources/eclipse/isis.importorder[this] import order.
+Use link:../dg/resources/eclipse/Apache-code-style-formatting.xml[this] Eclipse template and link:../dg/resources/eclipse/isis.importorder[this] import order.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/91b9cb82/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 cdbaa7c..97da93f 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
@@ -237,9 +237,9 @@ link:http://ciserver:8080[CI Server^]
 |Link to an external hyperlink, with `target=blank`
 
 |....
-xref:_markup-docs_background.adoc#[background]
+xref:dg.adoc#__dg_asciidoc_links-and-xrefs#[background]
 ....
-|xref:_markup-docs_background.adoc#[background]
+|xref:dg.adoc#__dg_asciidoc_links-and-xrefs[background]
 |Cross-reference to section in same asciidoc document
 
 |....

http://git-wip-us.apache.org/repos/asf/isis/blob/91b9cb82/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc
index e86f139..7686a68 100644
--- a/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc
+++ b/adocs/documentation/src/main/asciidoc/pages/screencasts/screencasts-older.adoc
@@ -63,7 +63,7 @@ Learn more xref:../../guides/dg/dg.adoc#[here]
 
 _How to import an Apache Isis maven-based application into IntelliJ and run the app._ +
 
-Learn more link:./guides/dg/dg.html#_dg_ide_intellij[here]
+Learn more xref:../../guides/dg/dg.adoc#_dg_ide_intellij[here]
 
 |video::lwKsyTbTSnA[youtube,width="420px",height="315px"]