From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sat, 11 Feb 2023 10:49:01 +0000 (+0000)
Subject: Merge branch 'develop' into stable
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=81caf7722310d4fc9e570823d5206dec28479ea5;hp=439e915531f579424ae90c5308eb5eadabac7604;p=akkoma

Merge branch 'develop' into stable
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d66959efb..e79c205ba 100644
--- 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 d0c955e1a..cbfc32d58 100644
--- 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