aboutsummaryrefslogtreecommitdiffhomepage
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
parenteef8aeec8fa56519363e90977900f198ff3bd19b (diff)
downloadwallabag-9866d39431ca58e4c913b6385ed74287f014c38d.tar.gz
wallabag-9866d39431ca58e4c913b6385ed74287f014c38d.tar.zst
wallabag-9866d39431ca58e4c913b6385ed74287f014c38d.zip
Fixed review
-rw-r--r--docs/de/index.rst2
-rw-r--r--docs/de/user/upgrade-2.0.x-2.0.y.rst4
-rw-r--r--docs/de/user/upgrade-2.0.x-2.1.y.rst (renamed from docs/de/user/upgrade-2.0.x-2.1.0.rst)14
-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
-rw-r--r--docs/fr/index.rst2
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.1.y.rst (renamed from docs/fr/user/upgrade-2.0.x-2.1.0.rst)16
7 files changed, 49 insertions, 7 deletions
diff --git a/docs/de/index.rst b/docs/de/index.rst
index 62f8b54a..65cf8953 100644
--- a/docs/de/index.rst
+++ b/docs/de/index.rst
@@ -30,7 +30,7 @@ Die Dokumentation ist in anderen Sprachen verfügbar :
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/de/user/upgrade-2.0.x-2.0.y.rst b/docs/de/user/upgrade-2.0.x-2.0.y.rst
index c04b68f3..adf288bd 100644
--- a/docs/de/user/upgrade-2.0.x-2.0.y.rst
+++ b/docs/de/user/upgrade-2.0.x-2.0.y.rst
@@ -1,5 +1,5 @@
1Wallabag updaten 1Wallabag updaten 2.0.x -> 2.1.x
2================ 2===============================
3 3
4Update auf einem dedizierten Webserver 4Update auf einem dedizierten Webserver
5-------------------------------------- 5--------------------------------------
diff --git a/docs/de/user/upgrade-2.0.x-2.1.0.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst
index eb67e686..32d13c6a 100644
--- a/docs/de/user/upgrade-2.0.x-2.1.0.rst
+++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst
@@ -33,6 +33,20 @@ Lade das neueste Release von wallabag herunter:
33 33
34Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. 34Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei.
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
36Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren. 50Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren.
37 51
38Leere den ``var/cache`` Ordner. 52Leere den ``var/cache`` Ordner.
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.
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index ff99948c..d0cd0c43 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -31,7 +31,7 @@ La documentation est disponible dans d'autres langues :
31 31
32 user/faq 32 user/faq
33 user/installation 33 user/installation
34 user/upgrade-2.0.x-2.1.0 34 user/upgrade-2.0.x-2.1.y
35 user/upgrade-2.0.x-2.0.y 35 user/upgrade-2.0.x-2.0.y
36 user/migration 36 user/migration
37 user/import 37 user/import
diff --git a/docs/fr/user/upgrade-2.0.x-2.1.0.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
index 18f09a63..a4afe768 100644
--- a/docs/fr/user/upgrade-2.0.x-2.1.0.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
@@ -1,4 +1,4 @@
1Mettre à jour de la 2.0.x à la 2.1.0 1Mettre à jour de la 2.0.x à la 2.1.y
2==================================== 2====================================
3 3
4.. warning:: 4.. warning::
@@ -33,6 +33,20 @@ Téléchargez la dernière version de wallabag :
33 33
34Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. 34Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
35 35
36Nous avons ajouté de nouveaux paramètres dans cette nouvelle version. Vous devez donc éditer le fichier ``app/config/parameters.yml`` en ajoutant ces lignes (et en remplaçant par votre 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
36Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. 50Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``.
37 51
38Videz le répertoire ``var/cache``. 52Videz le répertoire ``var/cache``.