Merge from trunk.

hand-merge README that moved to *.md.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/sparserips-glisse@3201 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: f1922a265c79937e507bbb963875d21fae88069e

3 files changed, 9 insertions, 5 deletions

diff --git a/src/cython/doc/_templates/layout.html b/src/cython/doc/_templates/layout.html
index 243f33c6..8e4eba40 100644
--- a/src/cython/doc/_templates/layout.html
+++ b/src/cython/doc/_templates/layout.html
@@ -198,6 +198,8 @@
                     <ul class="dropdown">
                         <li><a href="http://gudhi.gforge.inria.fr/licensing/">Licensing</a></li>
                         <li><a href="https://gforge.inria.fr/frs/?group_id=3865" target="_blank">Get the sources</a></li>
+                        <li><a href="https://gforge.inria.fr/frs/download.php/file/37113/GUDHI_2.0.0_OSX_UTILS.beta.tar.gz" target="_blank">Utils for Mac OSx</a></li>
+                        <li><a href="https://gforge.inria.fr/frs/download.php/file/37112/GUDHI_2.0.0_WIN64_UTILS.beta.zip" target="_blank">Utils for Win x64</a></li>
                     </ul>
                 </li>
                 <li class="divider"></li>
@@ -208,6 +210,8 @@
                         <li><a href="http://gudhi.gforge.inria.fr/doc/latest/installation.html">C++ installation manual</a></li>
                         <li><a href="http://gudhi.gforge.inria.fr/python/latest/">Python documentation</a></li>
                         <li><a href="http://gudhi.gforge.inria.fr/python/latest/installation.html">Python installation manual</a></li>
+                        <li><a href="http://gudhi.gforge.inria.fr/utils/">Utilities</a></li>
+                        <li><a href="http://bertrand.michel.perso.math.cnrs.fr/Enseignements/TDA-Gudhi-Python.html" target="_blank">Tutorial</a></li>
                     </ul>
                 </li>
                 <li class="divider"></li>
@@ -255,7 +259,7 @@
       {%- if hasdoc('copyright') %}
         {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
       {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+        {% trans copyright=copyright|e %} {{ copyright }}.{% endtrans %}
       {%- endif %}
     {%- endif %}
     {%- if last_updated %}
diff --git a/src/cython/doc/conf.py b/src/cython/doc/conf.py
index 19a880d4..a13c9751 100755
--- a/src/cython/doc/conf.py
+++ b/src/cython/doc/conf.py
@@ -62,7 +62,7 @@ import gudhi
 
 # General information about the project.
 project = gudhi.__name__
-copyright = gudhi.__copyright__
+copyright = gudhi.__copyright__ + ' - ' + gudhi.__license__
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -158,7 +158,7 @@ html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
diff --git a/src/cython/setup.py.in b/src/cython/setup.py.in
index fefa36bb..c767e93d 100644
--- a/src/cython/setup.py.in
+++ b/src/cython/setup.py.in
@@ -23,7 +23,7 @@ from Cython.Build import cythonize
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-__author__ = "Vincent Rouvreau"
+__author__ = "GUDHI Editorial Board"
 __copyright__ = "Copyright (C) 2016  INRIA"
 __license__ = "GPL v3"
 
@@ -41,7 +41,7 @@ gudhi = Extension(
 
 setup(
     name = 'gudhi',
-    author='Vincent Rouvreau',
+    author='GUDHI Editorial Board',
     author_email='gudhi-contact@lists.gforge.inria.fr',
     version='@GUDHI_VERSION@',
     url='http://gudhi.gforge.inria.fr/',