X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=1e33940a8de9fa70a9e4a31bfdfc8cbe90022951;hb=5644c2d88e092927677c4f8c2c64db454e140431;hp=2e14888cd4ffd2b1cbe2b979b1743203fac8eb0d;hpb=28cbf46cf5bae81b6fe25c89237d0a005281086a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index 2e14888c..1e33940a
--- a/README.md
+++ b/README.md
@@ -1,28 +1,22 @@
-# poche
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source.
+# What is wallabag ?
+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 get news from poche, [follow us on twitter](http://twitter.com/getpoche).
+More informations on our website: [wallabag.org](http://wallabag.org)
 
-## Usage
-You can easily add a "poched" page with the bookmarklet.
+# Want to test the v2 ?
 
-You can :
-* read a page in a comfortable reading view
-* archive a link
-* put a link in favorite
-* delete a link
+Keep in mind it's an **instable** branch, everything can be broken :)
 
-## Security
-You **have** to protect your db/poche.sqlite file. Modify the virtual host of your website to add this condition :
-```apache
-<Files ~ "\.sqlite$">
-    Order allow,deny
-    Deny from all
-</Files>
+```
+git clone https://github.com/wallabag/wallabag.git -b v2
+cd wallabag
+composer install
+php app/console wallabag:install
+php app/console server:run
 ```
 
 ## License
-Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2015 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.
\ No newline at end of file
+terms of the MIT License. See the COPYING file for more details.