Merge branch 'develop' into 'develop'

Clarify the description of the `logo_mask` configuration key.

See merge request pleroma/pleroma!747

diff --combined docs/config.md
index 902c1e18850b34aeac02546baf23f2056f9af5cc,1d76f9ce4bc47f4016825c763b4122e6c3f40591..22a9b23f9258b3657d6112bcb53c9043eff88adb
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -123,7 -123,7 +123,7 @@@ This section is used to configure Plero
  
  * `theme`: Which theme to use, they are defined in ``styles.json``
  * `logo`: URL of the logo, defaults to Pleroma’s logo
- * `logo_mask`: Whenether to mask the logo
+ * `logo_mask`: Whether to use only the logo's shape as a mask (true) or as a regular image (false)
  * `logo_margin`: What margin to use around the logo
  * `background`: URL of the background, unless viewing a user profile with a background that is set
  * `redirect_root_no_login`: relative URL which indicates where to redirect when a user isn’t logged in.
@@@ -235,9 -235,6 +235,9 @@@ curl "http://localhost:4000/api/pleroma
    * Pleroma.Web.Metadata.Providers.TwitterCard
  * `unfurl_nsfw`: If set to `true` nsfw attachments will be shown in previews
  
 +## :rich_media
 +* `enabled`: if enabled the instance will parse metadata from attached links to generate link previews
 +
  ## :hackney_pools
  
  Advanced. Tweaks Hackney (http client) connections pools.