14 files changed, 19 insertions, 20 deletions
diff --git a/doc/Developers.md b/doc/Developers.md
index 8252fa91d..7f12ef206 100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
@@ -8,7 +8,7 @@ doing development.
 
 Create your own github account.
 
-You may fork/clone the Red repository from [https://github.com/friendica/red.git](https://github.com/friendica/red.git).
+You may fork/clone the Red repository from [https://github.com/redmatrix/redmatrix.git](https://github.com/redmatrix/redmatrix.git).
 
 Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/)
 to create and use your own tracking fork on github
@@ -28,7 +28,6 @@ Please pull in any changes from the project repository and merge them with your
 
 Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. 
 
-Further documentation can be found at the Github wiki pages at: [https://github.com/friendica/red/wiki](https://github.com/friendica/red/wiki).
 
 **Licensing**
 
diff --git a/doc/addons.bb b/doc/addons.bb
index 7f2bb59e9..cad662308 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -61,7 +61,7 @@
 
 [h3]Addon Repositories[/h3]
 
-[url=https://github.com/friendica/red-addons]https://github.com/friendica/red-addons[/url] Main project addon repository
+[url=https://github.com/redmatrix/redmatrix-addons]https://github.com/redmatrix/redmatrix-addons[/url] Main project addon repository
 
 [url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip)
 
diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb
index 339add5a9..61c8f92c1 100644
--- a/doc/addons_gnusocial.bb
+++ b/doc/addons_gnusocial.bb
@@ -10,7 +10,7 @@ Next, click the link to Register a new application. That brings up the new appli
 
 Icon. I uploaded the RedMatrix icon located at this link, after saving it to my computer:
 
-https://github.com/friendica/red/blob/master/images/rm-32.png
+https://github.com/redmatrix/redmatrix/blob/master/images/rm-32.png
 
 Name. Give the application an appropriate name. I called mine redmatrix. You might prefer r2g.
 
diff --git a/doc/campaign.bb b/doc/campaign.bb
index b05846a0b..c65c1b080 100644
--- a/doc/campaign.bb
+++ b/doc/campaign.bb
@@ -153,7 +153,7 @@ Each contributor at this level gets their own Red Matrix virtual private server,
 
 We're a handful of volunteers, and we understand that not everyone can contribute by donating money.  There are many other ways you can in getting the Matrix to version 1.0!
 
-First, you can checkout our source code on github: https://github.com/friendica/red  
+First, you can checkout our source code on github: https://github.com/redmatrix/redmatrix
 
 Maybe you can dive in and help us out with some development.
 
diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb
index b29b0bad7..33b0edc95 100644
--- a/doc/dev_beginner.bb
+++ b/doc/dev_beginner.bb
@@ -174,8 +174,8 @@ It is a good idea to read the whole manual! Git is different to other version co
 Now you should
 [list]
 [*] create an account at github.com
-[*] fork https://github.com/friendica/red
-[*] fork https://github.com/friendica/red-addons
+[*] fork https://github.com/redmatrix/redmatrix
+[*] fork https://github.com/redmatrix/redmatrix-addons
 [/list]
 
 If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector".
@@ -362,7 +362,7 @@ surfer@debian:/var/www$ git checkout -b dev_beginning
 Make sure your local repository is up-to-date with the main project.
 Add the original repository as a remote named “upstream” if not done yet
 [code]
-surfer@debian:/var/www$ git remote add upstream https://github.com/friendica/red
+surfer@debian:/var/www$ git remote add upstream https://github.com/redmatrix/redmatrix
 [/code]
 
 Fetch the newest work from that remote
diff --git a/doc/developers.bb b/doc/developers.bb
index 5365fd77a..8f526d963 100644
--- a/doc/developers.bb
+++ b/doc/developers.bb
@@ -9,7 +9,7 @@ doing development.
 
 Create your own github account.
 
-You may fork/clone the Red repository from [url=https://github.com/friendica/red.git]https://github.com/friendica/red.git[/url]
+You may fork/clone the Red repository from [url=https://github.com/redmatrix/redmatrix.git]https://github.com/redmatrix/redmatrix.git[/url]
 
 Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url]
 to create and use your own tracking fork on github
diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb
index beb16e699..62cbbc33d 100644
--- a/doc/external-resource-links.bb
+++ b/doc/external-resource-links.bb
@@ -15,6 +15,6 @@
 [*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url]
 [*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url]
 [*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]
-[*][url=https://github.com/friendica/wptored]WordPress gateway (combine with wppost addon for full features)[/url]
+[*][url=https://wordpress.org/plugins/redmatrix-wp/]WordPress gateway (combine with wppost addon for full features)[/url]
 
 #include doc/macros/main_footer.bb;
diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb
index 029a6eb77..b0a623104 100644
--- a/doc/git_for_non_developers.bb
+++ b/doc/git_for_non_developers.bb
@@ -14,7 +14,7 @@ Once you've done that, cd into the directory, and add an upstream.
 
 [code]
 cd red
-git remote add upstream https://github.com/friendica/red
+git remote add upstream https://github.com/redmatrix/redmatrix
 [/code]
 
 From now on, you can pull upstream changes with the command
diff --git a/doc/main.bb b/doc/main.bb
index 67e3c5da0..cdccd6ecc 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -75,8 +75,8 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix
 
 [size=large][b]External Resources[/b][/size]
 [zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl]
-[url=https://github.com/friendica/red]Main Website[/url]
-[url=https://github.com/friendica/red-addons]Addon Website[/url]
+[url=https://github.com/redmatrix/redmatrix]Main Website[/url]
+[url=https://github.com/redmatrix/redmatrix-addons]Addon Website[/url]
 [url=https://zothub.com/channel/one]Development Channel[/url]
 [url=https://federated.social/channel/postgres]Postgres-specific RedMatrix Admin Support Channel[/url]
 
diff --git a/doc/red2pi.bb b/doc/red2pi.bb
index 03e05aa99..6d15d3afe 100644
--- a/doc/red2pi.bb
+++ b/doc/red2pi.bb
@@ -239,10 +239,10 @@ Cleanup: Remove the directory www/ (Git will not create files and folders in dir
 Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code]
 
 Download the sources of RED from GIT
-[code]pi@pi /var $ sudo git clone https://github.com/friendica/red.git www[/code]
+[code]pi@pi /var $ sudo git clone https://github.com/redmatrix/redmatrix.git www[/code]
 
 Download the sources of the addons from GIT
-[code]pi@pi /var/www $ sudo git clone https://github.com/friendica/red-addons.git addon[/code]
+[code]pi@pi /var/www $ sudo git clone https://github.com/redmatrix/redmatrix-addons.git addon[/code]
 
 Make user www-data the owner of the whole red directory (including subdirectories and files)
 (TODO: This step has to be proofed by the next installation.)
diff --git a/doc/troubleshooting.bb b/doc/troubleshooting.bb
index f27db558f..6628e2df8 100644
--- a/doc/troubleshooting.bb
+++ b/doc/troubleshooting.bb
@@ -14,7 +14,7 @@ In the case of "500" errors, the issues may often be logged in your webserver lo
 We encourage you to try to the best of your abilities to use these logs combined with the source code in your possession to troubleshoot issues and find their cause. The community is often able to help, but only you have access to your site logfiles and it is considered a security risk to share them.   
 
 
-If a code issue has been uncovered, please report it on the project bugtracker (https://github.com/friendica/red/issues). Again provide as much detail as possible to avoid us going back and forth asking questions about your configuration or how to duplicate the problem, so that we can get right to the problem and figure out what to do about it. You are also welcome to offer your own solutions and submit patches. In fact we encourage this as we are all volunteers and have little spare time available. The more people that help, the easier the workload for everybody. It's OK if your solution isn't perfect. Every little bit helps and perhaps we can improve on it.  
+If a code issue has been uncovered, please report it on the project bugtracker (https://github.com/redmatrix/redmatrix/issues). Again provide as much detail as possible to avoid us going back and forth asking questions about your configuration or how to duplicate the problem, so that we can get right to the problem and figure out what to do about it. You are also welcome to offer your own solutions and submit patches. In fact we encourage this as we are all volunteers and have little spare time available. The more people that help, the easier the workload for everybody. It's OK if your solution isn't perfect. Every little bit helps and perhaps we can improve on it.  
 
 #include doc/macros/troubleshooting_footer.bb;
 #include doc/macros/main_footer.bb;
diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb
index 67c0159e3..5dce2cb6f 100644
--- a/doc/what_is_zot.bb
+++ b/doc/what_is_zot.bb
@@ -55,7 +55,7 @@ For more detailed, technical information about Zot, check out the following link
 
  - [url=https://github.com/friendica/red/wiki/zot]Zot development specification[/url]
 
- - [url=https://github.com/friendica/red/blob/master/include/zot.php]Zot reference implementation in PHP[/url]
+ - [url=https://github.com/redmatrix/redmatrix/blob/master/include/zot.php]Zot reference implementation in PHP[/url]
 
 
 #include doc/macros/main_footer.bb;
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index bfd685de4..58ec365cb 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -96,7 +96,7 @@ use SSL, your webserver must not listen on port 443 at all.
     software much easier to update. The Linux command to clone the repository 
     into a directory "mywebsite" would be
 
-        git clone https://github.com/friendica/red.git mywebsite
+        git clone https://github.com/redmatrix/redmatrix.git mywebsite
 
     - and then you can pick up the latest changes at any time with
 
@@ -127,7 +127,7 @@ use SSL, your webserver must not listen on port 443 at all.
          a nickname of 'matrix'. You can pull in other redmatrix addon repositories by 
          giving them different nicknames.
 
-            util/add_addon_repo https://github.com/friendica/red-addons.git matrix
+            util/add_addon_repo https://github.com/redmatrix/redmatrix-addons.git matrix
 
     - For keeping the addon tree updated, you should be on your top level website 
 		directory and issue an update command for that repository.
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index ab6891e25..856909a27 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -163,7 +163,7 @@ function siteinfo_content(&$a) {
 		'$web_location' => t('Running at web location') . ' ' . z_root(),
 		'$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about the Red Matrix.'),
 		'$bug_text' => t('Bug reports and issues: please visit'),
-		'$bug_link_url' => 'https://github.com/friendica/red/issues',
+		'$bug_link_url' => 'https://github.com/redmatrix/redmatrix/issues',
 		'$bug_link_text' => 'redmatrix issues',
 		'$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
 		'$donate' => $donate,