Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / docs / en / user / parameters.rst

diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst
index 2b02a34dba4d348c2c7b3de5c597be163fe65115..eb312f7ea79f0950a32bcd19345ff87a0771011d 100644 (file)
--- a/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@ -55,6 +55,7 @@ Meaning of each parameter
    "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"
    "database_table_prefix", "wallabag_", "all wallabag's tables will be prefixed with that string. You can include a ``_`` for clarity"
    "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)"
+   "database_charset", "utf8mb4", "For PostgreSQL & SQLite you should use utf8, for MySQL use utf8mb4 which handle emoji"
 
 .. csv-table:: Configuration to send emails from wallabag
    :header: "name", "default", "description"