From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Tue, 1 Mar 2016 08:00:42 +0000 (+0100)
Subject: Merge pull request #1738 from wallabag/v2-prepare-beta1
X-Git-Tag: 2.0.0-beta.1~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4be43814e23b8b2630a290f02e90719a67f8655b;hp=2ebbbb26aeefa97ae5bdda97bcaf796c800e96a7;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1738 from wallabag/v2-prepare-beta1

Prepare wallabag for first beta :rocket:
---

diff --git a/README.md b/README.md
index b1086885..b7940b36 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ 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/). Then you can install wallabag by executing the following commands:
 
 ```
-SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
+SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
 php bin/console wallabag:install --env=prod
 php bin/console server:run --env=prod
 ```
diff --git a/app/config/config.yml b/app/config/config.yml
index 51cc049e..58ab83b0 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -28,7 +28,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.0-alpha.2
+    version: 2.0.0-beta.1
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 760fd4d2..97e581e1 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -48,7 +48,7 @@ To install wallabag itself, you must run these two commands:
 
 ::
 
-    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
+    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
     php bin/console wallabag:install --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 e4ff49ce..a2a5dabf 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -46,7 +46,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
 
 ::
 
-    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
+    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
     php bin/console wallabag:install --env=prod
 
 Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 2748c7e3..4c0d4fee 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -71,7 +71,7 @@
         {% block footer %}{% endblock %}
 
         <div id="warning_message">
-            You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+            You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new one if necessary</a>.
         </div>
 
         {% if craue_setting('piwik_enabled') %}