diff --git a/docs/README b/docs/README
index 8f2f58e93b958fce0de43be480f3ec3017a555b1..acfa46bc14dfa0c2f230073543e2e80b3d8a3a97 100644
--- a/docs/README
+++ b/docs/README
@@ -2,13 +2,13 @@ Updated: December 19th, 2007
All you need to know to install and configure simpleSAMLphp is available at:
-http://simplesamlphp.org/docs/
+https://simplesamlphp.org/docs/
simpleSAMLphp homepage:
-http://rnd.feide.no/simplesamlphp
+https://simplesamlphp.org/
simpleSAMLphp mailinglist (for support):
-http://rnd.feide.no/content/simplesamlphp-users-mailinglist
+https://simplesamlphp.org/lists
To contact the author team:
diff --git a/docs/simplesamlphp-advancedfeatures.txt b/docs/simplesamlphp-advancedfeatures.txt
index 05141351fe13c3563559ee62994621ec61e8deba..470e535e1e595d8fb14abb01d030618132599e84 100644
--- a/docs/simplesamlphp-advancedfeatures.txt
+++ b/docs/simplesamlphp-advancedfeatures.txt
@@ -231,7 +231,7 @@ you are welcome to join! The forums are open for you to ask
questions, contribute answers other further questions, request
improvements or contribute with code or plugins of your own.
-- [simpleSAMLphp homepage (at Feide RnD)](http://rnd.feide.no/simplesamlphp)
+- [simpleSAMLphp homepage](https://simplesamlphp.org)
- [List of all available simpleSAMLphp documentation](http://simplesamlphp.org/docs/)
- [Join the simpleSAMLphp user's mailing list](http://rnd.feide.no/content/simplesamlphp-users-mailinglist)
- [Visit and contribute to the simpleSAMLphp wiki](https://ow.feide.no/simplesamlphp:start)
diff --git a/docs/simplesamlphp-googleapps.txt b/docs/simplesamlphp-googleapps.txt
index 2d966766752cb46c9c43e85e1784ab24e5a6186a..840414df6c3637dafe52d47779a6bfe8f7cfb775 100644
--- a/docs/simplesamlphp-googleapps.txt
+++ b/docs/simplesamlphp-googleapps.txt
@@ -19,7 +19,7 @@ This document is part of the simpleSAMLphp documentation suite.
* [List of all simpleSAMLphp documentation](http://simplesamlphp.org/docs)
* [Latest news about simpleSAMLphp](http://rnd.feide.no/taxonomy/term/4). (Also conatins an RSS feed)
- * [simpleSAMLphp homepage](http://rnd.feide.no/simplesamlphp)
+ * [simpleSAMLphp homepage](https://simplesamlphp.org)
## Introduction
@@ -242,7 +242,7 @@ Support
If you need help to make this work, or want to discuss simpleSAMLphp with other users of the software, you are fortunate: Around simpleSAMLphp there is a great Open source community, and you are welcome to join! The forums are open for you to ask questions, contribute answers other further questions, request improvements or contribute with code or plugins of your own.
-- [simpleSAMLphp homepage (at Feide RnD)](http://rnd.feide.no/simplesamlphp)
+- [simpleSAMLphp homepage](https://simplesamlphp.org)
- [List of all available simpleSAMLphp documentation](http://simplesamlphp.org/docs/)
- [Join the simpleSAMLphp user's mailing list](http://rnd.feide.no/content/simplesamlphp-users-mailinglist)
- [Visit and contribute to the simpleSAMLphp wiki](https://ow.feide.no/simplesamlphp:start)
diff --git a/docs/simplesamlphp-idp.txt b/docs/simplesamlphp-idp.txt
index 816dad0fdac424df4d911aa7ee903d5e4878451c..4c625e7fca07e65c746ae657abb008ab99bb7b68 100644
--- a/docs/simplesamlphp-idp.txt
+++ b/docs/simplesamlphp-idp.txt
@@ -230,7 +230,7 @@ Support
If you need help to make this work, or want to discuss simpleSAMLphp with other users of the software, you are fortunate: Around simpleSAMLphp there is a great Open source community, and you are welcome to join! The forums are open for you to ask questions, contribute answers other further questions, request improvements or contribute with code or plugins of your own.
-- [simpleSAMLphp homepage (at Feide RnD)](http://rnd.feide.no/simplesamlphp)
+- [simpleSAMLphp homepage](https://simplesamlphp.org)
- [List of all available simpleSAMLphp documentation](http://simplesamlphp.org/docs/)
- [Join the simpleSAMLphp user's mailing list](http://rnd.feide.no/content/simplesamlphp-users-mailinglist)
- [Visit and contribute to the simpleSAMLphp wiki](https://ow.feide.no/simplesamlphp:start)
diff --git a/docs/simplesamlphp-install.txt b/docs/simplesamlphp-install.txt
index 7178a7cd73ef988b940a19886a21108cf9d5bc10..1499b45ed1e51d735cb85c9e0547224cf853a596 100644
--- a/docs/simplesamlphp-install.txt
+++ b/docs/simplesamlphp-install.txt
@@ -19,7 +19,7 @@ This document is part of the simpleSAMLphp documentation suite.
* [List of all simpleSAMLphp documentation](http://simplesamlphp.org/docs)
* [Latest news about simpleSAMLphp](http://rnd.feide.no/taxonomy/term/4). (Also conatins an RSS feed)
- * [simpleSAMLphp homepage](http://rnd.feide.no/simplesamlphp)
+ * [simpleSAMLphp homepage](https://simplesamlphp.org)
Development version
@@ -232,7 +232,7 @@ Support
If you need help to make this work, or want to discuss simpleSAMLphp with other users of the software, you are fortunate: Around simpleSAMLphp there is a great Open source community, and you are welcome to join! The forums are open for you to ask questions, contribute answers other further questions, request improvements or contribute with code or plugins of your own.
-- [simpleSAMLphp homepage (at Feide RnD)](http://rnd.feide.no/simplesamlphp)
+- [simpleSAMLphp homepage](https://simplesamlphp.org)
- [List of all available simpleSAMLphp documentation](http://simplesamlphp.org/docs/)
- [Join the simpleSAMLphp user's mailing list](http://rnd.feide.no/content/simplesamlphp-users-mailinglist)
- [Visit and contribute to the simpleSAMLphp wiki](https://ow.feide.no/simplesamlphp:start)
diff --git a/docs/simplesamlphp-maintenance.txt b/docs/simplesamlphp-maintenance.txt
index 2aaf02081df9338059c4f65b33bfa0a29eda5016..539eb861ceda4e0c1c5644b54859116f568ef581 100644
--- a/docs/simplesamlphp-maintenance.txt
+++ b/docs/simplesamlphp-maintenance.txt
@@ -18,7 +18,7 @@ This document is part of the simpleSAMLphp documentation suite.
* [List of all simpleSAMLphp documentation](http://simplesamlphp.org/docs)
* [Latest news about simpleSAMLphp](http://rnd.feide.no/taxonomy/term/4). (Also conatins an RSS feed)
- * [simpleSAMLphp homepage](http://rnd.feide.no/simplesamlphp)
+ * [simpleSAMLphp homepage](https://simplesamlphp.org)
@@ -205,7 +205,7 @@ Support
If you need help to make this work, or want to discuss simpleSAMLphp with other users of the software, you are fortunate: Around simpleSAMLphp there is a great Open source community, and you are welcome to join! The forums are open for you to ask questions, contribute answers other further questions, request improvements or contribute with code or plugins of your own.
-- [simpleSAMLphp homepage (at Feide RnD)](http://rnd.feide.no/simplesamlphp)
+- [simpleSAMLphp homepage (at Feide RnD)](https://simplesamlphp.org)
- [List of all available simpleSAMLphp documentation](http://simplesamlphp.org/docs/)
- [Join the simpleSAMLphp user's mailing list](http://rnd.feide.no/content/simplesamlphp-users-mailinglist)
- [Visit and contribute to the simpleSAMLphp wiki](https://ow.feide.no/simplesamlphp:start)
diff --git a/docs/simplesamlphp-scoping.txt b/docs/simplesamlphp-scoping.txt
index a90020e2810cb0e1246f2aa2d9f94b93a385037f..009c5b1a1787509303a3dc223026ec24ed155da3 100644
--- a/docs/simplesamlphp-scoping.txt
+++ b/docs/simplesamlphp-scoping.txt
@@ -97,7 +97,7 @@ Support
If you need help to make this work, or want to discuss simpleSAMLphp with other users of the software, you are fortunate: Around simpleSAMLphp there is a great Open source community, and you are welcome to join! The forums are open for you to ask questions, contribute answers other further questions, request improvements or contribute with code or plugins of your own.
-- [simpleSAMLphp homepage (at Feide RnD)](http://rnd.feide.no/simplesamlphp)
+- [simpleSAMLphp homepage](https://simplesamlphp.org)
- [List of all available simpleSAMLphp documentation](http://simplesamlphp.org/docs/)
- [Join the simpleSAMLphp user's mailing list](http://rnd.feide.no/content/simplesamlphp-users-mailinglist)
- [Visit and contribute to the simpleSAMLphp wiki](https://ow.feide.no/simplesamlphp:start)
diff --git a/docs/simplesamlphp-sp.txt b/docs/simplesamlphp-sp.txt
index 8d2d22be26054f9c5b523b4a51f77901440b840f..2740d9feab1ac4d366203b5c686c0f3f29cc4d93 100644
--- a/docs/simplesamlphp-sp.txt
+++ b/docs/simplesamlphp-sp.txt
@@ -205,7 +205,7 @@ Support
If you need help to make this work, or want to discuss simpleSAMLphp with other users of the software, you are fortunate: Around simpleSAMLphp there is a great Open source community, and you are welcome to join! The forums are open for you to ask questions, contribute answers other further questions, request improvements or contribute with code or plugins of your own.
-- [simpleSAMLphp homepage (at Feide RnD)](http://rnd.feide.no/simplesamlphp)
+- [simpleSAMLphp homepage](https://simplesamlphp.org)
- [List of all available simpleSAMLphp documentation](http://simplesamlphp.org/docs/)
- [Join the simpleSAMLphp user's mailing list](http://rnd.feide.no/content/simplesamlphp-users-mailinglist)
- [Visit and contribute to the simpleSAMLphp wiki](https://ow.feide.no/simplesamlphp:start)
diff --git a/metadata-templates/saml20-idp-hosted.php b/metadata-templates/saml20-idp-hosted.php
index d2f1c973fdb99f3cc549b25accc2192032697314..87c03f6befb34144d263d18d8ee933656fb592eb 100644
--- a/metadata-templates/saml20-idp-hosted.php
+++ b/metadata-templates/saml20-idp-hosted.php
@@ -2,7 +2,7 @@
/**
* SAML 2.0 IdP configuration for simpleSAMLphp.
*
- * See: https://rnd.feide.no/content/idp-hosted-metadata-reference
+ * See: https://simplesamlphp.org/docs/stable/simplesamlphp-reference-idp-hosted
*/
$metadata['__DYNAMIC:1__'] = array(
diff --git a/metadata-templates/saml20-idp-remote.php b/metadata-templates/saml20-idp-remote.php
index 8145cc0b10e3dc58478a95412ec3d3f229baaad2..8824bc9b68209745c73498e2f534775daf63d9fb 100644
--- a/metadata-templates/saml20-idp-remote.php
+++ b/metadata-templates/saml20-idp-remote.php
@@ -4,7 +4,7 @@
*
* Remember to remove the IdPs you don't use from this file.
*
- * See: https://rnd.feide.no/content/idp-remote-metadata-reference
+ * See: https://simplesamlphp.org/docs/stable/simplesamlphp-reference-idp-remote
*/
/*
diff --git a/metadata-templates/saml20-sp-remote.php b/metadata-templates/saml20-sp-remote.php
index f2cff56a7e157683f1d6a9632793078772cd904a..4254e438052e7a7976e59f13b6be1b19d3c47f3c 100644
--- a/metadata-templates/saml20-sp-remote.php
+++ b/metadata-templates/saml20-sp-remote.php
@@ -2,7 +2,7 @@
/**
* SAML 2.0 remote SP metadata for simpleSAMLphp.
*
- * See: http://simplesamlphp.org/docs/trunk/simplesamlphp-reference-sp-remote
+ * See: https://simplesamlphp.org/docs/stable/simplesamlphp-reference-sp-remote
*/
/*
diff --git a/metadata-templates/shib13-idp-hosted.php b/metadata-templates/shib13-idp-hosted.php
index eef9726e7ca9ff7514758b5ac0d02a4ae12613c3..7e3ea0517ed3fdf0bbe930cd5239832291ca849f 100644
--- a/metadata-templates/shib13-idp-hosted.php
+++ b/metadata-templates/shib13-idp-hosted.php
@@ -2,7 +2,7 @@
/**
* SAML 1.1 IdP configuration for simpleSAMLphp.
*
- * See: https://rnd.feide.no/content/idp-hosted-metadata-reference
+ * See: https://simplesamlphp.org/docs/stable/simplesamlphp-reference-idp-hosted
*/
$metadata['__DYNAMIC:1__'] = array(
diff --git a/metadata-templates/shib13-idp-remote.php b/metadata-templates/shib13-idp-remote.php
index 5c089b2ac141e8d1675b30ab890690b4a2e5690d..87796b2cac927f9e01b364d7c20b8b1faeb23c03 100644
--- a/metadata-templates/shib13-idp-remote.php
+++ b/metadata-templates/shib13-idp-remote.php
@@ -4,7 +4,7 @@
*
* Remember to remove the IdPs you don't use from this file.
*
- * See: https://rnd.feide.no/content/idp-remote-metadata-reference
+ * See: https://simplesamlphp.org/docs/stable/simplesamlphp-reference-idp-remote
*/
/*
diff --git a/metadata-templates/shib13-sp-hosted.php b/metadata-templates/shib13-sp-hosted.php
index 1c6aee48ff58b20da909c9ecd17dcd39324978b7..1ddd91495539fcdee80d6a5b4a01dbb9091224b8 100644
--- a/metadata-templates/shib13-sp-hosted.php
+++ b/metadata-templates/shib13-sp-hosted.php
@@ -2,7 +2,7 @@
/**
* SAML 1.1 SP configuration for simpleSAMLphp.
*
- * See: https://rnd.feide.no/content/sp-hosted-metadata-reference
+ * See: https://simplesamlphp.org/docs/stable/saml:sp
*/
/*
diff --git a/metadata-templates/shib13-sp-remote.php b/metadata-templates/shib13-sp-remote.php
index dbd3987d038c88611e01d09518a3eea60f7d507f..fd0f9e4337f149d4352b6a43aebf6b9af127d84c 100644
--- a/metadata-templates/shib13-sp-remote.php
+++ b/metadata-templates/shib13-sp-remote.php
@@ -2,7 +2,7 @@
/**
* SAML 1.1 remote SP metadata for simpleSAMLphp.
*
- * See: https://rnd.feide.no/content/sp-remote-metadata-reference
+ * See: https://simplesamlphp.org/docs/stable/simplesamlphp-reference-sp-remote
*/
/*
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index 73bc7cf11136566d7a3d3ce2ff65df6907010e74..fa08477371138da0ae218b55f0194b1c28019198 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -33,7 +33,7 @@ $allLinks = array(
);
$links_welcome[] = array(
- 'href' => 'https://rnd.feide.no/view/simplesamlphpdocs',
+ 'href' => 'https://simplesamlphp.org/docs/stable/',
'text' => '{core:frontpage:doc_header}',
);
diff --git a/www/errorreport.php b/www/errorreport.php
index 580a2bd3968ed0d94fd1498df1f07f21e937bd2b..0abb624c6626329b96b2a6b23009d15e7ec92ce0 100644
--- a/www/errorreport.php
+++ b/www/errorreport.php
@@ -73,7 +73,7 @@ $message = '<h1>SimpleSAMLphp Error Report</h1>
<p>Referer: <tt>' . htmlspecialchars($data['referer']) . '</tt></p>
<hr />
-<div class="footer">This message was sent using simpleSAMLphp. Visit <a href="http://rnd.feide.no/simplesamlphp">simpleSAMLphp homepage</a>.</div>
+<div class="footer">This message was sent using simpleSAMLphp. Visit the <a href="http://simplesamlphp.org/">simpleSAMLphp homepage</a>.</div>
';