Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...

[akkoma] / docs / config.md

diff --git a/docs/config.md b/docs/config.md
index 1c3219efee3498f6fa13f4a1d71af62549a55a5c..f1bb8d86c5a5735283b2ecdc4b6e5e898a5af016 100644 (file)
--- a/docs/config.md
+++ b/docs/config.md
@@ -93,6 +93,11 @@ config :pleroma, Pleroma.Mailer,
 * `always_show_subject_input`: When set to false, auto-hide the subject field when it's empty.
 * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with
     older software for theses nicknames.
+* `max_pinned_statuses`: The maximum number of pinned statuses. `0` will disable the feature.
+
+## :logger
+* `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog
+See: [logger’s documentation](https://hexdocs.pm/logger/Logger.html) and [ex_syslogger’s documentation](https://hexdocs.pm/ex_syslogger/)
 
 ## :fe
 This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:instance`` is set to false.