diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-27 15:41:40 +0300 |
| commit | 20e0f3660541f19cf878b789aa9f5b9d5ce8cddb (patch) | |
| tree | 08cb90d62e431beb7ee6a2261dc679b725aec1f1 /docs/config.md | |
| parent | 2a95014b9d7142aa2549e70f428293af78fae8eb (diff) | |
| parent | 15aa94f40f73444d67da7cb71ec219b97ec5142e (diff) | |
| download | pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.tar.gz pleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/config.md b/docs/config.md index 201180373..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 @@ -190,6 +191,7 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i * `enabled`: Enables the gopher interface * `ip`: IP address to bind to * `port`: Port to bind to +* `dstport`: Port advertised in urls (optional, defaults to `port`) ## :activitypub * ``accept_blocks``: Whether to accept incoming block activities from other instances |