Finally back to composer create-project but with --keep-vcs option

diff --git a/README.md b/README.md
index 6572566fb8a32b41818aea9c2f14a7d8aaad88c9..c12a84e36530d958e514f2c78348cd5bde856683 100644 (file)
--- a/README.md
+++ b/README.md
@@ -11,14 +11,11 @@ More informations on our website: [wallabag.org](https://wallabag.org)
 # Want to test the v2?
 Keep in mind it's an **unstable** branch, everything can be broken :)
 
-If you don't have it yet, please [install composer](https://getcomposer.org/download/) and git.
+If you don't have it yet, please [install composer](https://getcomposer.org/download/).
 Then you can install wallabag by executing the following commands:
 
 ```
-git clone git@github.com:wallabag/wallabag.git
-cd wallabag
-git checkout 2.0.0-beta.2
-SYMFONY_ENV=prod composer install --no-dev -o
+SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs
 php bin/console wallabag:install --env=prod
 php bin/console server:run --env=prod
 ```

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index f7c79ccf1523c3da2202ec466d4b8cbfcacb4fbc..88647333133e45ee8c39c7f643bc182c2862121f 100644 (file)
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -48,12 +48,8 @@ To install wallabag itself, you must run these two commands:
 
 ::
 
-    git clone git@github.com:wallabag/wallabag.git
-    cd wallabag
-    git checkout 2.0.0-beta.2
-    SYMFONY_ENV=prod composer install --no-dev -o
+    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs
     php bin/console wallabag:install --env=prod
-    php bin/console server:run --env=prod
 
 To start php's build-in server and test if everything did install correctly, you can do:
 

diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 8e8e225b58c4dda11fbb22fe4982adaa753ca48c..1983ae25f5240f1a347530260fa8521e84ff2441 100644 (file)
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -46,12 +46,8 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
 
 ::
 
-    git clone git@github.com:wallabag/wallabag.git
-    cd wallabag
-    git checkout 2.0.0-beta.2
-    SYMFONY_ENV=prod composer install --no-dev -o
+    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs
     php bin/console wallabag:install --env=prod
-    php bin/console server:run --env=prod
 
 Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :