Merge branch 'develop' into 'develop'

[akkoma] / config / config.md

diff --git a/config/config.md b/config/config.md
index 2401e9aedd6ffe92bc31626dc2efef5e2240d1e4..8282eab1480a443b88b6c466cdeb264e1d09aded 100644 (file)
--- a/config/config.md
+++ b/config/config.md
@@ -67,7 +67,8 @@ config :pleroma, Pleroma.Mailer,
 * `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 banners
-* `registrations_open`: Enable registrations for anyone, invitations can be used when false.
+* `registrations_open`: Enable registrations for anyone, invitations can be enabled when false.
+* `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: 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:
@@ -155,9 +156,9 @@ config :pleroma, :mrf_user_allowlist,
   "example.org": ["https://example.org/users/admin"]
 ```
 
-## :web_push_encryption
+## :web_push_encryption, :vapid_details
 
-Web Push Notifications configuration. You could use a mix task `mix web_push.gen.keypair` to generate it.
+Web Push Notifications configuration. You can use the mix task `mix web_push.gen.keypair` to generate it.
 
 * ``subject``: a mailto link for the administrative contact. It’s best if this email is not a personal email address, but rather a group email so that if a person leaves an organization, is unavailable for an extended period, or otherwise can’t respond, someone else on the list can.
 * ``public_key``: VAPID public key