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

diff --git a/README.md b/README.md
index e84f9797..1e33940a 100644
--- a/README.md
+++ b/README.md
@@ -1,57 +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.
 
-![poche](http://inthepoche.com/img/logo.png)
+More informations on our website: [wallabag.org](http://wallabag.org)
 
-The website of poche is [inthepoche.com](http://inthepoche.com).
+# Want to test the v2 ?
 
-To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
+Keep in mind it's an **instable** branch, everything can be broken :)
 
-To get news from poche, [follow us on twitter](http://twitter.com/getpoche) or [read the poche blog](http://inthepoche.com/blog). A Google Group is also available : [poche-users](https://groups.google.com/forum/#!forum/poche-users).
-
-[![flattr](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
-
-## Usage
-You can easily add a "poched" page with the bookmarklet.
-
-poche save the entire content of a poched links : text and pictures are stored on your server.
-
-You can :
-* read a page in a comfortable reading view
-* archive a link
-* put a link in favorite
-* delete a link
-
-## Requirements & installation
-You have to install [sqlite for php](http://www.php.net/manual/en/book.sqlite.php) on your server.
-
-Get the [latest version](https://github.com/nicosomb/poche) of poche on github. Unzip it and upload it on your server. poche must have write access on assets, cache and db directories.
-
-That's all, **poche works** !
-
-## 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>
 ```
-
-Nginx version:
-```nginx
-location ~ /(db) {
-    deny all;
-    return 404;
-}
+git clone https://github.com/wallabag/wallabag.git -b v2
+cd wallabag
+composer install
+php app/console wallabag:install
+php app/console server:run
 ```
 
-## Import from Pocket
-
-If you want to import your Pocket datas, [export them here](https://getpocket.com/export). Put the HTML file in your poche directory, execute import.php file locally by following instructions. Be careful, the script can take a very long time.
-
 ## 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.
+terms of the MIT License. See the COPYING file for more details.