X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=27f549d9116e6be4bddc9965323c7a56d2afd91e;hb=d29b3e5f9e195b99d3891acd8537f8f4680e430f;hp=a1c7920f1519b490a3beca3c6625096e61c72879;hpb=a590ea55c2422cd0b11fb60e64275ad7e4f6bd26;p=github%2Fwallabag%2Fwallabag.git

diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index a1c7920f..27f549d9
--- a/README.md
+++ b/README.md
@@ -1,23 +1,29 @@
-# poche
+# what is poche ?
+Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is free (like in freedom) and open source. 
 
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source.
+## Some features
 
-## Usage
+* adding, deleting, archiving and setting as favorite a link
+* import from pocket / readability / instapaper
+* share links by email and on twitter
+* a design adapted to tablets and smartphones
+* extensions for Chrome and Firefox
+* Android application
+* multi languages (very soon!)
+* multi users (very soon!)
+* update notification in configuration screen
+* many storage modes (sqlite, mysql, postgresql)
+* many templates
+* ...
 
-...
+To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
 
-## Security
+## Installation
 
-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>
-```
+Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md).
 
 ## License
-Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2010-2013 Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
 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