Merge branch 'patch-doc' into 'master'

Point to gitlab pages



See merge request !11

doc/links.rst

@@ -6,13 +6,10 @@
 
 .. _facereclib: http://pypi.python.org/pypi/facereclib
 .. _idiap: http://www.idiap.ch
-.. _github: http://www.github.com/idiap
 .. _bob: http://www.idiap.ch/software/bob
-.. _github bug reporting system: http://github.com/idiap/facereclib/issues
-.. _idiap at github: http://www.github.com/bioidiap
+.. _idiap at gitlab: http://gitlab.idiap.ch/bob
 .. _at&t database: http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html
-.. _bob's github page: http://idiap.github.com/bob
-.. _gridtk: http://github.com/idiap/gridtk
+.. _gridtk: https://gitlab.idiap.ch/bob/gridtk
 .. _buildout: http://www.buildout.org
 .. _nist: http://www.nist.gov/itl/iad/ig/focs.cfm
 .. _pypi: http://pypi.python.org

setup.py

@@ -51,7 +51,7 @@ setup(
     version=open("version.txt").read().rstrip(),
     description='Tools for running face recognition experiments',
 
-    url='https://www.gitlab.idiap.ch/bob/bob.bio.face',
+    url='https://gitlab.idiap.ch/bob/bob.bio.face',
     license='BSD',
     author='Manuel Gunther',
     author_email='siebenkopf@googlemail.com',
@@ -82,7 +82,7 @@ setup(
     #
     # Our database packages are good examples of namespace implementations
     # using several layers. You can check them out here:
-    # https://github.com/idiap/bob/wiki/Satellite-Packages
+    # https://gitlab.idiap.ch/bob/bob/wikis/Packages
 
 
     # This entry defines which scripts you will have inside the 'bin' directory