X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=d1ed79eee3b13f296839e82be3bdd73c7aae9b93;hb=refs%2Ftags%2F1.3.0;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..d1ed79ee
--- 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
+* 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: french, english, spanish, german.
+* multi users (very soon!)
+* update notification in configuration screen
+* many storage modes (sqlite, mysql, postgresql)
+* many templates: [have a look here](https://github.com/inthepoche/poche/tree/master/themes).
+* ...
-## Usage
+To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
-...
+To use poche hosting, [you can create an account here](http://app.inthepoche.com/).
-## 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
-
-```
+## Installation
+Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md).
## License
-Copyright © 2010-2013 Nicolas LÅuillet
+Copyright © 2010-2013 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
+as published by Sam Hocevar. See the COPYING file for more details.