Merge branch 'da/difftool' into maint

diff --git a/.travis.yml b/.travis.yml
index 1fdcec8437a8c78b3697b0e0ca55eb2a0778541e..adab5b89bba7b41a07a2a000dddbd4496ba7c7d3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,21 @@ env:
     # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
     - GIT_SKIP_TESTS="t9810 t9816"
 
+matrix:
+  include:
+    - env: Documentation
+      os: linux
+      compiler: clang
+      addons:
+        apt:
+          packages:
+          - asciidoc
+          - xmlto
+      before_install:
+      before_script:
+      script: ci/test-documentation.sh
+      after_failure:
+
 before_install:
   - >
     case "${TRAVIS_OS_NAME:-linux}" in