aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user
diff options
context:
space:
mode:
Diffstat (limited to 'docs/en/user')
-rw-r--r--docs/en/user/articles.rst7
-rw-r--r--docs/en/user/installation.rst22
2 files changed, 19 insertions, 10 deletions
diff --git a/docs/en/user/articles.rst b/docs/en/user/articles.rst
index 16b3b0d2..862bba3e 100644
--- a/docs/en/user/articles.rst
+++ b/docs/en/user/articles.rst
@@ -34,20 +34,20 @@ By using a browser add-on
34Firefox 34Firefox
35""""""" 35"""""""
36 36
37You can download the `Firefox addon here <https://addons.mozilla.org/firefox/addon/wallabag-v2/>`_. 37You can download the `Firefox addon here <https://addons.mozilla.org/firefox/addon/wallabagger/>`_.
38 38
39Chrome 39Chrome
40"""""" 40""""""
41 41
42You can download the `Chrome addon here <https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj?hl=fr>`_. 42You can download the `Chrome addon here <https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj?hl=fr>`_.
43 43
44By using your smarphone application 44By using your smartphone application
45^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 45^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
46 46
47Android 47Android
48""""""" 48"""""""
49 49
50You can download the `Android application here <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_. 50You can download the `Android application here <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_ or on `F-Droid <https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.InThePoche>`_.
51 51
52Windows Phone 52Windows Phone
53""""""""""""" 53"""""""""""""
@@ -86,6 +86,7 @@ Now, you can share the article:
86- with a public URL (you'll have a light view of the article) 86- with a public URL (you'll have a light view of the article)
87- with a tweet 87- with a tweet
88- into your Shaarli 88- into your Shaarli
89- into your Scuttle
89- with a post in Diaspora* 90- with a post in Diaspora*
90- to Carrot 91- to Carrot
91- with an email 92- with an email
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 2b730b83..81c563f0 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -4,7 +4,7 @@ Install wallabag
4Requirements 4Requirements
5------------ 5------------
6 6
7wallabag is compatible with PHP >= 5.5, including PHP 7. 7wallabag is compatible with **PHP >= 5.6**, including PHP 7.
8 8
9.. note:: 9.. note::
10 10
@@ -104,6 +104,14 @@ Command to launch container
104 104
105 docker pull wallabag/wallabag 105 docker pull wallabag/wallabag
106 106
107Installation on Cloudron
108~~~~~~~~~~~~~~~~~~~~~~~~
109
110Cloudron provides an easy way to install webapps on your server with a focus on sysadmin automation and keeping apps updated.
111wallabag is packaged as a Cloudron app and available to install directly from the store.
112
113`Install wallabag on your Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
114
107Virtual hosts 115Virtual hosts
108------------- 116-------------
109 117
@@ -155,9 +163,9 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w
155 ErrorLog /var/log/apache2/wallabag_error.log 163 ErrorLog /var/log/apache2/wallabag_error.log
156 CustomLog /var/log/apache2/wallabag_access.log combined 164 CustomLog /var/log/apache2/wallabag_access.log combined
157 </VirtualHost> 165 </VirtualHost>
158 166
159 167
160.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : 168.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives :
161 169
162:: 170::
163 171
@@ -166,12 +174,12 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w
166 Allow from All 174 Allow from All
167 175
168 176
169by 177by
170 178
171:: 179::
172 180
173 Require All granted 181 Require All granted
174 182
175 183
176After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. 184After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
177 185