change of gitinclude symtax

bird-house · Oct 3, 2020 · 8be7b35 · 8be7b35
1 parent e16de04
commit 8be7b35
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/docs/source/tutorial_birds.rst b/docs/source/tutorial_birds.rst
@@ -29,7 +29,7 @@ WPS finch is providing services to calculate climate indices widely used in clim
   docs/source/notebooks/index.rst
 
 
-.. gitinclude:: https://github.com/bird-house/finch/blob/master/docs/source/notebooks/index.rst
+.. gitinclude:: https://github.com/bird-house/finch.git docs/source/notebooks/index.rst
 
 
 
@@ -43,4 +43,4 @@ WPS raven is providing hydrological models for e.g. hydro-power controlling and
    docs/source/notebooks/index.rst
 
 
-.. gitinclude:: https://github.com/Ouranosinc/raven/blob/master/docs/source/notebooks/index.rst
+.. gitinclude:: https://github.com/Ouranosinc/raven.git docs/source/notebooks/index.rst
diff --git a/docs/source/tutorial_pywps.rst b/docs/source/tutorial_pywps.rst
@@ -4,6 +4,10 @@
 Getting started with PYWPS
 ..........................
 
+* `PyWPS 4.0.0 Slides <http://www.slideshare.net/jachym/pywps400>`_
+* `PyWPS Documentation <https://pywps.readthedocs.io/en/master/process.html>`_
+
+
 .. gittoctree:: https://github.com/bird-house/birdhouse-workshop.git
 
   /docs/source/index.rst

diff --git a/docs/source/tutorial_wps.rst b/docs/source/tutorial_wps.rst
@@ -2,35 +2,8 @@
 
 
 WPS general usage
-<<<<<<< HEAD:docs/source/tutorial_wps.rst
-=======
 =================
 
-
-General concepts and tutorials for pyWPS:
-
-* `PyWPS 4.0.0 Slides <http://www.slideshare.net/jachym/pywps400>`_
-* `PyWPS Documentation <https://pywps.readthedocs.io/en/master/process.html>`_
-
-You can connect to a WPS service in the following ways:
-
-* using a command-line tool in your terminal.
-* using a web based application from your browser.
-* using a Python library from a jupyter notebook or your Python scripts.
-
-
-Get familliar with WPS (emu):
------------------------------
-
-.. todo:: include Emu tutorial
-
-
-Wordcounter Example
--------------------
->>>>>>> tutorials:docs/source/tutorial/wps.rst
-
-.. todo:: The WPS tutorial needs to be updated.
-
 In the following we show an example with a `Word Counter` function which is enabled as a web-service using WPS.
 
 .. contents::