Use config option BASE_URL in getPocheUrl()

[github/wallabag/wallabag.git] / README.md

diff --git a/README.md b/README.md
index 6f950ad0bd2c1e9d911aa6dedf90a4a572cef6af..bded719863d800ba7f3ff5b8bb7bf3edc9db1460 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,10 +1,16 @@
 # what is wallabag ?
+
+## About development
+We are working on a technical rework, using Symfony 2. You can contribute to [this version here](https://github.com/wallabag/wallabag/tree/v2).
+
+wallabag 1.x is still maintained but we won't develop new features. 
+
+## Description
 wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
 
-To test wallabag, a demo website is online : [demo.wallabag.org](http://demo.wallabag.org) (login poche, password poche).
+More informations on our website: [wallabag.org](http://wallabag.org)
 
 ## License
-Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2014 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
-terms of the Do What The Fuck You Want To Public License, Version 2,
-as published by Sam Hocevar. See the COPYING file for more details.
+terms of the MIT License. See the COPYING file for more details.