From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 9 May 2017 11:55:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~103
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=54c2d164a362e64a320438b439bf9dd6d2c02424

Merge remote-tracking branch 'origin/master' into 2.3
---

54c2d164a362e64a320438b439bf9dd6d2c02424
diff --cc docs/de/user/upgrade.rst
index af3b96fb,76faa4e2..fa2aac45
--- a/docs/de/user/upgrade.rst
+++ b/docs/de/user/upgrade.rst
@@@ -61,9 -61,9 +61,9 @@@ Lade das letzte Release von wallabag he
  
  .. code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://static.wallabag.org/releases/>`_.
  
  Extrahiere das Archiv in deinen wallabag-Ordner und ersetze die ``app/config/parameters.yml`` mit deiner.
  
diff --cc docs/en/user/upgrade.rst
index 359a355f,46b490c3..3157684c
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@@ -65,9 -65,9 +65,9 @@@ Download the last release of wallabag
  
  .. code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -You will find the `md5 hash of the latest package on our website <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +You will find the `md5 hash of the latest package on our website <https://static.wallabag.org/releases/>`_.
  
  Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
  
diff --cc docs/fr/user/upgrade.rst
index 5bb42deb,af97ebb2..af198006
--- a/docs/fr/user/upgrade.rst
+++ b/docs/fr/user/upgrade.rst
@@@ -61,9 -61,9 +61,9 @@@ Téléchargez la dernière version de w
  
  .. code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Vous trouverez `le hash md5 du dernier package sur notre site <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Vous trouverez `le hash md5 du dernier package sur notre site <https://static.wallabag.org/releases/>`_.
  
  Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
  
diff --cc docs/it/user/installation.rst
index c067228d,95d781e6..174507b8
--- a/docs/it/user/installation.rst
+++ b/docs/it/user/installation.rst
@@@ -86,9 -86,9 +86,9 @@@ Eseguite questo comando per scaricare e
  
  .. code-block:: bash
  
-    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+    wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Troverete il `hash md5 del pacchetto piú aggiornato sul nostro sito <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Troverete il `hash md5 del pacchetto piú aggiornato sul nostro sito <https://static.wallabag.org/releases/>`_.
  
  Ora leggete la seguente documentazione per creare il vostro host virtuale poi accedete al vostro wallabag. Se avete cambiato la configurazione del database per usare MySQL o PostrgreSQL, dovrete creare un utente con il comando php bin/console wallabag:install --env=prod .
  
diff --cc docs/it/user/upgrade.rst
index 52cd98c7,e1c3f041..ede1a1a3
--- a/docs/it/user/upgrade.rst
+++ b/docs/it/user/upgrade.rst
@@@ -78,9 -78,9 +78,9 @@@ Scaricate l'ultima versione di wallabag
  
  . code-block:: bash
  
-     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
  
 -Troverete il `hash md5 dell'ultima versione del pacchetto sul nostro sito <https://www.wallabag.org/pages/download-wallabag.html>`_.
 +Troverete il `hash md5 dell'ultima versione del pacchetto sul nostro sito <https://static.wallabag.org/releases/>`_.
  
  Estraete l'archivio nella vostra cartella di wallabag e rimpiazzate ``app/config/parameters.yml`` con il vostro.