Merge branch 'master' of github.com:bioidiap/bob.bio.base

.travis.yml

@@ -14,7 +14,7 @@ before_install:
 - sudo add-apt-repository -y ppa:biometrics/bob
 - sudo apt-get update -qq
 - sudo apt-get install -qq --force-yes libjpeg8-dev libnetpbm10-dev libpng12-dev libtiff4-dev libgif-dev libboost-all-dev libblitz1-dev libhdf5-serial-dev libvl-dev dvipng texlive-latex-base texlive-latex-extra texlive-math-extra texlive-latex-recommended texlive-fonts-recommended libatlas-dev libatlas-base-dev liblapack-dev gfortran
-- pip install --upgrade --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy scipy matplotlib coverage
+- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy scipy matplotlib coverage
 - pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls
 install:
 - python bootstrap-buildout.py

doc/installation.rst

@@ -55,7 +55,7 @@ By default, this file is located in ``~/.bob_bio_databases.txt``, and it contain
 
 .. code-block:: text
 
-   [YOUR_ATNT_DATABASE_DIRECTORY] = /path/to/your/directory
+   [YOUR_ATNT_DIRECTORY] = /path/to/your/directory
 
 .. note::
    If this file does not exist, feel free to create and populate it yourself.