diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index 04ce0fd1a..405604c75 100644
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@@ -6,7 +6,7 @@ Bugs and Issues
If your server has a support page, you should report any bugs/issues you encounter there first.
Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them.
Reducing the workload in this way helps us get new features faster.
-You can also contact the [friendica support forum](https://helpers.pyxis.uberspace.de/profile/helpers) and report your problem there.
+You can also contact the [friendica support forum](https://forum.friendi.ca/profile/helpers) and report your problem there.
Bugs are rarely limited to one person, and the chances are somebody from another node has encountered the problem too, and will be able to help you.
If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](https://github.com/friendica/friendica/issues).
diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md
index 137e5aaf5..be44e8187 100644
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@@ -15,14 +15,14 @@ Contact us
The discussion of Friendica development takes place in the following Friendica forums:
-* The main [forum for Friendica development](https://helpers.pyxis.uberspace.de/profile/developers)
+* The main [forum for Friendica development](https://forum.friendi.ca/profile/developers)
* The [forum for Friendica theme development](https://friendica.eu/profile/ftdevs)
Help other users
---
Remember the questions you had when you first tried Friendica?
-A good place to start can be to help new people find their way around Friendica in the [general support forum](https://helpers.pyxis.uberspace.de/profile/helpers).
+A good place to start can be to help new people find their way around Friendica in the [general support forum](https://forum.friendi.ca/prufile/helpers).
Welcome them, answer their questions, point them to documentation or ping other helpers directly if you can't help but think you know who can.
Translation
@@ -126,7 +126,7 @@ If you want to get involved here:
* Look at the first steps that were made (e.g. the clean theme).
Ask us to find out whom to talk to about their experiences.
* Talk to design people if you know any.
-* Let us know about your plans [in the dev forum](https://helpers.pyxis.uberspace.de/profile/developers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
+* Let us know about your plans [in the dev forum](https://forum.friendi.ca/profile/developers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
Do not worry about cross-posting.
###Client software
diff --git a/doc/FAQ.md b/doc/FAQ.md
index da58e09f7..be95ea364 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -139,7 +139,7 @@ RSS feed of your posts
Example: Friendica Support
- https://helpers.pyxis.uberspace.de/dfrn_poll/helpers
+ https://forum.friendi.ca/dfrn_poll/helpers
RSS feed of the conversations at your site
@@ -147,7 +147,7 @@ RSS feed of the conversations at your site
Example: Friendica Support
- https://helpers.pyxis.uberspace.de/dfrn_poll/helpers/converse
+ https://forum.friendi.ca/dfrn_poll/helpers/converse
@@ -175,7 +175,7 @@ Depending on the features of the client you might encounter some glitches in usa
###Where I can find help?
-If you have problems with your Friendica page, you can ask the community at the [Friendica Support Group](https://helpers.pyxis.uberspace.de/profile/helpers).
+If you have problems with your Friendica page, you can ask the community at the [Friendica Support Group](https://forum.friendi.ca/profile/helpers).
If you can't use your default profile you can use an account at a public site [list](https://dir.friendica.social/servers) or you can use the Librelist mailing list.
If you want to use the mailing list, please just send a mail to friendica AT librelist DOT com.
diff --git a/doc/Home.md b/doc/Home.md
index 4cecec44e..ce23f3e17 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -58,7 +58,7 @@ Friendica Documentation and Resources
**External Resources**
-* [Main Website](http://friendica.com)
+* [Main Website](https://friendi.ca)
* [Mailing List Archive](http://librelist.com/browser/friendica/)
**About**
diff --git a/doc/Improve-Performance.md b/doc/Improve-Performance.md
index 1128e41b1..8c0529bd5 100644
--- a/doc/Improve-Performance.md
+++ b/doc/Improve-Performance.md
@@ -3,7 +3,7 @@ How to improve the performance of a Friendica site
* [Home](help)
-Feel free to ask in the [Friendica support forum](https://helpers.pyxis.uberspace.de/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
+Feel free to ask in the [Friendica support forum](https://forum.friendi.ca/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
System configuration
--------
diff --git a/doc/Install.md b/doc/Install.md
index cda58fa6f..9b7b5a947 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -10,7 +10,7 @@ Not every PHP/MySQL hosting provider will be able to support Friendica.
Many will.
But **please** review the requirements and confirm these with your hosting provider prior to installation.
-Also if you encounter installation issues, please let us know via the [helper](http://helpers.pyxis.uberspace.de/profile/helpers) or the [developer](https://helpers.pyxis.uberspace.de/profile/developers) forum or [file an issue](https://github.com/friendica/friendica/issues).
+Also if you encounter installation issues, please let us know via the [helper](http://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) forum or [file an issue](https://github.com/friendica/friendica/issues).
Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future.
Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
If you do not have a Friendica account yet, you can register a temporary one at [tryfriendica.de](https://tryfriendica.de) and join the forums mentioned above from there.
diff --git a/doc/Quick-Start-andfinally.md b/doc/Quick-Start-andfinally.md
index e76eb7278..3e7845d10 100644
--- a/doc/Quick-Start-andfinally.md
+++ b/doc/Quick-Start-andfinally.md
@@ -5,7 +5,7 @@ Here are some more things to help get you started:
**Groups**
-- Friendica Support - problems? This is the place to ask.
+- Friendica Support - problems? This is the place to ask.
**Documentation**
diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md
index 52d56dce8..9feaaec09 100644
--- a/doc/de/FAQ.md
+++ b/doc/de/FAQ.md
@@ -150,7 +150,7 @@ RSS-Feed Deiner Beiträge
Beispiel: Friendica Support
- https://helpers.pyxis.uberspace.de/dfrn_poll/helpers
+ https://forum.friendi.ca/dfrn_poll/helpers
RSS-Feed aller Unterhaltungen auf Deiner Seite
@@ -158,14 +158,14 @@ RSS-Feed aller Unterhaltungen auf Deiner Seite
Beispiel: Friendica Support
- https://helpers.pyxis.uberspace.de/dfrn_poll/helpers/converse
+ https://forum.friendi.ca/dfrn_poll/helpers/converse
**Wo finde ich Hilfe?**
-Wenn Du Probleme mit Deiner Friendica-Seite hast, dann kannst Du die Community in der [Friendica-Support-Gruppe](https://helpers.pyxis.uberspace.de/profile/helpers) oder im [deutschen Friendica-Support-Forum](http://toktan.org/profile/wiki) fragen oder Dir das [deutsche Wiki](http://wiki.toktan.org/doku.php) anschauen.
-Wenn Du Deinen Account nicht nutzen kannst, kannst Du entweder einen [Testaccount](http://friendica.com/node/31) bzw. einen Account auf einer öffentlichen Seite ([Liste](http://dir.friendica.com/siteinfo)) nutzen, oder Du wählst die Librelist-mailing-Liste.
+Wenn Du Probleme mit Deiner Friendica-Seite hast, dann kannst Du die Community in der [Friendica-Support-Gruppe](https://forum.friendi.ca/profile/helpers) oder im [deutschen Friendica-Support-Forum](http://toktan.org/profile/wiki) fragen oder Dir das [deutsche Wiki](http://wiki.toktan.org/doku.php) 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, oder Du wählst die Librelist-mailing-Liste.
Wenn Du die Mailing-Liste nutzen willst, schicke eine Mail an friendica AT librelist PUNKT com.
Wenn Du ein Theme-Entwickler bist, wirst Du in diesem Forum Hilfe finden: [Friendica Theme Developers](https://friendica.eu/profile/ftdevs).
diff --git a/doc/de/Home.md b/doc/de/Home.md
index 1ef92f5f1..c76a91f53 100644
--- a/doc/de/Home.md
+++ b/doc/de/Home.md
@@ -57,7 +57,7 @@ Friendica - Dokumentation und Ressourcen
**Externe Ressourcen**
-* [Haupt-Webseite](http://friendica.com)
+* [Haupt-Webseite](https://friendi.ca)
* [Mailing Liste](http://librelist.com/browser/friendica/)
* [Deutsches Friendica-Wiki](http://wiki.toktan.org/doku.php)
diff --git a/doc/de/Improve-Performance.md b/doc/de/Improve-Performance.md
index 674927396..e4bbbffb5 100644
--- a/doc/de/Improve-Performance.md
+++ b/doc/de/Improve-Performance.md
@@ -7,7 +7,7 @@ Eine kleine Anleitung, um die Performance einer Friendica-Seite zu verbessern.
**Vorab:**
-Wenn du Fragen zu den folgenden Anweisungen oder zu anderen Themen hast, dann kannst du jederzeit beim Friendica-Support unter https://helpers.pyxis.uberspace.de/profile/helpers nachfragen.
+Wenn du Fragen zu den folgenden Anweisungen oder zu anderen Themen hast, dann kannst du jederzeit beim Friendica-Support unter https://forum.friendi.ca/profile/helpers nachfragen.
Systemeinstellungen
---------------
diff --git a/doc/de/Install.md b/doc/de/Install.md
index 92addefb9..2c06d797c 100644
--- a/doc/de/Install.md
+++ b/doc/de/Install.md
@@ -11,7 +11,7 @@ Diese Funktionalität benötigt ein wenig mehr als die normalen Blogs.
Nicht jeder PHP/MySQL-Hosting-Anbieter kann Friendica unterstützen.
Viele hingegen können es. Aber **bitte** prüfe die Voraussetzungen deines Servers vor der Installation.
-Wenn dir Fehler während der Installation auffallen, sag uns bitte über http://bugs.friendica.com Bescheid.
+Wenn dir Fehler während der Installation auffallen, sag uns bitte über [github](https://github.com/friendica/issues) Bescheid.
Gib uns bitte so viele Infos zu deinem System, wie du kannst, und beschreibe den Fehler mit allen Details und Fehlermeldungen, so dass wir den Fehler zukünftig verhindern können.
Aufgrund der großen Anzahl an verschiedenen Betriebssystemen und PHP-Plattformen haben wir nur geringe Kapazitäten, um deine PHP-Installation zu debuggen oder fehlende Module zu ersetzen, aber wir tun unser Bestes, um allgemeine Code-Fehler zu beheben.
diff --git a/doc/de/Quick-Start-andfinally.md b/doc/de/Quick-Start-andfinally.md
index 2e91b08d0..748f600de 100644
--- a/doc/de/Quick-Start-andfinally.md
+++ b/doc/de/Quick-Start-andfinally.md
@@ -8,7 +8,7 @@ Hier sind noch einige weitere Dinge, die Dir den Start vereinfachen können.
**Gruppen**
-- Friendica Support - Probleme? Dann ist das der Platz, um zu fragen!
+- Friendica Support - Probleme? Dann ist das der Platz, um zu fragen!
**Dokumentation**
diff --git a/doc/de/Quick-Start-groupsandpages.md b/doc/de/Quick-Start-groupsandpages.md
index 3170bee05..da2a7dc3c 100644
--- a/doc/de/Quick-Start-groupsandpages.md
+++ b/doc/de/Quick-Start-groupsandpages.md
@@ -21,6 +21,6 @@ Solltest Du beim Stöbern durch die vielen Gruppen nicht wieder hierher zurück
Wenn Du einige Gruppen hinzugefügt hast, gehe weiter zum nächsten Schritt.
-
+
diff --git a/doc/de/groupsandpages.md b/doc/de/groupsandpages.md
index d5b8e7f69..a65dab906 100644
--- a/doc/de/groupsandpages.md
+++ b/doc/de/groupsandpages.md
@@ -21,6 +21,6 @@ In diesem Fall nutze einfach den Link oben auf dieser Seite.
Wenn du einige Gruppen hinzugefügt hast, gehe weiter zum nächsten Schritt.
-
+
diff --git a/doc/readme.md b/doc/readme.md
index 98b637a22..28e6c8709 100644
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -40,7 +40,7 @@ Friendica Documentation and Resources
**External Resources**
-* [Main Website](http://friendica.com)
+* [Main Website](https://friendi.ca)
* [Mailing List Archive](http://librelist.com/browser/friendica/)
**About**
diff --git a/doc/themes.md b/doc/themes.md
index 058eb49d8..589c882c6 100644
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -206,7 +206,7 @@ Basically what you have to do is identify which template you have to change so i
Adopt the CSS of the theme accordingly.
And iterate the process until you have the theme the way you want it.
-*Use the source Luke.* and don't hesitate to ask in @[ftdevs](https://friendica.eu/profile/ftdevs) or @[helpers](https://helpers.pyxis.uberspace.de/profile/helpers).
+*Use the source Luke.* and don't hesitate to ask in @[ftdevs](https://friendica.eu/profile/ftdevs) or @[helpers](https://forum.friendi.ca/profile/helpers).
## Special Files