aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-03-08 11:40:37 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-03-10 12:43:03 +0100
commit83be3dc0972fb04371df247c21a6f73f42f9f73d (patch)
tree3af2b12a3d97ca2038e09d3a4d6c8e8511a82020
parente7931dbdf8c045ddc7d1085de0fe084ae001170d (diff)
downloadwallabag-83be3dc0972fb04371df247c21a6f73f42f9f73d.tar.gz
wallabag-83be3dc0972fb04371df247c21a6f73f42f9f73d.tar.zst
wallabag-83be3dc0972fb04371df247c21a6f73f42f9f73d.zip
Prepare files for 2.0.0-beta.2
-rw-r--r--README.md8
-rw-r--r--app/config/config.yml2
-rw-r--r--docs/en/user/installation.rst6
3 files changed, 12 insertions, 4 deletions
diff --git a/README.md b/README.md
index b7940b36..4e633856 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,14 @@ 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/) and git.
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 18git clone git@github.com:wallabag/wallabag.git
19cd wallabag
20git checkout 2.0.0-beta.2
21SYMFONY_ENV=prod composer install --no-dev
18php bin/console wallabag:install --env=prod 22php bin/console wallabag:install --env=prod
19php bin/console server:run --env=prod 23php bin/console server:run --env=prod
20``` 24```
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..fe55b804 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -48,8 +48,12 @@ 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 git@github.com:wallabag/wallabag.git
52 cd wallabag
53 git checkout 2.0.0-beta.2
54 SYMFONY_ENV=prod composer install --no-dev
52 php bin/console wallabag:install --env=prod 55 php bin/console wallabag:install --env=prod
56 php bin/console server:run --env=prod
53 57
54To start php's build-in server and test if everything did install correctly, you can do: 58To start php's build-in server and test if everything did install correctly, you can do:
55 59