Merge "Corrected README and error message"

diff --git a/docs/conf.py b/docs/conf.py
index 9bde80f..07032ac 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,4 @@
-from docs_conf import *
+from docs_conf.conf import *
 
 linkcheck_ignore = [
     'http://localhost.*',

diff --git a/tox.ini b/tox.ini
index 26cfed7..80839a2 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -13,6 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
+
 [tox]
 envlist = docs,docs-linkcheck
 minversion = 2.0