diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-10 19:06:13 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-10 19:06:13 +0000 |
| commit | 729321ad20c7c4996b10ac86362a49f6d4cf0841 (patch) | |
| tree | 7feabd51f1dabbc6f6b852ff753f8ed8888c7717 | |
| parent | ff10b9927b11bbf42d623fd5cb18039d0db9aa3f (diff) | |
| parent | 100a06afe1151cad880a611dfa48700d2aaf8f6a (diff) | |
| download | pleroma-729321ad20c7c4996b10ac86362a49f6d4cf0841.tar.gz | |
Merge branch 'fix/config-md-typos' into 'develop'
config.md: Fix typos and add `federating` option description
See merge request pleroma/pleroma!525
| -rw-r--r-- | config/config.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/config.md b/config/config.md index a32c4cbde..5b30ddc27 100644 --- a/config/config.md +++ b/config/config.md @@ -41,9 +41,9 @@ This filter replaces the filename (not the path) of an upload. For complete obfu * `upload_limit`: File size limit of uploads (except for avatar, background, banner) * `avatar_upload_limit`: File size limit of user’s profile avatars * `background_upload_limit`: File size limit of user’s profile backgrounds -* `banner_upload_limit`: File size limit of user’s profile backgrounds -* `registerations_open`: Enable registerations for anyone, invitations can be used when false. -* `federating` +* `banner_upload_limit`: File size limit of user’s profile banners +* `registrations_open`: Enable registrations for anyone, invitations can be used when false. +* `federating`: Enable federation with other instances * `allow_relay`: Enable Pleroma’s Relay, which makes it possible to follow a whole instance * `rewrite_policy`: Message Rewrite Policy, either one or a list. Here are the ones available by default: * `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`: Doesn’t modify activities (default) |