Merge branch 'release/2019-01-25-2'

Jenkinsfile

@@ -60,9 +60,9 @@ node {
       cd ../../..
 
       echo "-- Building DH-crud PDF"
-      cd submodules/tg-crud/services/dhcrud-webapp-public/docs
+      cd submodules/tg-crud/service/dhcrud-webapp-public/docs/
       make clean latexpdf;
-      cp -f _build/latex/dhcrud_doc.pdf ../../../../../_build/html/submodules/tg-crud/services/dhcrud-webapp-public/docs
+      cp -f _build/latex/dhcrud_doc.pdf ../../../../../_build/html/submodules/tg-crud/service/dhcrud-webapp-public/docs
       cd ../../../../..
 
       echo "-- Creating Documentation DEB package"

README.md

-TextGrid Repository
-===================
+DARIAH-DE Repository Documentation
+==================================
 
-Documentation for tgrep in /docs:
+Documentation for dhrep is included in /docs:
 
 Please do initially a:
 
@@ -11,4 +11,11 @@ and then each time to update modules:
 
     $git submodule update --force --remote
 
-If committed as version="XXXX-SNAPSHOT" (docs/cony.py), a SNAPSHOT build is build (and deployed to dev.textgridlab.org), if committed as version="XXXX", a RELEASE build is build (and deployed to textgridlab.org)!
+
+All submodules have got an documentation folder, mostly the docs/ folder, or dhrep_docs/, or tgrep_docs/, from time to time they are contained in subfolders (please see Jenkinsfile).
+
+We are using gitflow for developing and releasing, please see <https://wiki.de.dariah.eu/display/DARIAH3/DARIAH-DE+Release+Management>
+
+SNAPSHOT versions are set in conf.py to '2019-SNAPSHOT' and '2019-01-25-SNAPSHOT', release versions are set to '2019' and '2019-01-25' (see documentation in conf.py).
+
+At the moment submodules are used from branch develop! So we have not to release all services (and documentation) before releasing the documentation!

docs/conf.py

@@ -63,7 +63,8 @@ version = '2019'
 
 # The full version, including alpha/beta/rc tags.
 # Please put here the release date as release version!
-release = '2019-0-25'
+#release = '2019-01-25-SNAPSHOT'
+release = '2019-01-25'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -224,7 +225,7 @@ latex_documents = [
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-latex_logo = '_static/dariah_logo.svg'
+latex_logo = '_static/dariah_logo.pdf'
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.