Merge branch 'v1.4.x'

* v1.4.x:
  Add documentation to Travis builds.

Author: pelson

.travis.yml

@@ -4,6 +4,7 @@ env:
     - ARTIFACTS_S3_BUCKET=matplotlib-test-results
     - secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
     - secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
+    - BUILD_DOCS=false
     - TEST_ARGS=--no-pep8
 
 language: python
@@ -16,23 +17,30 @@ matrix:
     - python: 3.4
     - python: 2.7
       env: TEST_ARGS=--pep8
+    - python: 2.7
+      env: BUILD_DOCS=true
 
 install:
   - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
   - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools
+  - if [[ $BUILD_DOCS == true ]]; then pip install sphinx numpydoc linkchecker; fi
   - python setup.py install
 
 script:
-  - mkdir ../tmp_test_dir
-  - cd ../tmp_test_dir
   # The number of processes is hardcoded, because using too many causes the
   # Travis VM to run out of memory (since so many copies of inkscape and
   # ghostscript are running at the same time).
   - echo Testing using 8 processes
   # Generate the font caches in a single process before starting the
   # multiple processes
   - python -c "from matplotlib import font_manager"
-  - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS
+  - if [[ $BUILD_DOCS == false ]]; then mkdir ../tmp_test_dir; fi
+  - if [[ $BUILD_DOCS == false ]]; then cd ../tmp_test_dir; fi
+  - if [[ $BUILD_DOCS == false ]]; then python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS; fi
+  - if [[ $BUILD_DOCS == true ]]; then cd doc; python make.py html --small; fi
+  # We don't build the LaTeX docs here, so linkchecker will complain
+  - if [[ $BUILD_DOCS == true ]]; then touch build/html/Matplotlib.pdf; fi
+  - if [[ $BUILD_DOCS == true ]]; then linkchecker build/html/index.html; fi
 
 after_failure:
   - tar cjf result_images.tar.bz2 result_images