Merge branch 'develop' into stable

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e72b0d055d507e8fca6c74da6ddfa07764c9747..81217bc926ddab407b364ef011a1f84a060ad136 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -142,6 +142,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## 2022.08
 
+### Removed
+- Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
+
+## 2022.08
+
 ### Added
 - extended runtime module support, see config cheatsheet
 - quote posting; quotes are limited to public posts

diff --git a/docs/docs/administration/updating.md b/docs/docs/administration/updating.md
index d0c955e1a311681845a618ece9b7691453c6df8c..cbfc32d58ab5bf8f459a042dff0fa7cd35c2d005 100644 (file)
--- a/docs/docs/administration/updating.md
+++ b/docs/docs/administration/updating.md
@@ -26,7 +26,7 @@ su -s "$SHELL" akkoma
 # Run database migrations
 ./bin/pleroma_ctl migrate
 
-# Update frontend(s). See Frontend Configuration doc for more information.
+# Update Pleroma-FE frontend to latest stable. For other Frontends see Frontend Configration doc for more information.
 ./bin/pleroma_ctl frontend install pleroma-fe --ref stable
 
 # Start akkoma