[qa] Added documentation check to CI build

Author: nemesifier

.travis.yml

@@ -20,6 +20,9 @@ before_install:
 install:
   - python setup.py -q develop
 
+before_script:
+  - sphinx-build -W -b html docs/source docs/_build
+
 script:
   - nosetests --with-coverage --cover-package=netjsonconfig
 

netjsonconfig/utils.py

@@ -45,7 +45,7 @@ def merge_list(list1, list2, identifiers=None):
     which contains elements of both lists.
 
     :param list1: ``list`` from template
-    :param list2: ``list from config
+    :param list2: ``list`` from config
     :param identifiers: ``list`` or ``None``
     :returns: merged ``list``
     """