Merge branch '4.3'

contao · Jul 20, 2017 · 7fe092f · 7fe092f
2 parents 68e1209 + d324d8a
commit 7fe092f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 29 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+8.0
diff --git a/.travis.yml b/.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

diff --git a/Makefile b/Makefile
@@ -12,7 +12,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 ""
 
@@ -65,12 +64,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"
-	@python_modules/bin/python2.7 python_modules/bin/html5validator --root manager/_book/           --ignore "gitbook/plugins" "element must have an" "A document must not include both" "Duplicate ID"
-
 deploy: build build-pdf
diff --git a/manual/book.json b/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" },

diff --git a/manual/de/01-installation/contao-installieren.md b/manual/de/01-installation/contao-installieren.md
@@ -28,7 +28,7 @@ curl -L http://download.contao.org/3.5.2 | tar -xzp
 
 ### Installation mit Composer
 
-Mit Composer kann Contao über die [contao/standard-edition][3] installiert
+Mit Composer kann Contao über die [contao/managed-edition][3] installiert
 werden.
 
 Als Erstes muss [Composer verfügbar sein][4], welcher mit folgendem Befehl
@@ -44,7 +44,7 @@ Unter Windows erfolgt die Installation mittels dem [Installer][5].
 Nun kann die Installation von Contao mit folgendem Befehl gestartet werden:
 
 ```bash
-composer create-project contao/standard-edition <ziel>
+composer create-project --no-dev contao/managed-edition <ziel>
 ```
 
 Geben Sie als `<ziel>` den Ordner ein, in welchen die Contao-Dateien
@@ -54,7 +54,7 @@ automatisch angelegt.
 > #### info:: Hinweis
 > Der oben erwähnte Befehl installiert immer die neuste stabile Version.
 > Um eine andere Version zu installieren, kann diese im Befehl wie folgt eingegeben
-> werden: `composer create-project contao/standard-edition:4.1.3 <ziel>`
+> werden: `composer create-project contao/managed-edition:4.3.10 <ziel>`
 
 <!-- Quote break -->
 
@@ -156,8 +156,8 @@ Backend-Anmeldung weiter.
 
 [1]: https://contao.org/de/download.html
 [2]: http://www.winscp.net
-[3]: https://github.com/contao/standard-edition
+[3]: https://github.com/contao/managed-edition
 [4]: https://getcomposer.org/download/
 [5]: https://getcomposer.org/doc/00-intro.md#using-the-installer
 [6]: http://symfony.com/doc/current/reference/configuration/framework.html#secret
-[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html
+[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html
diff --git a/manual/en/01-installation/installing-contao.md b/manual/en/01-installation/installing-contao.md
@@ -28,7 +28,7 @@ curl -L http://download.contao.org/3.5.2 | tar -xzp
 
 ### Installing with Composer
 
-You can also install Contao with Composer using the [contao/standard-edition][3]
+You can also install Contao with Composer using the [contao/managed-edition][3]
 repository.
 
 First of all, you must [install Composer][4]. It can be installed globally with
@@ -44,7 +44,7 @@ On Windows, you can download and run the [installer][5].
 Now, you can run the installation process of Contao with the following command:
 
 ```bash
-composer create-project contao/standard-edition <target>
+composer create-project contao/managed-edition <target>
 ```
 
 You have to replace the `<target>` parameter with a path to a folder where the
@@ -54,7 +54,7 @@ created automatically.
 > #### info:: Note
 > The command above always installs the latest stable version. If you
 > want to install a specific version, you must insert it in the command as for
-> example: `composer create-project contao/standard-edition:4.1.3 <target>`
+> example: `composer create-project contao/managed-edition:4.3.10 <target>`
 
 <!-- Quote break -->
 
@@ -153,8 +153,8 @@ administration area.
 
 [1]: https://contao.org/en/download.html
 [2]: http://www.winscp.net/
-[3]: https://github.com/contao/standard-edition
+[3]: https://github.com/contao/managed-edition
 [4]: https://getcomposer.org/download/
 [5]: https://getcomposer.org/doc/00-intro.md#using-the-installer
 [6]: http://symfony.com/doc/current/reference/configuration/framework.html#secret
-[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html
+[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html
diff --git a/manual/fr/01-installation/installer-contao.md b/manual/fr/01-installation/installer-contao.md
@@ -30,7 +30,7 @@ curl -L http://download.contao.org/3.5.2 | tar -xzp
 ### Installation avec Composer
 
 Vous pouvez également installer Contao avec Composer en utilisant le référentiel
-[contao/standard-edition][3].
+[contao/managed-edition][3].
 
 En premier lieu, vous devez [installer Composer][4]. Il peut être installé
 globalement avec les deux commandes suivantes sur macOS ou Linux:
@@ -47,7 +47,7 @@ Maintenant, vous pouvez exécuter le processus d'installation de Contao avec la
 commande suivante :
 
 ```bash
-composer create-project contao/standard-edition <target>
+composer create-project contao/managed-edition <target>
 ```
 
 Vous devez remplacer le paramètre `<target>` avec un chemin d'accès vers un
@@ -58,7 +58,7 @@ pas, il sera créé automatiquement.
 > La commande ci-dessus installe toujours la dernière version stable.
 > Si vous souhaitez installer une version spécifique, vous devez l'insérer dans
 > la commande comme par exemple :
-> `composer create-project contao/standard-edition:4.1.3 <target>`
+> `composer create-project contao/managed-edition:4.3.10 <target>`
 
 <!-- Quote break -->
 
@@ -161,8 +161,8 @@ droit vous amènera vers le panneau d'administration.
 
 [1]: https://contao.org/en/download.html
 [2]: http://www.winscp.net/
-[3]: https://github.com/contao/standard-edition
+[3]: https://github.com/contao/managed-edition
 [4]: https://getcomposer.org/download/
 [5]: https://getcomposer.org/doc/00-intro.md#using-the-installer
 [6]: http://symfony.com/doc/current/reference/configuration/framework.html#secret
-[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html
+[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html