Merge commit 'b004fbf' into python3-support

.travis.yml

@@ -2,9 +2,12 @@ language: python
 env:
   - TOX_ENV=py26
   - TOX_ENV=py27
+<<<<<<< HEAD
   - TOX_ENV=py33
   - TOX_ENV=py34
   - TOX_ENV=docs
+=======
+>>>>>>> b004fbf
   - TOX_ENV=flake8
 install:
   - pip install tox

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.3
-envlist = py26,py27,py33,py34,docs,flake8
+envlist = py26,py27,py33,py34,flake8
 
 [testenv]
 deps=
@@ -20,14 +20,6 @@ whitelist_externals=bash
 
 [testenv:py34]
 
-
-[testenv:docs]
-downloadcache={toxworkdir}/downloadcache
-basepython=python2.7
-changedir=doc
-deps=sphinx
-commands=sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
-
 [testenv:flake8]
 basepython=python2.7
 deps=flake8