aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-24 10:10:38 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-24 10:10:38 +0200
commitf623516e107c8146f87d815f033cecb5d812466a (patch)
treecc892d2b32f0c21679935c1bc544f1c91ee6a530
parent5ce1528953998ee2957cd548ee123870b82f4079 (diff)
downloadwallabag-f623516e107c8146f87d815f033cecb5d812466a.tar.gz
wallabag-f623516e107c8146f87d815f033cecb5d812466a.tar.zst
wallabag-f623516e107c8146f87d815f033cecb5d812466a.zip
SQLite should use utf8, not utf8mb4
-rw-r--r--app/config/parameters_test.yml2
-rw-r--r--docs/en/user/parameters.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 3111da47..5f2e25bb 100644
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -6,4 +6,4 @@ parameters:
6 test_database_user: null 6 test_database_user: null
7 test_database_password: null 7 test_database_password: null
8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite' 8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
9 test_database_charset: utf8mb4 9 test_database_charset: utf8
diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst
index c4345b74..2fca020e 100644
--- a/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@ -11,8 +11,8 @@ What is the meaning of the parameters?
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 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 you should use utf8, for other use utf8mb4 which handle emoji" 15 "database_charset", "utf8mb4", "For PostgreSQL & SQLite you should use utf8, for MySQL use utf8mb4 which handle emoji"
16 16
17.. csv-table:: Configuration to send emails from wallabag 17.. csv-table:: Configuration to send emails from wallabag
18 :header: "name", "default", "description" 18 :header: "name", "default", "description"