Merge remote-tracking branch 'origin/master' into 2.3

8 files changed, 51 insertions, 98 deletions

diff --git a/docs/en/developer/api.rst b/docs/en/developer/api.rst
index b6c9ed3f..80c96025 100644
--- a/docs/en/developer/api.rst
+++ b/docs/en/developer/api.rst
@@ -8,7 +8,7 @@ Requirements
 
 * wallabag freshly (or not) installed on http://localhost:8000
 * ``httpie`` installed on your computer (`see project website <https://github.com/jkbrzt/httpie>`__). Note that you can also adapt the commands using curl or wget.
-* all the API methods are documented here http://localhost:8000/api/doc (on your instance) and `on our example instance <http://v2.wallabag.org/api/doc>`_ 
+* all the API methods are documented here http://localhost:8000/api/doc (on your instance) and `on our example instance <http://v2.wallabag.org/api/doc>`_
 
 Creating a new API client
 -------------------------
@@ -263,8 +263,9 @@ Third party resources
 
 Some applications or libraries use our API. Here is a non-exhaustive list of them:
 
-- `Java wrapper for the wallabag API <https://github.com/Strubbl/jWallabag>`_ by Strubbl.
+- `Java wrapper for the wallabag API <https://github.com/di72nn/wallabag-api-wrapper>`_ by Dmitriy Bogdanov.
 - `.NET library for the wallabag v2 API <https://github.com/jlnostr/wallabag-api>`_ by Julian Oster.
 - `Python API for wallabag <https://github.com/foxmask/wallabag_api>`_ by FoxMaSk, for his project `Trigger Happy <https://blog.trigger-happy.eu/>`_.
 - `A plugin <https://github.com/joshp23/ttrss-to-wallabag-v2>`_ designed for `Tiny Tiny RSS <https://tt-rss.org/gitlab/fox/tt-rss/wikis/home>`_ that makes use of the wallabag v2 API. By Josh Panter.
-- `Golang wrapper for the wallabag API <https://github.com/Strubbl/wallabago>`_ by Strubbl, for his project `wallabag-stats graph <https://github.com/Strubbl/wallabag-stats>`_.
+- `Golang wrapper for the wallabag API <https://github.com/Strubbl/wallabago>`_ by Strubbl, for his projects `wallabag-stats graph <https://github.com/Strubbl/wallabag-stats>`_ and the command line tool `wallabag-add-article <https://github.com/Strubbl/wallabag-add-article>`_.
+- Tool to automatically download Wallabag articles into your local computer or Kobo ebook reader `wallabako <https://gitlab.com/anarcat/wallabako>`_ by anarcat.
diff --git a/docs/en/developer/paywall.rst b/docs/en/developer/paywall.rst
index 365027b4..153afa6f 100644
--- a/docs/en/developer/paywall.rst
+++ b/docs/en/developer/paywall.rst
@@ -6,12 +6,16 @@ wallabag can fetch articles from websites which use a paywall system.
 Enable paywall authentication
 -----------------------------
 
-In internal settings, in the **Article** section, enable authentication for websites with paywall (with the value 1).
+In internal settings, as a wallabag administrator, in the **Article** section, enable authentication for websites with paywall (with the value 1).
 
 Configure credentials in wallabag
 ---------------------------------
 
-Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. Here is an example for some french websites:
+Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. For example, under Ubuntu:
+
+``sudo -u www-data nano /var/www/html/wallabag/app/config/parameters.yml``
+
+Here is an example for some french websites (be careful: don't use the "tab" key, only spaces):
 
 .. code:: yaml
 
@@ -28,7 +32,7 @@ Parsing configuration files
 
 .. note::
 
-    Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files.
+    Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files, which are located under ``vendor/j0k3r/graby-site-config/``. For most of the websites, this file is already configured: the following instructions are only for the websites that are not configured yet.
 
 Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``,
 ``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``.
@@ -54,3 +58,8 @@ For example:
     login_password_field: password
 
     not_logged_in_xpath: //body[@class="not-logged-in"]
+    
+Last step: clear the cache
+--------------------------
+    
+It's necessary to clear the wallabag cache with the following command (here under Ubuntu): ``sudo -u www-data php /var/www/html/wallabag/bin/console cache:clear -e=prod``
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 2e20aee6..89f61d6d 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -33,6 +33,7 @@ The documentation is available in other languages:
    user/errors_during_fetching
    user/filters
    user/tags
+   user/configuring_mobile
    user/android
    user/parameters
    user/backup
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index caca834f..bba12cb9 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -68,7 +68,9 @@ Two factor authentication (2FA)
     Two-factor authentication (also known as 2FA) is a technology patented in 1984
     that provides identification of users by means of the combination of two different components.
 
-https://en.wikipedia.org/wiki/Two-factor_authentication
+    https://en.wikipedia.org/wiki/Two-factor_authentication
+
+**Warning**: enabling 2FA from the configuration interface is only possible if it has been authorized before in `app/config/parameters.yml` by setting the *twofactor_auth* property to `true` (do not forget to run `php bin/console cache:clear -e=prod` after modification).
 
 If you enable 2FA, each time you want to login to wallabag, you'll receive
 a code by email. You have to put this code on the following form.
diff --git a/docs/en/user/configuring_mobile.rst b/docs/en/user/configuring_mobile.rst
index 2bcf3bcb..7229aed6 100644
--- a/docs/en/user/configuring_mobile.rst
+++ b/docs/en/user/configuring_mobile.rst
@@ -1,13 +1,13 @@
-Configuring Mobile Apps to Work With wallabag.it
-================================================
+Configuring mobile apps to work with wallabag
+=============================================
 
 Steps to configure the app
----------------------------
+--------------------------
 
-- First *create a new client* in the ``Developer`` section. The name of your app doesn't matter as much as the ``Client ID`` and the ``Client secret``. Write these two values down.
-- When you download a mobile app, it's going to ask for the server address of the hosted wallabag instance. With wallabag.it that is: ``https://app.wallabag.it``.
+- First *create a new client* in the ``API clients management`` section. The name of your app doesn't matter as much as the ``Client ID`` and the ``Client secret``. Write these two values down.
+- When you download a mobile app, it's going to ask for the server address of the hosted wallabag instance. For example, with wallabag.it that is: ``https://app.wallabag.it``.
 - It's also going to ask for the aforementioned ``Client ID`` and ``secret``. Please insert those in the text fields, when asked.
-- Lastly you need to provide your ``username`` and ``password``. These are the same credentials you use to login in to wallabag.it.
+- Lastly you need to provide your ``username`` and ``password``. These are the same credentials you use to login in to wallabag.
 
-Please also have a look at `Android <android>`_. Especially the section on *known limitations*.
+Please also have a look at `Android <android.html>`_ page. Especially the section on *known limitations*.
 
diff --git a/docs/en/user/first_article.rst b/docs/en/user/first_article.rst
deleted file mode 100644
index 1400e1e8..00000000
--- a/docs/en/user/first_article.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-Save your first article
-=======================
-
-The main purpose of wallabag is to save web articles. You have many ways to do it.
-
-.. note::
-
-    A quickstart will be displayed in the application until you save your first article.
-
-By using a bookmarklet
-----------------------
-
-On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!``
-link to your bookmarks bar of your browser.
-
-Now, each time you're reading an article on the web and you want to save it,
-click on the ``bag it!`` link in your bookmarks bar. The article is saved.
-
-By using the classic form
--------------------------
-
-In the top bar of your screen, you have 3 icons. With the first one, a plus sign,
-you can easily save a new article.
-
-.. image:: ../../img/user/topbar.png
-   :alt: Top bar
-   :align: center
-
-Click on it to display a new field, paste the article URL inside and press your
-``Return`` key. The article is saved.
-
-By using a browser add-on
--------------------------
-
-Firefox
-~~~~~~~
-
-*This addon is not yet available for wallabag v2*.
-
-Chrome
-~~~~~~
-
-*This addon is not yet available for wallabag v2*.
-
-By using your smarphone application
------------------------------------
-
-Android
-~~~~~~~
-
-*This application is not yet available for wallabag v2*.
-
-Firefox OS
-~~~~~~~~~~
-
-*This application is not yet available for wallabag v2*.
-
-Windows Phone
-~~~~~~~~~~~~~
-
-*This application is not yet available for wallabag v2*.
-
-iOS
-~~~
-
-*This application is not yet available for wallabag v2*.
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 7d3bcf61..2c4b8749 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -4,7 +4,7 @@ Install wallabag
 Requirements
 ------------
 
-wallabag is compatible with PHP >= 5.5, including PHP 7.
+wallabag is compatible with **PHP >= 5.6**, including PHP 7.
 
 .. note::
 
@@ -110,6 +110,12 @@ Virtual hosts
 Configuration on Apache
 ~~~~~~~~~~~~~~~~~~~~~~~
 
+Do not forget to active the *rewrite* mod of Apache
+
+.. code-block:: bash
+
+    a2enmod rewrite && systemctl reload apache2
+
 Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you want to use PHP as an Apache module, here's a vhost for wallabag:
 
 ::
@@ -149,6 +155,23 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w
         ErrorLog /var/log/apache2/wallabag_error.log
         CustomLog /var/log/apache2/wallabag_access.log combined
     </VirtualHost>
+    
+    
+.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : 
+
+::
+
+    AllowOverride None
+    Order Allow,Deny
+    Allow from All
+
+
+by 
+
+::
+    
+    Require All granted
+    
 
 After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
 
diff --git a/docs/en/user/share.rst b/docs/en/user/share.rst
deleted file mode 100644
index e99e51ab..00000000
--- a/docs/en/user/share.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-Share articles
-==============
-
-When you're reading an article, you can share it. Just click on the share button:
-
-.. image:: ../../img/user/share.png
-   :alt: share article
-   :align: center
-
-Now, you can share the article:
-
-- with a public URL (you'll have a light view of the article)
-- with a tweet
-- into your Shaarli
-- with a post in Diaspora*
-- to Carrot
-- with an email