X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=ef1ecc4d1865381b0e9e7182c002000f3864a620;hb=b6b36e1b5a37cfddc025efdbd816acbde70eafb6;hp=a03db980261e48e82c1c689145b7cbf3b406be56;hpb=9232dd8b2a599397aff61d5ffadd1b5f07d00d35;p=github%2Fwallabag%2Fwallabag.git
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index a03db980..ef1ecc4d
--- a/README.md
+++ b/README.md
@@ -1,34 +1,29 @@
-# poche
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source.
-
-![poche](http://cdetc.fr/poche/img/logo.png)
-
-The website of poche is [inthepoche.com](http://inthepoche.com).
-
-To get news from poche, [follow us on twitter](http://twitter.com/getpoche).
-
-[If you want to flattr poche, it's here.](https://flattr.com/thing/1225780/nicosombpoche-on-GitHub)
-
-## Usage
-You can easily add a "poched" page with the bookmarklet.
-
-You can :
-* read a page in a comfortable reading view
-* archive a link
-* put a link in favorite
-* delete a link
-
-## 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
-
-```
+# 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.
+
+## 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-themes).
+* ...
+
+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/).
+
+## 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