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 2015/07/24 10:56:15 UTC

isis git commit: ISIS-1052: fixing bad links.

Repository: isis
Updated Branches:
  refs/heads/master 3b7ac1b85 -> fbe5aed69


ISIS-1052: fixing bad links.


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

Branch: refs/heads/master
Commit: fbe5aed69e711a13904e72d993da0dd8faed7302
Parents: 3b7ac1b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 24 09:55:33 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 24 09:55:33 2015 +0100

----------------------------------------------------------------------
 adocs/documentation/src/main/asciidoc/index.html    |  4 ++--
 .../src/main/asciidoc/isis-in-pictures.adoc         | 16 ++++++++--------
 .../documentation/src/main/asciidoc/powered-by.adoc |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/fbe5aed6/adocs/documentation/src/main/asciidoc/index.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/index.html b/adocs/documentation/src/main/asciidoc/index.html
index e72a7dc..e3b9f8a 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -583,7 +583,7 @@
                         <h2>Add-ons <small>(non ASF)</small></h2>
                         <p>Apache Isis has a large number of github-hosted add-on modules for security, auditing, command profiling, mail merge and other cross-cutting concerns.  It also has a number of UI extensions
                             for maps, calendars and so on.  All are open source and designed for out-of-the-box use or to fork as you require.</p>
-                        <p><a class="button small info radius" href="http://www.isisaddons.org" role="button">Inspect the add-ons »</a></p>
+                        <p><a class="button small info radius" href="http://www.isisaddons.org" role="button">Check out the add-ons »</a></p>
                     </div>
                 </div>
 
@@ -599,7 +599,7 @@
 
                         <div class="center">
                             <br/>
-                            <p>You can learn more about this particular application <a href="./intro/powered-by/powered-by.html">here</a>.
+                            <p>You can learn more about this particular application <a href="./powered-by.html">here</a>.
                                 The app is also open source, so you can check out its source code on <a href="http://github.com/estatio/estatio">github</a>.</p>
                         </div>
                         <br/>

http://git-wip-us.apache.org/repos/asf/isis/blob/fbe5aed6/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc b/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
index 75c957c..ae960ea 100644
--- a/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
+++ b/adocs/documentation/src/main/asciidoc/isis-in-pictures.adoc
@@ -15,12 +15,6 @@ The screenshots below are taken from the Isis Addons' http://github.com/isisaddo
 
 The todoapp also integrates with a number of other http://www.isisaddons.org[Isis Addons] modules.  Because we expect that most apps will end up using one or more of these addons, we've chosen to include screenshots of those too.
 
-[NOTE]
-====
-Please note that the Isis Addons are not part of ASF, but they _are_ all licensed under Apache License 2.0 and are maintained by the Apache Isis committers.
-====
-
-
 
 == Basics
 
@@ -119,8 +113,7 @@ The Apache Isis viewer is implemented using http://wicket.apache.org[Apache Wick
 image::{_imagesdir}/isis-in-pictures/070-pluggable-views.png[width="600px",link="{_imagesdir}/isis-in-pictures/070-pluggable-views.png"]
 
 
-
-The Isis Addons' https://github.com/isisaddons/isis-wicket-gmap3[gmap3 component] (non ASF) will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
+The (non-ASF) link:http://isisaddons.org[Isis Addons] library provides a number of such extensions.  For example, the https://github.com/isisaddons/isis-wicket-gmap3[gmap3 component] will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
 
 image::{_imagesdir}/isis-in-pictures/080-gmap3-view.png[width="600px",link="{_imagesdir}/isis-in-pictures/080-gmap3-view.png"]
 
@@ -149,6 +142,13 @@ image::{_imagesdir}/isis-in-pictures/110-docx.png[width="600px",link="{_imagesdi
 
 
 
+[NOTE]
+====
+Please note that the Isis Addons are not part of ASF, but they _are_ all licensed under Apache License 2.0 and are maintained by the Apache Isis committers.
+====
+
+
+
 
 == Security, Auditing and more...
 

http://git-wip-us.apache.org/repos/asf/isis/blob/fbe5aed6/adocs/documentation/src/main/asciidoc/powered-by.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/powered-by.adoc b/adocs/documentation/src/main/asciidoc/powered-by.adoc
index cc473f9..4bc0982 100644
--- a/adocs/documentation/src/main/asciidoc/powered-by.adoc
+++ b/adocs/documentation/src/main/asciidoc/powered-by.adoc
@@ -24,7 +24,7 @@ If you have written an app in Apache Isis that you'd like to share, please menti
 
 == Estatio
 
-Estatio is an open source estate management application, available on [github](https://github.com/estatio/estatio).
+Estatio is an open source estate management application, available on link:https://github.com/estatio/estatio[github].
 
 
 image::{_imagesdir}powered-by/estatio-1.png[width="900px",link="{_imagesdir}powered-by/estatio-1.png"]
@@ -33,7 +33,7 @@ image::{_imagesdir}powered-by/estatio-1.png[width="900px",link="{_imagesdir}powe
 
 Much of Apache Isis' recent development has been driven out by the requirements of this application, so you can see for yourself how many of the features in Isis are used in real life.
 
-Estatio is being deployed by [Eurocommercial Properties](http://www.eurocommercialproperties.com/), who sponsored the development of the framework in order to make Estatio a reality.  Our heart-felt thanks to them for their investment.  
+Estatio is being deployed by link:http://www.eurocommercialproperties.com/[Eurocommercial Properties], who sponsored the development of the framework in order to make Estatio a reality.  Our heart-felt thanks to them for their investment.