From: Nicolas Lœuillet Date: Wed, 28 Sep 2016 09:59:35 +0000 (+0200) Subject: Fixed review X-Git-Tag: 2.1.0~18^2~8 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=9866d39431ca58e4c913b6385ed74287f014c38d;p=github%2Fwallabag%2Fwallabag.git Fixed review --- 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 : user/faq user/installation - user/upgrade-2.0.x-2.1.0 + user/upgrade-2.0.x-2.1.y user/upgrade-2.0.x-2.0.y user/migration 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 @@ -Wallabag updaten -================ +Wallabag updaten 2.0.x -> 2.1.x +=============================== Update auf einem dedizierten Webserver -------------------------------------- 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 similarity index 85% rename from docs/de/user/upgrade-2.0.x-2.1.0.rst rename to 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: Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. +Please 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) : + +.. code-block:: bash + + # RabbitMQ processing + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + + # Redis processing + redis_host: localhost + redis_port: 6379 + Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren. Leere 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: user/faq user/installation - user/upgrade-2.0.x-2.1.0 + user/upgrade-2.0.x-2.1.y user/upgrade-2.0.x-2.0.y user/migration 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 similarity index 83% rename from docs/en/user/upgrade-2.0.x-2.1.0.rst rename to 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 @@ -Upgrading from 2.0.x to 2.1.0 +Upgrading from 2.0.x to 2.1.y ============================= .. warning:: @@ -33,6 +33,20 @@ Download the last release of wallabag: Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. +Please 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) : + +.. code-block:: bash + + # RabbitMQ processing + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + + # Redis processing + redis_host: localhost + redis_port: 6379 + If you use SQLite, you must also copy your ``data/`` folder inside the new installation. Empty ``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 : user/faq user/installation - user/upgrade-2.0.x-2.1.0 + user/upgrade-2.0.x-2.1.y user/upgrade-2.0.x-2.0.y user/migration 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 similarity index 83% rename from docs/fr/user/upgrade-2.0.x-2.1.0.rst rename to 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 @@ -Mettre à jour de la 2.0.x à la 2.1.0 +Mettre à jour de la 2.0.x à la 2.1.y ==================================== .. warning:: @@ -33,6 +33,20 @@ Téléchargez la dernière version de wallabag : Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. +Nous 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) : + +.. code-block:: bash + + # RabbitMQ processing + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + + # Redis processing + redis_host: localhost + redis_port: 6379 + Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. Videz le répertoire ``var/cache``.