Merge remote-tracking branch 'upstream/develop' into user-contact

[friendica.git] / doc / FAQ.md

diff --git a/doc/FAQ.md b/doc/FAQ.md
index ec8c26d7c86e4538aab419fb4c522bdfe4d4bb5b..dd053eba05c51f06244d4d2852b2676704b590cc 100644 (file)
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -35,7 +35,7 @@ If this FAQ does not answer your question you can always reach out to the commun
   * Friendica Support Forum: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
   * Community chat rooms (the IRC, Matrix and XMPP rooms are bridged) these public chats are logged [from IRC](https://gnusociarg.nsupdate.info/2021/%23friendica/) and [Matrix](https://view.matrix.org/alias/%23friendi.ca:matrix.org/)
     * XMPP: support(at)forum.friendi.ca
-    * IRC: #friendica at libera.chat or  [#friendica at freenode.net](https://webchat.freenode.net/?settings=#friendica)
+    * IRC: #friendica at [libera.chat](https://web.libera.chat/?channels=#friendica)
     * Matrix: [#friendica-en:matrix.org](https://matrix.to/#/#friendica-en:matrix.org) or [#friendi.ca:matrix.org](https://matrix.to/#/#friendi.ca:matrix.org)
   * [Mailing List](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca)
   <!--- * [XMPP](xmpp:support@forum.friendi.ca?join)
@@ -210,9 +210,9 @@ Here is a list of known working clients:
 
 #### iOS
 
-* [Amaroq](https://github.com/ReticentJohn/Amaroq/tree/master)
 * [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
 * [Fedi](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281)
+* [Metatext](https://apps.apple.com/app/metatext/id1523996615)
 * [Roma](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699)
 * [StarPterano](https://apps.apple.com/de/app/starpterano/id1436972796) Uses an OAuth method where you have to manually copy and paste the provided code.
 * [Stella](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048?l=ms)
@@ -227,7 +227,7 @@ Here is a list of known working clients:
 * [Toot](https://toot.readthedocs.io/en/latest/)
 * [Tootle](https://github.com/bleakgrey/tootle)
 
-#### MacOS
+#### macOS
 
 - [Mastonaut](https://mastonaut.app/)
 
@@ -237,7 +237,7 @@ Here is a list of known working clients:
 
 Depending on the features of the client you might encounter some glitches in usability, like being limited in the length of your postings to 140 characters and having no access to the [permission settings](help/Groups-and-Privacy).
 
-#### Desktop
+#### Web Frontend
 
 - [Halcyon](https://www.halcyon.social/)
 - [Pinafore](https://github.com/nolanlawson/pinafore)