diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-22 00:50:24 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-22 00:50:24 +0000 |
| commit | 1c3d3d0c2b6ebb4948df0b4ec085bcc4a564a126 (patch) | |
| tree | da2492e2a4d7e1202e82bff3fbe4d89ddd8b85c5 /docs | |
| parent | b548181b52c4397d5034cfd95b2ef7e05c9c9c22 (diff) | |
| parent | bf27190f7f0942a05de518f2085a299eb011614c (diff) | |
| download | pleroma-1c3d3d0c2b6ebb4948df0b4ec085bcc4a564a126.tar.gz | |
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/config.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/config.md b/docs/config.md index 4fa6bd62d..c1246ee25 100644 --- a/docs/config.md +++ b/docs/config.md @@ -101,7 +101,8 @@ config :pleroma, Pleroma.Mailer, * `no_attachment_links`: Set to true to disable automatically adding attachment link text to statuses * `welcome_message`: A message that will be send to a newly registered users as a direct message. * `welcome_user_nickname`: The nickname of the local user that sends the welcome message. -* `max_report_size`: The maximum size of the report comment (Default: `1000`) +* `max_report_comment_size`: The maximum size of the report comment (Default: `1000`) +* `safe_dm_mentions`: If set to true, only mentions at the beginning of a post will be used to address people in direct messages. This is to prevent accidental mentioning of people when talking about them (e.g. "@friend hey i really don't like @enemy"). (Default: `false`) ## :logger * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog |