diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
commit | 64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch) | |
tree | 311473a357e3dedd496e1417293eed9a2a116ad6 /docs/en/user/parameters.rst | |
parent | 9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff) | |
parent | c64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff) | |
download | wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'docs/en/user/parameters.rst')
-rw-r--r-- | docs/en/user/parameters.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst index 2fca020e..c35cf3b8 100644 --- a/docs/en/user/parameters.rst +++ b/docs/en/user/parameters.rst | |||
@@ -9,7 +9,7 @@ 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 | "database_charset", "utf8mb4", "For PostgreSQL & SQLite you should use utf8, for MySQL use utf8mb4 which handle emoji" | 15 | "database_charset", "utf8mb4", "For PostgreSQL & SQLite you should use utf8, for MySQL use utf8mb4 which handle emoji" |
@@ -39,7 +39,7 @@ What is the meaning of the parameters? | |||
39 | 39 | ||
40 | "rabbitmq_host", "localhost", "Host of your RabbitMQ" | 40 | "rabbitmq_host", "localhost", "Host of your RabbitMQ" |
41 | "rabbitmq_port", "5672", "Port of your RabbitMQ" | 41 | "rabbitmq_port", "5672", "Port of your RabbitMQ" |
42 | "rabbitmq_user", "guest", "Usee that can read queues" | 42 | "rabbitmq_user", "guest", "User that can read queues" |
43 | "rabbitmq_password", "guest", "Password of that user" | 43 | "rabbitmq_password", "guest", "Password of that user" |
44 | 44 | ||
45 | .. csv-table:: Redis configuration | 45 | .. csv-table:: Redis configuration |