Merge branch 'fix/config-md-typos' into 'develop'

config.md: Fix typos and add  `federating` option description

See merge request pleroma/pleroma!525
This commit is contained in:
lambda 2018-12-10 19:06:13 +00:00
commit 729321ad20

View file

@ -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) * `upload_limit`: File size limit of uploads (except for avatar, background, banner)
* `avatar_upload_limit`: File size limit of users profile avatars * `avatar_upload_limit`: File size limit of users profile avatars
* `background_upload_limit`: File size limit of users profile backgrounds * `background_upload_limit`: File size limit of users profile backgrounds
* `banner_upload_limit`: File size limit of users profile backgrounds * `banner_upload_limit`: File size limit of users profile banners
* `registerations_open`: Enable registerations for anyone, invitations can be used when false. * `registrations_open`: Enable registrations for anyone, invitations can be used when false.
* `federating` * `federating`: Enable federation with other instances
* `allow_relay`: Enable Pleromas Relay, which makes it possible to follow a whole instance * `allow_relay`: Enable Pleromas 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: * `rewrite_policy`: Message Rewrite Policy, either one or a list. Here are the ones available by default:
* `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`: Doesnt modify activities (default) * `Pleroma.Web.ActivityPub.MRF.NoOpPolicy`: Doesnt modify activities (default)