aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-09-28 11:59:35 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-09-28 11:59:35 +0200
commit9866d39431ca58e4c913b6385ed74287f014c38d (patch)
treef2ebdb2586181c0fcd248e36e5450e494fa01c71 /docs/en
parenteef8aeec8fa56519363e90977900f198ff3bd19b (diff)
downloadwallabag-9866d39431ca58e4c913b6385ed74287f014c38d.tar.gz
wallabag-9866d39431ca58e4c913b6385ed74287f014c38d.tar.zst
wallabag-9866d39431ca58e4c913b6385ed74287f014c38d.zip
Fixed review
Diffstat (limited to 'docs/en')
-rw-r--r--docs/en/index.rst2
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.y.rst (renamed from docs/en/user/upgrade-2.0.x-2.1.0.rst)16
2 files changed, 16 insertions, 2 deletions
diff --git a/docs/en/index.rst b/docs/en/index.rst
index da23400b..026d174d 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -30,7 +30,7 @@ The documentation is available in other languages:
30 30
31 user/faq 31 user/faq
32 user/installation 32 user/installation
33 user/upgrade-2.0.x-2.1.0 33 user/upgrade-2.0.x-2.1.y
34 user/upgrade-2.0.x-2.0.y 34 user/upgrade-2.0.x-2.0.y
35 user/migration 35 user/migration
36 user/import 36 user/import
diff --git a/docs/en/user/upgrade-2.0.x-2.1.0.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst
index 3a24ee58..5ae5eb43 100644
--- a/docs/en/user/upgrade-2.0.x-2.1.0.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst
@@ -1,4 +1,4 @@
1Upgrading from 2.0.x to 2.1.0 1Upgrading from 2.0.x to 2.1.y
2============================= 2=============================
3 3
4.. warning:: 4.. warning::
@@ -33,6 +33,20 @@ Download the last release of wallabag:
33 33
34Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. 34Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
35 35
36Please note that we added new parameters in this version. You have to edit ``app/config/parameters.yml`` by adding these lines (replace with your configuration) :
37
38.. code-block:: bash
39
40 # RabbitMQ processing
41 rabbitmq_host: localhost
42 rabbitmq_port: 5672
43 rabbitmq_user: guest
44 rabbitmq_password: guest
45
46 # Redis processing
47 redis_host: localhost
48 redis_port: 6379
49
36If you use SQLite, you must also copy your ``data/`` folder inside the new installation. 50If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
37 51
38Empty ``var/cache`` folder. 52Empty ``var/cache`` folder.