aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-10-13 16:53:13 +0200
committerGitHub <noreply@github.com>2016-10-13 16:53:13 +0200
commit8b28151e1426fc884cc34b444f9b182a1a0b6001 (patch)
tree3fcbd29b74a6318f66202ce5201b32f373cee4f1 /docs/en
parente65c27587b940ef8de88578e57f109b5b7819684 (diff)
parent75a1506c276a43f0d3ad65ac1436329e9d5c8c0f (diff)
downloadwallabag-8b28151e1426fc884cc34b444f9b182a1a0b6001.tar.gz
wallabag-8b28151e1426fc884cc34b444f9b182a1a0b6001.tar.zst
wallabag-8b28151e1426fc884cc34b444f9b182a1a0b6001.zip
Merge pull request #2434 from wallabag/parameters-doc
Added french documentation for parameters.yml
Diffstat (limited to 'docs/en')
-rw-r--r--docs/en/index.rst1
-rw-r--r--docs/en/user/parameters.rst6
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 4e346ae6..6d85db2b 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -45,6 +45,7 @@ The documentation is available in other languages:
45 user/filters 45 user/filters
46 user/tags 46 user/tags
47 user/android 47 user/android
48 user/parameters
48 49
49.. _dev-docs: 50.. _dev-docs:
50 51
diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst
index 79c50871..6cbd5ae4 100644
--- a/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@ -9,9 +9,9 @@ What is the meaning of the parameters?
9 "database_name", "symfony", "name of your database" 9 "database_name", "symfony", "name of your database"
10 "database_user", "root", "user that can write to this database" 10 "database_user", "root", "user that can write to this database"
11 "database_password", "~", "password of that user" 11 "database_password", "~", "password of that user"
12 "database_path", "``""%kernel.root_dir%/../data/db/wallabag.sqlite""``", "only for SQLite, define where to put the database file. Leave it for other database" 12 "database_path", "``""%kernel.root_dir%/../data/db/wallabag.sqlite""``", "only for SQLite, define where to put the database file. Leave it empty for other database"
13 "database_table_prefix", "wallabag_", "all wallabag's tables will be prefixed with that string. You can include a ``_`` for clarity" 13 "database_table_prefix", "wallabag_", "all wallabag's tables will be prefixed with that string. You can include a ``_`` for clarity"
14 "database_socket", "null", "If your database is using a socket instead of tcp, put the path of the socket (other connection parameters will then be ignored" 14 "database_socket", "null", "If your database is using a socket instead of tcp, put the path of the socket (other connection parameters will then be ignored)"
15 15
16.. csv-table:: Configuration to send emails from wallabag 16.. csv-table:: Configuration to send emails from wallabag
17 :header: "name", "default", "description" 17 :header: "name", "default", "description"
@@ -38,7 +38,7 @@ What is the meaning of the parameters?
38 38
39 "rabbitmq_host", "localhost", "Host of your RabbitMQ" 39 "rabbitmq_host", "localhost", "Host of your RabbitMQ"
40 "rabbitmq_port", "5672", "Port of your RabbitMQ" 40 "rabbitmq_port", "5672", "Port of your RabbitMQ"
41 "rabbitmq_user", "guest", "Usee that can read queues" 41 "rabbitmq_user", "guest", "User that can read queues"
42 "rabbitmq_password", "guest", "Password of that user" 42 "rabbitmq_password", "guest", "Password of that user"
43 43
44.. csv-table:: Redis configuration 44.. csv-table:: Redis configuration