ContentProxy: swap entry url to origin_url and set new url according to graby content

[github/wallabag/wallabag.git] / README.md

diff --git a/README.md b/README.md
index 436272c03082e1fec3b317953515d58781a5de9b..f463f79ad9a1cd1266fb756f55e404500ee51797 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,11 +3,13 @@
 [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
 
 # What is wallabag?
-wallabag is a self hostable application allowing you to not miss any content anymore.
+wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
 Click, save and read it when you can. It extracts content so that you can read it when you have time.
 
 More information on our website: [wallabag.org](https://wallabag.org).
 
+If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
+
 ![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
 
 # Install wallabag
@@ -16,13 +18,13 @@ Please read [the documentation to see the wallabag requirements](http://doc.wall
 Then you can install wallabag by executing the following commands:
 
 ```
-    git clone https://github.com/wallabag/wallabag.git
-    cd wallabag
-    ./install.sh
-    php bin/console server:run --env=prod
+git clone https://github.com/wallabag/wallabag.git
+cd wallabag && make install 
 ```
 
+Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/virtualhosts.html) to use your wallabag. 
+
 # License
-Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2018 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.