X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=README.md;h=27f549d9116e6be4bddc9965323c7a56d2afd91e;hb=0269cd821311500acffed61edb1bc168d3fb5ec8;hp=ad5fb1aa3b42d094d9b653952b4429e1db74c340;hpb=9c902708da41bd7f21e06dd4ab9cdb243e67e6ef;p=github%2Fwallabag%2Fwallabag.git
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index ad5fb1aa..27f549d9
--- a/README.md
+++ b/README.md
@@ -1,57 +1,29 @@
-# poche
-Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is open source.
-
-
-
-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 (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).
-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 : [https://groups.google.com/forum/#!forum/poche-users](https://groups.google.com/forum/#!forum/poche-users
-
-[](http://flattr.com/thing/1265480/poche-a-read-it-later-open-source-system)
-
-## Usage
-You can easily add a "poched" page with the bookmarklet.
-
-poche save the entire content of a poched links : text and pictures are stored on your server.
-
-You can :
-* read a page in a comfortable reading view
-* archive a link
-* put a link in favorite
-* delete a link
-
-## Requirements & installation
-You have to install [sqlite for php](http://www.php.net/manual/en/book.sqlite.php) on your server.
-
-Get the [latest version](https://github.com/nicosomb/poche) of poche on github. Unzip it and upload it on your server. poche must have write access on assets, cache and db directories.
-
-That's all, **poche works** !
-
-## 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;
-}
-```
-
-## Import from Pocket
+## Installation
-If you want to import your Pocket datas, [export them here](https://getpocket.com/export). Put the HTML file in your poche directory, execute import.php file locally by following instructions. Be careful, the script can take a very long time.
+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.
+as published by Sam Hocevar. See the COPYING file for more details.
\ No newline at end of file