X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=6d545ff51d0ceb72303528b809485e45f9e21981;hb=5c895a7fd15822856fb407910264c5d95e1e223c;hp=85de2cb7ea2c3d9cc75ca50ffc738d966156b1a4;hpb=0a0b968672a21b9d9770a20b0229853ccaae6108;p=github%2Fwallabag%2Fwallabag.git
diff --git a/README.md b/README.md
index 85de2cb7..6d545ff5 100644
--- a/README.md
+++ b/README.md
@@ -1,55 +1,27 @@
-# poche
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source.
+[](https://travis-ci.org/wallabag/wallabag)
+[](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+[](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
-
+# What is wallabag?
+wallabag is a self hostable application allowing you to not miss any content anymore.
+Click, save and read it when you can. It extracts content so that you can read it when you have time.
-The website of poche is [inthepoche.com](http://inthepoche.com).
+More informations on our website: [wallabag.org](http://wallabag.org)
-To get news from poche, [follow us on twitter](http://twitter.com/getpoche).
+# Want to test the v2?
-[](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
+Keep in mind it's an **unstable** branch, everything can be broken :)
-## Usage
-You can easily add a "poched" page with the bookmarklet.
+If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands:
-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
-
- Order allow,deny
- Deny from all
-
```
-
-Nginx version:
-```nginx
-location ~ /(db) {
- deny all;
- return 404;
-}
+composer create-project wallabag/wallabag wallabag 2.0.0-alpha.1
+cd wallabag
+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
+Copyright © 2013-2015 Nicolas LÅuillet
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.