Merge remote-tracking branch 'origin/master' into webdav-recursive-dirs

gitlab/functions.sh

@@ -425,9 +425,9 @@ export_env BOB_PREFIX_PATH
 
 # Setup default documentation server
 if [ -z "${CI_COMMIT_TAG}" ]; then
- DEFSRV="${DOCSERVER}/software/bob/docs/bob/%s/master/"
+  DEFSRV="${DOCSERVER}/software/bob/docs/bob/%s/master/"
 else
-  DEFSRV="http://pythonhosted.org/%s/"
+  DEFSRV="${DOCSERVER}/software/bob/docs/bob/%s/stable/|http://pythonhosted.org/%s/"
 fi
 if [ -z "${BOB_DOCUMENTATION_SERVER}" ]; then
   BOB_DOCUMENTATION_SERVER="${DEFSRV}"

templates/readme-template.rst

@@ -2,9 +2,9 @@
 .. <DATE>
 
 .. image:: http://img.shields.io/badge/docs-stable-yellow.svg
-   :target: http://pythonhosted.org/<PACKAGE>/index.html
+   :target: https://www.idiap.ch/software/bob/docs/bob/<PACKAGE>/stable/index.html
 .. image:: http://img.shields.io/badge/docs-latest-orange.svg
-   :target: https://www.idiap.ch/software/bob/docs/latest/bob/<PACKAGE>/master/index.html
+   :target: https://www.idiap.ch/software/bob/docs/bob/<PACKAGE>/master/index.html
 .. image:: https://gitlab.idiap.ch/bob/<PACKAGE>/badges/master/build.svg
    :target: https://gitlab.idiap.ch/bob/<PACKAGE>/commits/master
 .. image:: https://gitlab.idiap.ch/bob/<PACKAGE>/badges/master/coverage.svg
@@ -13,8 +13,6 @@
    :target: https://gitlab.idiap.ch/bob/<PACKAGE>
 .. image:: http://img.shields.io/pypi/v/<PACKAGE>.svg
    :target: https://pypi.python.org/pypi/<PACKAGE>
-.. image:: http://img.shields.io/pypi/dm/<PACKAGE>.svg
-   :target: https://pypi.python.org/pypi/<PACKAGE>
 
 
 =========