aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-03-11 13:43:57 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-03-11 13:43:57 +0100
commit6aed6d69a5cc0cc143e485c5fefaaa91f4a23e07 (patch)
tree25b0187cf55ff8c0a8ed5f0c16ed70889659d353
parente7931dbdf8c045ddc7d1085de0fe084ae001170d (diff)
parentc118131317742a4b77031af89d19eba3b5eabd24 (diff)
downloadwallabag-6aed6d69a5cc0cc143e485c5fefaaa91f4a23e07.tar.gz
wallabag-6aed6d69a5cc0cc143e485c5fefaaa91f4a23e07.tar.zst
wallabag-6aed6d69a5cc0cc143e485c5fefaaa91f4a23e07.zip
Merge pull request #1763 from wallabag/v2-prepare-beta2
Prepare files for 2.0.0-beta.2
-rw-r--r--README.md12
-rw-r--r--app/config/config.yml2
-rw-r--r--docs/en/user/installation.rst5
-rw-r--r--docs/fr/user/installation.rst5
4 files changed, 17 insertions, 7 deletions
diff --git a/README.md b/README.md
index b7940b36..e175b6c3 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,16 @@ More informations on our website: [wallabag.org](https://wallabag.org)
11# Want to test the v2? 11# Want to test the v2?
12Keep in mind it's an **unstable** branch, everything can be broken :) 12Keep in mind it's an **unstable** branch, everything can be broken :)
13 13
14If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands: 14If you don't have it yet, please [install composer](https://getcomposer.org/download/).
15Then you can install wallabag by executing the following commands:
15 16
16``` 17```
17SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev 18 git clone https://github.com/wallabag/wallabag.git
18php bin/console wallabag:install --env=prod 19 cd wallabag
19php bin/console server:run --env=prod 20 git checkout 2.0.0-beta.2
21 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
22 php bin/console wallabag:install --env=prod
23 php bin/console server:run --env=prod
20``` 24```
21 25
22## License 26## License
diff --git a/app/config/config.yml b/app/config/config.yml
index 25ecabe7..f0885d9d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
28 assets: ~ 28 assets: ~
29 29
30wallabag_core: 30wallabag_core:
31 version: 2.0.0-beta.1 31 version: 2.0.0-beta.2
32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 32 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
33 languages: 33 languages:
34 en: 'English' 34 en: 'English'
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 385d6595..99dc0a76 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -48,7 +48,10 @@ To install wallabag itself, you must run these two commands:
48 48
49:: 49::
50 50
51 SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev 51 git clone https://github.com/wallabag/wallabag.git
52 cd wallabag
53 git checkout 2.0.0-beta.2
54 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
52 php bin/console wallabag:install --env=prod 55 php bin/console wallabag:install --env=prod
53 56
54To start php's build-in server and test if everything did install correctly, you can do: 57To 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 a2a5dabf..9f1d540c 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -46,7 +46,10 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
46 46
47:: 47::
48 48
49 SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev 49 git clone https://github.com/wallabag/wallabag.git
50 cd wallabag
51 git checkout 2.0.0-beta.2
52 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
50 php bin/console wallabag:install --env=prod 53 php bin/console wallabag:install --env=prod
51 54
52Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : 55Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :