diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
| commit | 425324aae3d4534bc045466a1cc15653ddfa27d2 (patch) | |
| tree | 2d785eb4396e2dc79bb6b0bed5d766b393479dd5 /docs | |
| parent | 73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (diff) | |
| parent | 073f5490ece616fd9602382c1be1347457cbbe79 (diff) | |
| download | pleroma-425324aae3d4534bc045466a1cc15653ddfa27d2.tar.gz pleroma-425324aae3d4534bc045466a1cc15653ddfa27d2.zip | |
Merge branch 'release/2.1.1' into 'stable'
2.1.1 release
See merge request pleroma/secteam/pleroma!13
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 3 | ||||
| -rw-r--r-- | docs/installation/freebsd_en.md | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 2f440adf4..b2980793d 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -352,8 +352,6 @@ config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http, * `providers`: a list of metadata providers to enable. Providers available: * `Pleroma.Web.Metadata.Providers.OpenGraph` * `Pleroma.Web.Metadata.Providers.TwitterCard` - * `Pleroma.Web.Metadata.Providers.RelMe` - add links from user bio with rel=me into the `<header>` as `<link rel=me>`. - * `Pleroma.Web.Metadata.Providers.Feed` - add a link to a user's Atom feed into the `<header>` as `<link rel=alternate>`. * `unfurl_nsfw`: If set to `true` nsfw attachments will be shown in previews. ### :rich_media (consumer) @@ -361,6 +359,7 @@ config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http, * `ignore_hosts`: list of hosts which will be ignored by the metadata parser. For example `["accounts.google.com", "xss.website"]`, defaults to `[]`. * `ignore_tld`: list TLDs (top-level domains) which will ignore for parse metadata. default is ["local", "localdomain", "lan"]. * `parsers`: list of Rich Media parsers. +* `failure_backoff`: Amount of milliseconds after request failure, during which the request will not be retried. ## HTTP server diff --git a/docs/installation/freebsd_en.md b/docs/installation/freebsd_en.md index 130d68766..ca2575d9b 100644 --- a/docs/installation/freebsd_en.md +++ b/docs/installation/freebsd_en.md @@ -7,7 +7,7 @@ This document was written for FreeBSD 12.1, but should be work on future release This assumes the target system has `pkg(8)`. ``` -# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh +# pkg install elixir postgresql12-server postgresql12-client postgresql12-contrib git-lite sudo nginx gmake acme.sh cmake ``` Copy the rc.d scripts to the right directory: |