Merge branch 'dev'

2 files changed, 13 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 084715858..7fc481681 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+Hubzilla 8.8.5 (2024-01-01)
+	Fix possible loop if DB is not reachable (introduced in 8.8.3)
+	Fix some errors and deprecation warnings with PHP 8.2
+	Deprecate simplepie idna_convert in favor of PHP native function
+	Fix double processed quoted strings in get_tags()
+
+
 Hubzilla 8.8.4 (2023-12-20)
 	- Fix regression introduced in version 8.8.3
 	- Add test for Lib/Config
diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md
index 132e8b63d..0cc6b4c0f 100644
--- a/doc/admin/administrator_guide.md
+++ b/doc/admin/administrator_guide.md
@@ -85,16 +85,16 @@ There are several ways to deploy a new hub.
   Example config scripts are available for these platforms in doc/install.
   Apache and nginx have the most support.
 
-* PHP 7.1 or later.
- * Note that on some shared hosting environments, the _command line_
-   version of PHP might differ from the _webserver_ version
+* PHP 8.1 or later.
+  Note that on some shared hosting environments, the _command line_
+  version of PHP might differ from the _webserver_ version
 
 * PHP *command line* access with register_argc_argv set to true in the
-  php.ini file * and with no hosting provider restrictions on the use of
+  php.ini file, and with no hosting provider restrictions on the use of
   exec() and proc_open().
 
-* curl, gd (with at least jpeg and png support), mysqli, mbstring, zip,
-  and openssl extensions. The imagick extension is not required but desirable.
+* curl, gd (with at least jpeg and png support), pdo-mysql (or pdo-postgres), mbstring, zip,
+  and openssl extensions. The imagick extension is not required, but recommended.
 
 * xml extension is required if you want webdav to work.