X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=ef1ecc4d1865381b0e9e7182c002000f3864a620;hb=8e1ed353bbd772da9002dd977fc0725c9d526c8c;hp=25385da8c3aba9e03b2cc152b84d8cab3a133f46;hpb=1d517de67b4d3de661a288acdfd8eecefd3110a3;p=github%2Fwallabag%2Fwallabag.git
diff --git a/README.md b/README.md
index 25385da8..ef1ecc4d 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,26 @@
-# 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.
-
-
-
-The website of poche is [inthepoche.com](http://inthepoche.com).
+# 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 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)
-
-## 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;
-}
-```
+To use poche hosting, [you can create an account here](http://app.inthepoche.com/).
-## Usage
-See the documentation on our website : [inthepoche.com](http://inthepoche.com).
+## Installation
+Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md).
## License
Copyright © 2010-2013 Nicolas LÅuillet