X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=13e730c9679aa2b3e07673fda9a758022527000c;hb=c2e2906c8dcb83494c34d22c57f262d8f2b5f58d;hp=65e2f03affd85f261d7a30c8e6b0fc276a8027a6;hpb=21e0af98eb28e46345ecb947c48af29e8f1c6234;p=github%2Fwallabag%2Fwallabag.git
diff --git a/README.md b/README.md
index 65e2f03a..13e730c9 100644
--- a/README.md
+++ b/README.md
@@ -1,58 +1,22 @@
-# poche
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source. Moreover, you can migrate from Pocket & Readability.
+# 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.
-
+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).
-
-[](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
-
-## Requirements & installation
-You have to install [sqlite for php](http://www.php.net/manual/en/book.sqlite.php) on your server.
-
-[PHP cURL](http://www.php.net/manual/en/book.curl.php) & [tidy_parse_string](http://www.php.net/manual/en/tidy.parsestring.php) are recommended.
-
-Get the [latest version](https://github.com/inthepoche/poche) of poche on github. Unzip it and upload it on your server. poche must have write access on assets, cache and db directories.
-
-Copy db/poche.sqlite.in to db/poche.sqlite
-
-Install composer in your project :
-```bash
-curl -s http://getcomposer.org/installer | php
```
-Install via composer :
-```bash
-php composer.phar install
+git clone https://github.com/wallabag/wallabag.git -b refactor
+cd wallabag
+composer install
+php app/console wallabag:install
+php app/console server:run
```
-That's all, you can use poche !
-
-## 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;
-}
-```
-
-## Usage
-See the documentation on our website : [inthepoche.com](http://inthepoche.com).
-
## 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.
\ No newline at end of file
+terms of the MIT License. See the COPYING file for more details.