From 247508026c201eb2c26176ddc81020ab878a209b Mon Sep 17 00:00:00 2001 From: Kirsten Roschanski Date: Thu, 23 Feb 2017 11:14:31 +0100 Subject: [PATCH 1/5] Update contao-installieren.md Add install for manager edition --- manual/de/01-installation/contao-installieren.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manual/de/01-installation/contao-installieren.md b/manual/de/01-installation/contao-installieren.md index 534927a18..b4426eb11 100644 --- a/manual/de/01-installation/contao-installieren.md +++ b/manual/de/01-installation/contao-installieren.md @@ -43,6 +43,10 @@ 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 +``` +Die [Manager Edition][8] kann mit folgendem Befehl gestartet werden: ```bash composer create-project contao/standard-edition ``` @@ -160,4 +164,5 @@ Backend-Anmeldung weiter. [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 \ No newline at end of file +[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html +[8]: https://contao.org/de/news/release-der-contao-managed-edition.html From 77643e44b20799780c91ea60fb8a6acdd2310637 Mon Sep 17 00:00:00 2001 From: Kirsten Roschanski Date: Tue, 18 Apr 2017 17:30:01 +0200 Subject: [PATCH 2/5] Update contao-installieren.md --- manual/de/01-installation/contao-installieren.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manual/de/01-installation/contao-installieren.md b/manual/de/01-installation/contao-installieren.md index b4426eb11..f969dfb28 100644 --- a/manual/de/01-installation/contao-installieren.md +++ b/manual/de/01-installation/contao-installieren.md @@ -46,9 +46,9 @@ Nun kann die Installation von Contao mit folgendem Befehl gestartet werden: ```bash composer create-project contao/standard-edition ``` -Die [Manager Edition][8] kann mit folgendem Befehl gestartet werden: +Die [Managed Edition][8] kann mit folgendem Befehl gestartet werden: ```bash -composer create-project contao/standard-edition +composer create-project --no-dev contao/managed-edition ``` Geben Sie als `` den Ordner ein, in welchen die Contao-Dateien From 7d5d63812c021c479418ff5390a4e477ffef0b62 Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Wed, 19 Jul 2017 11:39:32 +0200 Subject: [PATCH 3/5] The contao/standard-edition is kind of obsolete --- manual/de/01-installation/contao-installieren.md | 11 +++-------- manual/en/01-installation/installing-contao.md | 10 +++++----- manual/fr/01-installation/installer-contao.md | 10 +++++----- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/manual/de/01-installation/contao-installieren.md b/manual/de/01-installation/contao-installieren.md index f969dfb28..f5362125a 100644 --- 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 @@ -43,10 +43,6 @@ 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 -``` -Die [Managed Edition][8] kann mit folgendem Befehl gestartet werden: ```bash composer create-project --no-dev contao/managed-edition ``` @@ -58,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 ` +> werden: `composer create-project contao/managed-edition:4.3.10 ` @@ -160,9 +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 -[8]: https://contao.org/de/news/release-der-contao-managed-edition.html diff --git a/manual/en/01-installation/installing-contao.md b/manual/en/01-installation/installing-contao.md index b772661e5..5f380f869 100644 --- 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 +composer create-project contao/managed-edition ``` You have to replace the `` 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 ` +> example: `composer create-project contao/managed-edition:4.3.10 ` @@ -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 \ No newline at end of file +[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 index b5c29d8a3..f510a5fa4 100644 --- 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 +composer create-project contao/managed-edition ``` Vous devez remplacer le paramètre `` 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 ` +> `composer create-project contao/managed-edition:4.3.10 ` @@ -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 \ No newline at end of file +[7]: https://docs.contao.org/books/cookbook/en/folder-structure.html From d0fce5db9c6eca5af8fa454e796ee1e7d35691ce Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Wed, 19 Jul 2017 15:50:31 +0200 Subject: [PATCH 4/5] Use different version plugin to select version based on current URL --- manual/book.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manual/book.json b/manual/book.json index ef0dbfb7f..780ec920c 100644 --- a/manual/book.json +++ b/manual/book.json @@ -9,7 +9,7 @@ "piwik", "toggle-chapters", "image-captions", - "versions", + "versions-select", "canonical-link" ], "links": { @@ -39,7 +39,7 @@ "gitbookConfigURL": "https://raw.githubusercontent.com/contao/docs/master/manual/book.json", "options": [ { "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", "selected": true }, + { "value": "https://docs.contao.org/books/manual/3.5", "text": "Contao 3.5" }, { "value": "https://docs.contao.org/books/manual/3.4", "text": "Contao 3.4" }, { "value": "https://docs.contao.org/books/manual/3.3", "text": "Contao 3.3" }, { "value": "https://docs.contao.org/books/manual/3.2", "text": "Contao 3.2" }, From 0f21e66d4ebf049d1a70b49490375c4092e349be Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Wed, 19 Jul 2017 16:10:03 +0200 Subject: [PATCH 5/5] Removed the option to validate PDFs and fixed node version issues --- .nvmrc | 1 + .travis.yml | 4 +--- Makefile | 7 +------ 3 files changed, 3 insertions(+), 9 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..cc40bca69 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +8.0 diff --git a/.travis.yml b/.travis.yml index 5eaf9dec2..5320f8d94 100644 --- 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 index 13f04dd0c..16e02d288 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,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 "" @@ -33,8 +32,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" - -deploy: validate build-pdf +deploy: build build-pdf