aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user
diff options
context:
space:
mode:
Diffstat (limited to 'docs/en/user')
-rw-r--r--docs/en/user/errors_during_fetching.rst18
-rw-r--r--docs/en/user/installation.rst7
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.y.rst8
3 files changed, 23 insertions, 10 deletions
diff --git a/docs/en/user/errors_during_fetching.rst b/docs/en/user/errors_during_fetching.rst
index 68892750..6684563a 100644
--- a/docs/en/user/errors_during_fetching.rst
+++ b/docs/en/user/errors_during_fetching.rst
@@ -12,9 +12,21 @@ There may be several reasons:
12How can I help to fix that? 12How can I help to fix that?
13--------------------------- 13---------------------------
14 14
15- `by sending us an email with the article's URL <mailto:hello@wallabag.org>`_ 15You can `sending us an email with the article's URL <mailto:hello@wallabag.org>`_.
16- by trying to fix this article by yourself :) by creating a file for the article. 16
17 You can use `this tool <http://siteconfig.fivefilters.org/>`__. 17Or you can also try to fix this problem by yourself (so we can be focused on improving wallabag internally instead of writing siteconfig :) ).
18
19You can try to see if it works here: `http://f43.me/feed/test <http://f43.me/feed/test>`_ (it uses almost the same system as wallabag to retrieve content).
20
21If it works here and not on wallabag, it means there is something internally in wallabag that breaks the parser (hard to fix: please open an issue about it).
22
23If it doesn't works, try to extract a site config using: `http://siteconfig.fivefilters.org/ <http://siteconfig.fivefilters.org/>`_ (select which part of the content is actually the content). You can `read this documentation before <http://help.fivefilters.org/customer/en/portal/articles/223153-site-patterns>`_.
24
25You can test it on **f43.me** website: click on **Want to try a custom siteconfig?** and put the generated file from siteconfig.fivefilters.org.
26
27Repeat until you have something ok.
28
29Then you can submit a pull request to `https://github.com/fivefilters/ftr-site-config <https://github.com/fivefilters/ftr-site-config>`_ which is the global repo for siteconfig files.
18 30
19How can I try to re-fetch this article? 31How can I try to re-fetch this article?
20--------------------------------------- 32---------------------------------------
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 82fa6f4e..4aaabd82 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -22,6 +22,7 @@ You'll need the following extensions for wallabag to work. Some of these may alr
22- php-curl 22- php-curl
23- php-gettext 23- php-gettext
24- php-tokenizer 24- php-tokenizer
25- php-bcmath
25 26
26wallabag uses PDO to connect to the database, so you'll need one of the following: 27wallabag uses PDO to connect to the database, so you'll need one of the following:
27 28
@@ -53,8 +54,8 @@ To install wallabag itself, you must run the following commands:
53 54
54 git clone https://github.com/wallabag/wallabag.git 55 git clone https://github.com/wallabag/wallabag.git
55 cd wallabag 56 cd wallabag
56 git checkout 2.1.0 57 git checkout 2.1.1 --force
57 ASSETS=build ./install.sh 58 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
58 php bin/console wallabag:install --env=prod 59 php bin/console wallabag:install --env=prod
59 60
60To start PHP's build-in server and test if everything did install correctly, you can do: 61To start PHP's build-in server and test if everything did install correctly, you can do:
@@ -85,7 +86,7 @@ Execute this command to download and extract the latest package:
85 86
86 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 87 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
87 88
88(md5 hash of the 2.1.0 package: ``6c33520e29cc754b687f9cee0398dede``) 89(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``)
89 90
90Now, read the following documentation to create your virtual host, then access your wallabag. 91Now, read the following documentation to create your virtual host, then access your wallabag.
91If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``. 92If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``.
diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst
index 234045ba..ec353a18 100644
--- a/docs/en/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst
@@ -7,15 +7,15 @@ Before this migration, if you configured the Pocket import by adding your consum
7Upgrade on a dedicated web server 7Upgrade on a dedicated web server
8--------------------------------- 8---------------------------------
9 9
10The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.0`` by the last release number): 10The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.1`` by the last release number):
11 11
12:: 12::
13 13
14 rm -rf var/cache/* 14 rm -rf var/cache/*
15 git fetch origin 15 git fetch origin
16 git fetch --tags 16 git fetch --tags
17 git checkout 2.1.0 17 git checkout 2.1.1 --force
18 ASSETS=build ./install.sh 18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod 19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 20 php bin/console cache:clear --env=prod
21 21
@@ -30,7 +30,7 @@ Download the last release of wallabag:
30 30
31 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 31 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
32 32
33(md5 hash of the 2.1.0 package: ``6c33520e29cc754b687f9cee0398dede``) 33(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``)
34 34
35Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. 35Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
36 36