aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-11-06 09:52:09 +0100
committerGitHub <noreply@github.com>2016-11-06 09:52:09 +0100
commit24692715de6be93d3d01606624003cef4d170133 (patch)
treec4fa1c377a1eacb655540305579e694a16b563fb
parent16037570bfd406f6503d51a94e0362cbbdc3600d (diff)
parent0c256e2e707c4c4627b737e33166639c6ec867b7 (diff)
downloadwallabag-24692715de6be93d3d01606624003cef4d170133.tar.gz
wallabag-24692715de6be93d3d01606624003cef4d170133.tar.zst
wallabag-24692715de6be93d3d01606624003cef4d170133.zip
Merge pull request #2546 from wallabag/update-parameters-doc
Updated default parameters.yml file in documentation
-rw-r--r--docs/de/user/upgrade-2.0.x-2.1.1.rst3
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.1.rst3
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.1.1.rst3
3 files changed, 9 insertions, 0 deletions
diff --git a/docs/de/user/upgrade-2.0.x-2.1.1.rst b/docs/de/user/upgrade-2.0.x-2.1.1.rst
index db81a1be..d5ab477a 100644
--- a/docs/de/user/upgrade-2.0.x-2.1.1.rst
+++ b/docs/de/user/upgrade-2.0.x-2.1.1.rst
@@ -47,6 +47,7 @@ Bitte beachte, dass wir in dieser Version neue Parameter hinzugefügt haben. Du
47 database_password: null 47 database_password: null
48 database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' 48 database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite'
49 database_table_prefix: wallabag_ 49 database_table_prefix: wallabag_
50 database_socket: null
50 mailer_transport: smtp 51 mailer_transport: smtp
51 mailer_host: 127.0.0.1 52 mailer_host: 127.0.0.1
52 mailer_user: null 53 mailer_user: null
@@ -63,8 +64,10 @@ Bitte beachte, dass wir in dieser Version neue Parameter hinzugefügt haben. Du
63 rabbitmq_port: 5672 64 rabbitmq_port: 5672
64 rabbitmq_user: guest 65 rabbitmq_user: guest
65 rabbitmq_password: guest 66 rabbitmq_password: guest
67 redis_scheme: tcp
66 redis_host: localhost 68 redis_host: localhost
67 redis_port: 6379 69 redis_port: 6379
70 redis_path: null
68 71
69Du kannst `hier eine Dokumentation über die Parameter finden <http://doc.wallabag.org/en/master/user/parameters.html>`_. 72Du kannst `hier eine Dokumentation über die Parameter finden <http://doc.wallabag.org/en/master/user/parameters.html>`_.
70 73
diff --git a/docs/en/user/upgrade-2.0.x-2.1.1.rst b/docs/en/user/upgrade-2.0.x-2.1.1.rst
index 4f9b9cee..3b39fc8c 100644
--- a/docs/en/user/upgrade-2.0.x-2.1.1.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.1.rst
@@ -46,6 +46,7 @@ Please check that your ``app/config/parameters.yml`` contains all the required p
46 database_password: null 46 database_password: null
47 database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' 47 database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite'
48 database_table_prefix: wallabag_ 48 database_table_prefix: wallabag_
49 database_socket: null
49 mailer_transport: smtp 50 mailer_transport: smtp
50 mailer_host: 127.0.0.1 51 mailer_host: 127.0.0.1
51 mailer_user: null 52 mailer_user: null
@@ -62,8 +63,10 @@ Please check that your ``app/config/parameters.yml`` contains all the required p
62 rabbitmq_port: 5672 63 rabbitmq_port: 5672
63 rabbitmq_user: guest 64 rabbitmq_user: guest
64 rabbitmq_password: guest 65 rabbitmq_password: guest
66 redis_scheme: tcp
65 redis_host: localhost 67 redis_host: localhost
66 redis_port: 6379 68 redis_port: 6379
69 redis_path: null
67 70
68You can find `here a documentation about parameters <http://doc.wallabag.org/en/master/user/parameters.html>`_. 71You can find `here a documentation about parameters <http://doc.wallabag.org/en/master/user/parameters.html>`_.
69 72
diff --git a/docs/fr/user/upgrade-2.0.x-2.1.1.rst b/docs/fr/user/upgrade-2.0.x-2.1.1.rst
index ec883d10..f74c2fcd 100644
--- a/docs/fr/user/upgrade-2.0.x-2.1.1.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.1.1.rst
@@ -45,6 +45,7 @@ Vérifiez que votre fichier ``app/config/parameters.yml`` contient tous les para
45 database_password: null 45 database_password: null
46 database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' 46 database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite'
47 database_table_prefix: wallabag_ 47 database_table_prefix: wallabag_
48 database_socket: null
48 mailer_transport: smtp 49 mailer_transport: smtp
49 mailer_host: 127.0.0.1 50 mailer_host: 127.0.0.1
50 mailer_user: null 51 mailer_user: null
@@ -61,8 +62,10 @@ Vérifiez que votre fichier ``app/config/parameters.yml`` contient tous les para
61 rabbitmq_port: 5672 62 rabbitmq_port: 5672
62 rabbitmq_user: guest 63 rabbitmq_user: guest
63 rabbitmq_password: guest 64 rabbitmq_password: guest
65 redis_scheme: tcp
64 redis_host: localhost 66 redis_host: localhost
65 redis_port: 6379 67 redis_port: 6379
68 redis_path: null
66 69
67Vous trouverez `ici une documentation détaillée concernant les paramètres <http://doc.wallabag.org/fr/master/user/parameters.html>`_. 70Vous trouverez `ici une documentation détaillée concernant les paramètres <http://doc.wallabag.org/fr/master/user/parameters.html>`_.
68 71