X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=048315c04b6620e8b49e7d1fe39249c3572d7c35;hb=15f1352ef8761d3e083fc17c8354c30ca3542050;hp=583842ece103572adc397e7e3449ffcf68ce6519;hpb=33e38dd0ce6b7201c03711816c0e7878f1660fa6;p=github%2Fwallabag%2Fwallabag.git
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index 583842ec..048315c0
--- a/README.md
+++ b/README.md
@@ -1,30 +1,28 @@
-# poche
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source.
+[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master)
+[![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
-![poche](http://cdetc.fr/poche/img/logo.png)
+# 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.
-To get news from poche, [follow us on twitter](http://twitter.com/getpoche).
+More informations on our website: [wallabag.org](https://wallabag.org)
-## Usage
-You can easily add a "poched" page with the bookmarklet.
+# Install wallabag
-You can :
-* read a page in a comfortable reading view
-* archive a link
-* put a link in favorite
-* delete a link
+If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Read [our documentation](http://doc.wallabag.org) to have more information about installation.
+Then you can install wallabag by executing the following commands:
-## 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
-
+```
+ git clone https://github.com/wallabag/wallabag.git
+ cd wallabag
+ git checkout 2.1.1
+ SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+ php bin/console wallabag:install --env=prod
+ php bin/console server:run --env=prod
```
## License
-Copyright © 2010-2013 Nicolas LÅuillet
+Copyright © 2013-2016 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.