From eb4a93fa8a6ef1209d0ea7de72fff538c8e1c5ab Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 30 Jan 2021 07:50:03 +0100 Subject: [PATCH 1/6] unhinde location of the support channels so that they are visible when looking at the FAQ --- doc/FAQ.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 4d45877d8..f599dd7e4 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -32,10 +32,10 @@ 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) + * Friendica Support Forum [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers) * XMPP support(at)forum.friendi.ca - * [IRC](https://webchat.freenode.net/?settings=#friendica) - * [Matrix](https://matrix.to/#/#friendica-en:matrix.org) + * 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) + ### Warum erhalte ich Warnungen über fehlende Zertifikate? @@ -195,20 +214,6 @@ Hier ist eine Liste von Clients bei denen dies möglich ist, bzw. die speziell f * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) für Windows 10 * Hotot - -### Wo finde ich Hilfe? - -Wenn Du Probleme mit Deiner Friendica-Seite hast, dann kannst Du die Community in der [Friendica-Support-Gruppe](https://forum.friendi.ca/profile/helpers) fragen oder Dir das [deutsche Wiki](https://friendica-wiki.de/) anschauen. -Wenn Du Deinen Account nicht nutzen kannst, kannst Du entweder einen [Testaccount](https://tryfriendica.de) bzw. einen Account auf einer öffentlichen Seite ([Liste](https://dir.friendica.social/servers)) nutzen. - -Wenn du dir keinen weiteren Friendica Account einrichten willst, kannst du auch gerne über einen der folgenden alternativen Kanäle Hilfe suchen: - - * [Friendica Support Forum](https://forum.friendi.ca/~helpers) - * [Mailing List Archive](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) you can subscribe to the list by sending an email to ``support-request(at)friendi.ca?subject=subscribe`` - * XMPP/Jabber MUC: support(at)forum.friendi.ca - * IRC: #friendica at irc.freenode.net - * Matrix: #friendi.ca or #friendica at matrix.org. - Admin -------- From 04d55976f9c38f7bf56ec6d17cfeac5be1292611 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 30 Jan 2021 07:58:35 +0100 Subject: [PATCH 3/6] adopted the support channel locations for the starting page of the EN and DE help pages --- doc/Home.md | 4 ++-- doc/de/Home.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Home.md b/doc/Home.md index bd6fad747..f3da01642 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -70,8 +70,8 @@ Friendica Documentation and Resources * [Friendica Support Forum](https://forum.friendi.ca/~helpers) * [Mailing List Archive](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) you can subscribe to the list by sending an email to ``support-request(at)friendi.ca?subject=subscribe`` * XMPP/Jabber MUC: support(at)forum.friendi.ca - * IRC: #friendica at irc.freenode.net - * Matrix: #friendi.ca or #friendica at matrix.org + * IRC:[#friendica at freenode.net](https://webchat.freenode.net/?settings=#friendica) + * Matrix: [#friendi.ca](https://matrix.to/#/#friendi.ca:matrix.org) or [#friendica-en](https://matrix.to/#/#friendica-en:matrix.org) at matrix.org **About** diff --git a/doc/de/Home.md b/doc/de/Home.md index d008b90c3..5c03fa378 100644 --- a/doc/de/Home.md +++ b/doc/de/Home.md @@ -66,8 +66,8 @@ Friendica - Dokumentation und Ressourcen * [Friendica Support Forum](https://forum.friendi.ca/~helpers) * [Mailing Listen Archiv](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) zum Abonnieren der Liste eine E-Mail an ``support-request(at)friendi.ca?subject=subscribe`` senden * XMPP/Jabber MUC: support(at)forum.friendi.ca - * IRC: #friendica auf irc.freenode.net - * Matrix: #friendi.ca oder #friendica auf matrix.org + * IRC: [#friendica auf irc.freenode.net](https://webchat.freenode.net/?settings=#friendica) + * Matrix: [#friendi.ca](https://matrix.to/#/#friendi.ca:matrix.org) oder [#friendica-en](https://matrix.to/#/#friendica-en:matrix.org) auf matrix.org **Über diese Seite** From b938da9d6bfd8565d0803759297a1a4281694699 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 30 Jan 2021 08:03:57 +0100 Subject: [PATCH 4/6] clenup --- doc/FAQ.md | 8 ++++---- doc/Home.md | 4 ++-- doc/de/FAQ.md | 8 ++++---- doc/de/Home.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index f599dd7e4..eda41d5ab 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -32,10 +32,10 @@ User If this FAQ does not answer your question you can always reach out to the community via the following options: - * 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) + * 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)