Merge branch '3.5' into 4.3

Author: aschempp

.nvmrc

@@ -0,0 +1 @@
+8.0

.travis.yml

@@ -11,9 +11,7 @@ env:
 sudo: required
 
 before_install:
-  - sudo apt-get update
-  - sudo apt-get install oracle-java8-installer
-  - sudo update-java-alternatives -s java-8-oracle
+  - nvm install 8.0
 
 install:
   - sudo apt-get update

Makefile

@@ -11,7 +11,6 @@ help:
 	@echo "Other commands:"
 	@echo "	make build			Builds HTML version of all books"
 	@echo "	make build-pdf			Builds PDFs for the user manual"
-	@echo "	make validate			Builds books and validates for invalid HTML output"
 	@echo "	make install			Installs latest GitBook and dependencies"
 	@echo ""
 
@@ -57,11 +56,4 @@ install-python:
 	@echo "--> You must have Python virtualenv"
 	@virtualenv python_modules
 
-validate: build install-python
-	@python_modules/bin/pip install html5validator
-	@python_modules/bin/python2.7 python_modules/bin/html5validator --root manual/_book/            --ignore "gitbook/plugins" "element must have an" "A document must not include both" "Duplicate ID"
-	@python_modules/bin/python2.7 python_modules/bin/html5validator --root cookbook/_book/          --ignore "gitbook/plugins" "element must have an" "A document must not include both" "Duplicate ID"
-	@python_modules/bin/python2.7 python_modules/bin/html5validator --root api/_book/               --ignore "gitbook/plugins" "element must have an" "A document must not include both" "Duplicate ID"
-	@python_modules/bin/python2.7 python_modules/bin/html5validator --root extending-contao4/_book/ --ignore "gitbook/plugins" "element must have an" "A document must not include both" "Duplicate ID"
-
-deploy: validate build-pdf
+deploy: build build-pdf

manual/book.json

@@ -9,7 +9,7 @@
         "piwik",
         "toggle-chapters",
         "image-captions",
-        "versions",
+        "versions-select",
         "canonical-link"
     ],
     "links": {
@@ -38,7 +38,7 @@
         "versions": {
             "gitbookConfigURL": "https://raw.githubusercontent.com/contao/docs/master/manual/book.json",
             "options": [
-                { "value": "https://docs.contao.org/books/manual/4.3", "text": "Contao 4.3", "selected": true },
+                { "value": "https://docs.contao.org/books/manual/4.3", "text": "Contao 4.3" },
                 { "value": "https://docs.contao.org/books/manual/4.2", "text": "Contao 4.2" },
                 { "value": "https://docs.contao.org/books/manual/4.0", "text": "Contao 4.0" },
                 { "value": "https://docs.contao.org/books/manual/3.5", "text": "Contao 3.5" },