Changeset 574

Timestamp:

Feb 9, 2015, 7:21:38 PM (10 years ago)

Author:

djay

Message:

Add 2014 workshop material.

Location:

trunk/docs

Files:

• index.txt (modified) (3 diffs)
• workshop/2014 (added)
• workshop/2014/building_blocks_presentation.txt (added)
• workshop/2014/first_service.txt (added)
• workshop/2014/images (added)
• workshop/2014/images/BufferMaskAndRequest_Level_15.png (added)
• workshop/2014/images/BufferMaskAndRequest_Routing_Level_15.png (added)
• workshop/2014/images/BufferMask_Level_15.png (added)
• workshop/2014/images/BufferRequest_Level_15.png (added)
• workshop/2014/images/Buffer_Level_15.png (added)
• workshop/2014/images/Buffer_Routing_Level_15.png (added)
• workshop/2014/images/Difference_Level_15.png (added)
• workshop/2014/images/FOSS4G_Ad_200x100_2x.jpg (added)
• workshop/2014/images/GC.png (added)
• workshop/2014/images/GC_CL.png (added)
• workshop/2014/images/Intersection_Level_15.png (added)
• workshop/2014/images/Mask_Level_12.png (added)
• workshop/2014/images/Routing_Basic.png (added)
• workshop/2014/index.txt (added)
• workshop/2014/introduction.txt (added)
• workshop/2014/js_services_chaining.txt (added)
• workshop/2014/using_zoo_from_osgeolivevm.txt (added)

trunk/docs/index.txt

@@ -1 +1 @@
 .. _home:
 
-ZOO 1.4 Documentation
+ZOO 1.5 Documentation
 =====================
 
@@ -14 +14 @@
     :ref:`kernel`,:ref:`services`,:ref:`api`
     :ref:`kernel-installation`,:ref:`community`,`Search mailing list <http://zoo-discuss.1049523.n5.nabble.com/>`__
-    :ref:`documentation_development`,:ref:`workshop-foss4g-japan-2010`,:ref:`workshop-foss4g-cee-2012`
+    :ref:`documentation_development`,:ref:`workshop-foss4g-2014`,:ref:`workshop-foss4g-japan-2010`
 
 .. note::
@@ -66 +66 @@
    api/index
    client/index
+   workshop/2014/index
+   workshop/2013/index
+   workshop/2012/index
    workshop/2010/index
-   workshop/2012/index
-   workshop/2013/index
    community/index
    development/documentation