From 947ccd075c9974ad5158ac198f4e376385d94c4a Mon Sep 17 00:00:00 2001 From: Kevin Gautreau Date: Tue, 14 Feb 2017 09:24:56 +0100 Subject: Add informations about Apache 2.4 --- docs/en/user/installation.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'docs/en/user') diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 7d3bcf61..7fb81aeb 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -149,6 +149,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 + + +.. tip:: Note for Apache 2.4, in the section `` 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. -- cgit v1.2.3 From 7d1c19c0210e5d75c496f8c1ae10a727be2b9317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 14 Feb 2017 20:45:08 +0100 Subject: Doc: translated mobile apps configuration in french --- docs/en/user/configuring_mobile.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/en/user') 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 `_. Especially the section on *known limitations*. +Please also have a look at `Android `_ page. Especially the section on *known limitations*. -- cgit v1.2.3 From d60c38edf93d4317734116a3d5e3199875f275ad Mon Sep 17 00:00:00 2001 From: matteocoder Date: Wed, 25 Jan 2017 07:53:01 -0500 Subject: share.rst already integrated inside articles.rst The share.rst file is just a duplicate of a section already present in another file. --- docs/en/user/share.rst | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 docs/en/user/share.rst (limited to 'docs/en/user') 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 -- cgit v1.2.3 From e04d656f5aa73d271a6d7866f08f1c21640b68fe Mon Sep 17 00:00:00 2001 From: matteocoder Date: Wed, 25 Jan 2017 07:56:31 -0500 Subject: first_article.rst already inside articles.rst The file is a duplicate of a section already present in articles.rst --- docs/en/user/first_article.rst | 66 ------------------------------------------ 1 file changed, 66 deletions(-) delete mode 100644 docs/en/user/first_article.rst (limited to 'docs/en/user') 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*. -- cgit v1.2.3 From 38fe54199772b4ab127ddfca46893545756038d6 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 17 Feb 2017 10:57:18 +0100 Subject: Alert that 2FA must be authorized in app/config/parameters.yml --- docs/en/user/configuration.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/en/user') 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. -- cgit v1.2.3 From 0a82d6e23c71d797f5ab6e54ee4f67a6c91a05bf Mon Sep 17 00:00:00 2001 From: Quentin THEURET Date: Thu, 23 Feb 2017 16:10:14 +0100 Subject: Activate 'rewrite' mod of Apache --- docs/en/user/installation.rst | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/en/user') diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 7fb81aeb..2b730b83 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -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: :: -- cgit v1.2.3 From de0ab52a47ea91f7013d0cacd7240ecdc85026ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 28 Mar 2017 11:45:40 +0200 Subject: Updated requirements in documentation --- docs/en/user/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/en/user') diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 7d3bcf61..5b229bda 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:: -- cgit v1.2.3