From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Wed, 29 Mar 2017 12:18:55 +0000 (+0200)
Subject: Merge pull request #3000 from cloudron-io/master
X-Git-Tag: 2.3.0~31^2~125
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=6f296a789c9cb063ea20c27a5b4f977cf9aeafbf;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3000 from cloudron-io/master

Add Cloudron as installation method
---

6f296a789c9cb063ea20c27a5b4f977cf9aeafbf
diff --combined docs/de/user/installation.rst
index 8393455a,2e8d8343..403ff6e0
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@@ -4,7 -4,7 +4,7 @@@ Installation von wallaba
  Voraussetzungen
  ---------------
  
 -wallabag ist kompatibel mit PHP >= 5.5, inkl. PHP 7.
 +wallabag ist kompatibel mit **PHP >= 5.6**, inkl. PHP 7.
  
  .. note::
  
@@@ -105,6 -105,14 +105,14 @@@ Kommando, um den Container zu starte
  
      docker pull wallabag/wallabag
  
+ Cloudron Installation
+ ~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ Cloudron bietet einfache Webapp Installation auf deinem Server, mit Fokus auf System Administrator Automatisierung und Updates.
+ Ein Wallabag Paket ist direkt zur Installation durch den Cloudron Store verfügbar.
+ 
+ `Installiere wallabag auf deinem Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
+ 
  Virtualhosts
  ------------
  
diff --combined docs/en/user/installation.rst
index 2c4b8749,961e2e98..81c563f0
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@@ -4,7 -4,7 +4,7 @@@ Install wallaba
  Requirements
  ------------
  
 -wallabag is compatible with PHP >= 5.5, including PHP 7.
 +wallabag is compatible with **PHP >= 5.6**, including PHP 7.
  
  .. note::
  
@@@ -104,6 -104,14 +104,14 @@@ Command to launch containe
  
      docker pull wallabag/wallabag
  
+ Installation on Cloudron
+ ~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ Cloudron provides an easy way to install webapps on your server with a focus on sysadmin automation and keeping apps updated.
+ wallabag is packaged as a Cloudron app and available to install directly from the store.
+ 
+ `Install wallabag on your Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
+ 
  Virtual hosts
  -------------
  
@@@ -155,9 -163,9 +163,9 @@@ Assuming you install wallabag in the ``
          ErrorLog /var/log/apache2/wallabag_error.log
          CustomLog /var/log/apache2/wallabag_access.log combined
      </VirtualHost>
-     
-     
- .. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : 
+ 
+ 
+ .. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives :
  
  ::
  
@@@ -166,12 -174,12 +174,12 @@@
      Allow from All
  
  
- by 
+ by
  
  ::
-     
+ 
      Require All granted
-     
+ 
  
  After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
  
diff --combined docs/fr/user/installation.rst
index 9dcb0efb,9d3c9d5e..9ef8aa11
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@@ -4,7 -4,7 +4,7 @@@ Installer wallaba
  Pré-requis
  ------------
  
 -wallabag est compatible avec PHP >= 5.5, PHP 7 inclus.
 +wallabag est compatible avec **PHP >= 5.6**, PHP 7 inclus.
  
  .. note::
  
@@@ -101,6 -101,14 +101,14 @@@ Commande pour démarrer le containeu
  
      docker pull wallabag/wallabag
  
+ Installation sur Cloudron
+ ~~~~~~~~~~~~~~~~~~~~~~~~
+ 
+ Cloudron permet d'installer des applications web sur votre serveur
+ wallabag est proposé en tant qu'application Cloudron et est disponible directement depuis le store.
+ 
+ `Installer wallabag sur Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
+ 
  Virtual hosts
  -------------
  
@@@ -162,12 -170,12 +170,12 @@@ En imaginant que vous vouliez installe
      Allow from All
  
  
- par 
+ par
  
  ::
-     
+ 
      Require All granted
-     
+