Merge e946f52 into ae4350c

astropy · Sep 6, 2016 · 13e41ec · 13e41ec
2 parents ae4350c + e946f52
commit 13e41ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,8 +45,10 @@ matrix:
 
         # Check for sphinx doc build warnings - we do this first because it
         # may run for a long time
+        - python: 2.7
+          env: SETUP_CMD='build_docs -w'
         - python: 3.5
-          env: SETUP_CMD='build_sphinx -w'
+          env: SETUP_CMD='build_docs -w'
 
         # Do a test without the optional dependencies
         - python: 3.5

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -63,7 +63,7 @@ Install the latest development version from https://github.com/astropy/regions :
     cd regions
     python setup.py install
     python setup.py test
-    python setup.py build_sphinx
+    python setup.py build_docs
 
 Optional dependencies
 =====================

diff --git a/setup.cfg b/setup.cfg
@@ -1,4 +1,4 @@
-[build_sphinx]
+[build_docs]
 source-dir = docs
 build-dir = docs/_build
 all_files = 1