Don't continue when key couldn't be created

[friendica.git] / doc / FAQ.md

diff --git a/doc/FAQ.md b/doc/FAQ.md
index 2bbe209592e4b0f1d0f8c6b106ef96531bf47654..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)
@@ -183,7 +183,7 @@ Example: Friendica Support
 ### What friendica clients can I use?
 
 Friendica is using a [Twitter/GNU Social compatible API](help/api), which means you can use any Twitter/GNU Social client for your platform as long as you can change the API path in its settings.
-Since the 2021.06 release, Friendica also supports the [Mastodon API](help/API-Mastodon) which works with a lot of Mastodon clients.
+Since the 2021.06 release, Friendica also supports the [Mastodon API](help/API-Mastodon) which works with many Mastodon clients.
 Here is a list of known working clients:
 
 #### Android
@@ -200,16 +200,19 @@ Here is a list of known working clients:
 * [Tooot](https://tooot.app/)
 * [Tusky](https://tusky.app)
 * [Twidere](https://dimension.im/) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex), [GitHub](https://github.com/TwidereProject/Twidere-Android))
+* [TwidereX](https://github.com/TwidereProject/TwidereX-Android)
 * [twitlatte](https://github.com/moko256/twitlatte)
 * [Yuito](https://github.com/accelforce/Yuito)
 
 #### SailfishOS
+
 * [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
+
 #### 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)
@@ -223,11 +226,22 @@ Here is a list of known working clients:
 * [TheDesk](https://ja.mstdn.wiki/TheDesk)
 * [Toot](https://toot.readthedocs.io/en/latest/)
 * [Tootle](https://github.com/bleakgrey/tootle)
+
+#### macOS
+
+- [Mastonaut](https://mastonaut.app/)
+
 #### Windows
+
 * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) (Windows 10)
 
 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).
 
+#### Web Frontend
+
+- [Halcyon](https://www.halcyon.social/)
+- [Pinafore](https://github.com/nolanlawson/pinafore)
+
 Admin
 --------