diff options
Diffstat (limited to 'docs')
-rw-r--r-- | docs/de/user/articles.rst | 1 | ||||
-rw-r--r-- | docs/de/user/installation.rst | 10 | ||||
-rw-r--r-- | docs/en/user/articles.rst | 1 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 22 | ||||
-rw-r--r-- | docs/fr/user/articles.rst | 1 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 16 | ||||
-rw-r--r-- | docs/it/user/articles.rst | 1 | ||||
-rw-r--r-- | docs/it/user/installation.rst | 7 |
8 files changed, 47 insertions, 12 deletions
diff --git a/docs/de/user/articles.rst b/docs/de/user/articles.rst index 07cfa06c..e45fa4d3 100644 --- a/docs/de/user/articles.rst +++ b/docs/de/user/articles.rst | |||
@@ -82,6 +82,7 @@ Nun kannst du den Artikel teilen: | |||
82 | - über eine öffentliche URL (es wird eine reduzierte Ansicht des Artikels zurückgegeben) | 82 | - über eine öffentliche URL (es wird eine reduzierte Ansicht des Artikels zurückgegeben) |
83 | - über einen Tweet | 83 | - über einen Tweet |
84 | - in deine Shaarli | 84 | - in deine Shaarli |
85 | - in deine Scuttle | ||
85 | - mit einem Beitrag auf Diaspora* | 86 | - mit einem Beitrag auf Diaspora* |
86 | - an Carrot | 87 | - an Carrot |
87 | - mit einer E-Mail | 88 | - mit einer E-Mail |
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 0de6b6de..403ff6e0 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst | |||
@@ -4,7 +4,7 @@ Installation von wallabag | |||
4 | Voraussetzungen | 4 | Voraussetzungen |
5 | --------------- | 5 | --------------- |
6 | 6 | ||
7 | wallabag ist kompatibel mit PHP >= 5.5, inkl. PHP 7. | 7 | wallabag ist kompatibel mit **PHP >= 5.6**, inkl. PHP 7. |
8 | 8 | ||
9 | .. note:: | 9 | .. note:: |
10 | 10 | ||
@@ -105,6 +105,14 @@ Kommando, um den Container zu starten | |||
105 | 105 | ||
106 | docker pull wallabag/wallabag | 106 | docker pull wallabag/wallabag |
107 | 107 | ||
108 | Cloudron Installation | ||
109 | ~~~~~~~~~~~~~~~~~~~~~~~~ | ||
110 | |||
111 | Cloudron bietet einfache Webapp Installation auf deinem Server, mit Fokus auf System Administrator Automatisierung und Updates. | ||
112 | Ein Wallabag Paket ist direkt zur Installation durch den Cloudron Store verfügbar. | ||
113 | |||
114 | `Installiere wallabag auf deinem Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__ | ||
115 | |||
108 | Virtualhosts | 116 | Virtualhosts |
109 | ------------ | 117 | ------------ |
110 | 118 | ||
diff --git a/docs/en/user/articles.rst b/docs/en/user/articles.rst index 16b3b0d2..6e24d4fb 100644 --- a/docs/en/user/articles.rst +++ b/docs/en/user/articles.rst | |||
@@ -86,6 +86,7 @@ Now, you can share the article: | |||
86 | - with a public URL (you'll have a light view of the article) | 86 | - with a public URL (you'll have a light view of the article) |
87 | - with a tweet | 87 | - with a tweet |
88 | - into your Shaarli | 88 | - into your Shaarli |
89 | - into your Scuttle | ||
89 | - with a post in Diaspora* | 90 | - with a post in Diaspora* |
90 | - to Carrot | 91 | - to Carrot |
91 | - with an email | 92 | - with an email |
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 2b730b83..81c563f0 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -4,7 +4,7 @@ Install wallabag | |||
4 | Requirements | 4 | Requirements |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | wallabag is compatible with PHP >= 5.5, including PHP 7. | 7 | wallabag is compatible with **PHP >= 5.6**, including PHP 7. |
8 | 8 | ||
9 | .. note:: | 9 | .. note:: |
10 | 10 | ||
@@ -104,6 +104,14 @@ Command to launch container | |||
104 | 104 | ||
105 | docker pull wallabag/wallabag | 105 | docker pull wallabag/wallabag |
106 | 106 | ||
107 | Installation on Cloudron | ||
108 | ~~~~~~~~~~~~~~~~~~~~~~~~ | ||
109 | |||
110 | Cloudron provides an easy way to install webapps on your server with a focus on sysadmin automation and keeping apps updated. | ||
111 | wallabag is packaged as a Cloudron app and available to install directly from the store. | ||
112 | |||
113 | `Install wallabag on your Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__ | ||
114 | |||
107 | Virtual hosts | 115 | Virtual hosts |
108 | ------------- | 116 | ------------- |
109 | 117 | ||
@@ -155,9 +163,9 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w | |||
155 | ErrorLog /var/log/apache2/wallabag_error.log | 163 | ErrorLog /var/log/apache2/wallabag_error.log |
156 | CustomLog /var/log/apache2/wallabag_access.log combined | 164 | CustomLog /var/log/apache2/wallabag_access.log combined |
157 | </VirtualHost> | 165 | </VirtualHost> |
158 | 166 | ||
159 | 167 | ||
160 | .. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : | 168 | .. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : |
161 | 169 | ||
162 | :: | 170 | :: |
163 | 171 | ||
@@ -166,12 +174,12 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w | |||
166 | Allow from All | 174 | Allow from All |
167 | 175 | ||
168 | 176 | ||
169 | by | 177 | by |
170 | 178 | ||
171 | :: | 179 | :: |
172 | 180 | ||
173 | Require All granted | 181 | Require All granted |
174 | 182 | ||
175 | 183 | ||
176 | After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. | 184 | After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld. |
177 | 185 | ||
diff --git a/docs/fr/user/articles.rst b/docs/fr/user/articles.rst index fb5b3837..c9c2b88a 100644 --- a/docs/fr/user/articles.rst +++ b/docs/fr/user/articles.rst | |||
@@ -92,6 +92,7 @@ Vous pouvez maintenant le partager : | |||
92 | - avec une URL publique (vous obtiendrez une vue allégée de l'article) | 92 | - avec une URL publique (vous obtiendrez une vue allégée de l'article) |
93 | - avec un tweet | 93 | - avec un tweet |
94 | - dans votre Shaarli | 94 | - dans votre Shaarli |
95 | - dans votre Scuttle | ||
95 | - avec un message dans Diaspora* | 96 | - avec un message dans Diaspora* |
96 | - sur Carrot | 97 | - sur Carrot |
97 | - avec un email | 98 | - avec un email |
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 5d29cb01..9ef8aa11 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
@@ -4,7 +4,7 @@ Installer wallabag | |||
4 | Pré-requis | 4 | Pré-requis |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | wallabag est compatible avec PHP >= 5.5, PHP 7 inclus. | 7 | wallabag est compatible avec **PHP >= 5.6**, PHP 7 inclus. |
8 | 8 | ||
9 | .. note:: | 9 | .. note:: |
10 | 10 | ||
@@ -101,6 +101,14 @@ Commande pour démarrer le containeur | |||
101 | 101 | ||
102 | docker pull wallabag/wallabag | 102 | docker pull wallabag/wallabag |
103 | 103 | ||
104 | Installation sur Cloudron | ||
105 | ~~~~~~~~~~~~~~~~~~~~~~~~ | ||
106 | |||
107 | Cloudron permet d'installer des applications web sur votre serveur | ||
108 | wallabag est proposé en tant qu'application Cloudron et est disponible directement depuis le store. | ||
109 | |||
110 | `Installer wallabag sur Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__ | ||
111 | |||
104 | Virtual hosts | 112 | Virtual hosts |
105 | ------------- | 113 | ------------- |
106 | 114 | ||
@@ -162,12 +170,12 @@ En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wall | |||
162 | Allow from All | 170 | Allow from All |
163 | 171 | ||
164 | 172 | ||
165 | par | 173 | par |
166 | 174 | ||
167 | :: | 175 | :: |
168 | 176 | ||
169 | Require All granted | 177 | Require All granted |
170 | 178 | ||
171 | 179 | ||
172 | 180 | ||
173 | 181 | ||
diff --git a/docs/it/user/articles.rst b/docs/it/user/articles.rst index 944b23ef..8220ad32 100644 --- a/docs/it/user/articles.rst +++ b/docs/it/user/articles.rst | |||
@@ -83,6 +83,7 @@ Ora potete condividere l'articolo: | |||
83 | - attraverso una URL pubblica (avrete una vista semplificata dell'articolo) | 83 | - attraverso una URL pubblica (avrete una vista semplificata dell'articolo) |
84 | - attraverso un tweet | 84 | - attraverso un tweet |
85 | - nel vostro Shaarli | 85 | - nel vostro Shaarli |
86 | - nel vostro Scuttle | ||
86 | - attraverso un post su Diaspora* | 87 | - attraverso un post su Diaspora* |
87 | - su Carrot | 88 | - su Carrot |
88 | - attraverso un'email | 89 | - attraverso un'email |
diff --git a/docs/it/user/installation.rst b/docs/it/user/installation.rst index a79a31d3..8b54fe2c 100644 --- a/docs/it/user/installation.rst +++ b/docs/it/user/installation.rst | |||
@@ -103,6 +103,13 @@ Comando per avviare il container | |||
103 | 103 | ||
104 | docker pull wallabag/wallabag | 104 | docker pull wallabag/wallabag |
105 | 105 | ||
106 | Installazione su Cloudron | ||
107 | ~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
108 | |||
109 | Cloudron fornisce un modo facile di installare webapps sul vostro server mirato ad automatizzare i compiti del sysadmin ed a mantenere le app aggiornate. | ||
110 | wallabag é pacchettizzata come app Cloudron ed é disponibile all'installazione direttamente dallo store. | ||
111 | |||
112 | `Installa wallabag sul tuo Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__ | ||
106 | 113 | ||
107 | Host virtuali | 114 | Host virtuali |
108 | ------------- | 115 | ------------- |