Merge pull request #10128 from annando/post-type

[friendica.git] / doc / FAQ.md

diff --git a/doc/FAQ.md b/doc/FAQ.md
index 495a0ef6222add11b39048e39d5aa7b03b066572..eda41d5abb1b35f63c0bdd9fd539be2796a8b061 100644 (file)
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -32,11 +32,16 @@ User
 
 If this FAQ does not answer your question you can always reach out to the community via the following options:
 
-  * [Friendica Support Forum](https://forum.friendi.ca/~helpers)
-  * [XMPP](xmpp://support@forum.friendi.ca?join)
-  * [IRC](https://webchat.freenode.net/?settings=#friendica)
-  * [Matrix](https://matrix.to/#/#friendica-en:matrix.org)
+  * Friendica Support Forum: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
+  * XMPP: support(at)forum.friendi.ca
+  * IRC: [#friendica at freenode.net](https://webchat.freenode.net/?settings=#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)
+       https://github.com/github/markup/issues/202
+       https://github.com/gjtorikian/html-pipeline/pull/307
+       https://github.com/github/opensource.guide/pull/807
+  --->
 
 <a name="ssl"></a>
 ### Why do I get warnings about SSL certificates?