You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2015/09/21 17:12:34 UTC

[1/2] zest-java git commit: tutorials: add links to next tutorials in the 2:42 serie

Repository: zest-java
Updated Branches:
  refs/heads/support/2.1 [created] 33337d86d


tutorials: add links to next tutorials in the 2:42 serie


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

Branch: refs/heads/support/2.1
Commit: f01feab8da78f70ab4c8c7e78c75c7238f45eda7
Parents: c81602d
Author: Paul Merlin <pa...@nosphere.org>
Authored: Mon Sep 21 16:48:24 2015 +0200
Committer: Paul Merlin <pa...@nosphere.org>
Committed: Mon Sep 21 16:48:24 2015 +0200

----------------------------------------------------------------------
 tutorials/introduction/tenminutes/src/docs/ten-minutes.txt       | 2 ++
 tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt | 2 ++
 tutorials/introduction/twominutes/src/docs/two-minutes.txt       | 2 ++
 3 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/f01feab8/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
index dc86b5f..6042916 100644
--- a/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
+++ b/tutorials/introduction/tenminutes/src/docs/ten-minutes.txt
@@ -107,3 +107,5 @@ So, build the report, send it via the MailService.
 
 In this short introduction, we have covered the essence of Zest™. We have looked at what is a Composite, seen some of the
 Fragments in action, and how simple it is to turn a Composite into a persisted Composite, known as an EntityComposite.
+
+Next step, <<thirty-minutes-intro>>.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/f01feab8/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
index 3913a9f..caf3d2b 100644
--- a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
+++ b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
@@ -162,3 +162,5 @@ We have now explored a couple more intricate features of Zest™, hopefully with
 to create applications from scratch, how to structure applications, and how the entire Zest™ Extension system works.
 We have looked at how to add a Concern that uses a private Mixin, we have touched a bit on Generic Concerns, and
 finally a short introduction to the Query API.
+
+Next step, <<two-hours-intro>>.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/f01feab8/tutorials/introduction/twominutes/src/docs/two-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/twominutes/src/docs/two-minutes.txt b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
index be502d2..bdc89de 100644
--- a/tutorials/introduction/twominutes/src/docs/two-minutes.txt
+++ b/tutorials/introduction/twominutes/src/docs/two-minutes.txt
@@ -72,3 +72,5 @@ tag=documentation
 . We create the Composite instance from the Module.
 
 *Done!*
+
+Next step, <<ten-minutes-intro>>.


[2/2] zest-java git commit: tutorials: remove empty 2hours-intro, 2h42m -> 42m

Posted by pa...@apache.org.
tutorials: remove empty 2hours-intro, 2h42m -> 42m


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/33337d86
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/33337d86
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/33337d86

Branch: refs/heads/support/2.1
Commit: 33337d86de3bc5fdcdd443e1dbf0fa27debd5b6e
Parents: f01feab
Author: Paul Merlin <pa...@nosphere.org>
Authored: Mon Sep 21 16:49:57 2015 +0200
Committer: Paul Merlin <pa...@nosphere.org>
Committed: Mon Sep 21 17:02:47 2015 +0200

----------------------------------------------------------------------
 manual/src/docs/website/tutorials.txt                   | 12 ++++++------
 manual/src/resources/js/progressive-enhancement.js      |  2 +-
 .../thirtyminutes/src/docs/thirty-minutes.txt           |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/33337d86/manual/src/docs/website/tutorials.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/tutorials.txt b/manual/src/docs/website/tutorials.txt
index 256d8e8..8c4e8ed 100644
--- a/manual/src/docs/website/tutorials.txt
+++ b/manual/src/docs/website/tutorials.txt
@@ -30,8 +30,8 @@ this tutorial, run it and play with it.
 
 In this section you will find a comprehensive set of tutorials about Composite Oriented Programming using Zest™.
 
-[[tutorials-intro,Zest™ in 2 hours 42 minutes]]
-=== Zest™ in 2 hours 42 minutes ===
+[[tutorials-intro,Zest™ in 42 minutes]]
+=== Zest™ in 42 minutes ===
 
 This quite long introduction to Zest™ will start by brushing up an overview of the problems Zest™ solve, teach you what
 Composite Oriented Programming is and guide you through the process of writing a complete Application around an adapted
@@ -40,7 +40,7 @@ Hello World example.
 - <<two-minutes-intro>>
 - <<ten-minutes-intro>>
 - <<thirty-minutes-intro>>
-- <<two-hours-intro>>
+// - <<two-hours-intro>>
 
 === Getting real with Zest™ ===
 
@@ -91,9 +91,9 @@ include::../../../../tutorials/introduction/thirtyminutes/src/docs/thirty-minute
 
 :leveloffset: 2
 
-include::../../../../tutorials/introduction/twohours/src/docs/two-hours.txt[]
-
-:leveloffset: 2
+// include::../../../../tutorials/introduction/twohours/src/docs/two-hours.txt[]
+//
+// :leveloffset: 2
 
 include::../tutorials/howto-depend-on-zest.txt[]
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/33337d86/manual/src/resources/js/progressive-enhancement.js
----------------------------------------------------------------------
diff --git a/manual/src/resources/js/progressive-enhancement.js b/manual/src/resources/js/progressive-enhancement.js
index bbf6f86..1f57de0 100644
--- a/manual/src/resources/js/progressive-enhancement.js
+++ b/manual/src/resources/js/progressive-enhancement.js
@@ -143,7 +143,7 @@ $( document ).ready( function($){
             case "Overview":
                 $dt.attr( "style", "margin-bottom: 24px" );
             // Tutorials
-            case "Zest\u2122 in 2 hours":
+            case "Zest\u2122 in 30 minutes":
             case "Leverage Properties":
             case "Use I/O API":
                 $dt.attr( "style", "margin-bottom: 24px" );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/33337d86/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
----------------------------------------------------------------------
diff --git a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
index caf3d2b..84743b1 100644
--- a/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
+++ b/tutorials/introduction/thirtyminutes/src/docs/thirty-minutes.txt
@@ -163,4 +163,4 @@ to create applications from scratch, how to structure applications, and how the
 We have looked at how to add a Concern that uses a private Mixin, we have touched a bit on Generic Concerns, and
 finally a short introduction to the Query API.
 
-Next step, <<two-hours-intro>>.
+You may now be interested by the <<howto-assemble-application>> and <<howto-depend-on-zest>> tutorials.