diff --git a/docs/simplesamlphp-idp.txt b/docs/simplesamlphp-idp.txt
index 874177557e30dd8784c643a17659c22853e3ecf9..f465ee5c5e9e8c32fffeb48fd2f5943f5ae646c2 100644
--- a/docs/simplesamlphp-idp.txt
+++ b/docs/simplesamlphp-idp.txt
@@ -62,7 +62,7 @@ The next step is to configure the way users authenticate on your IdP. Various mo
 [`authfacebook:Facebook`](./authfacebook:authfacebook)
 : Authenticate with a Facebook ID.
 
-[`authtwitter:Twitter`](./authtwitter:authtwitter)
+[`authtwitter:Twitter`](./authtwitter:oauthtwitter)
 : Authenticate with your Twitter account using the Twitter OAuth API.
 
 In this guide, we will use the `exampleauth:UserPass` authentication module. This module does not have any dependencies, and is therefore simple to set up.
diff --git a/modules/consent/docs/consent.txt b/modules/consent/docs/consent.txt
index c3dd66730e2b09d5d2cb0d9753f10fa4c52046df..5be0c4d587950f1b66b6ff1c478622f999d3580e 100644
--- a/modules/consent/docs/consent.txt
+++ b/modules/consent/docs/consent.txt
@@ -5,7 +5,7 @@ The consent module is implemented as an Authentication Processing Filter. That m
 
 It is recommended to run the consent module at the IdP, and configure the filter to run after all attribute mangling filters is completed, to show the user the exact same attributes that are sent to the SP.
 
-  * [Read more about processing filters in simpleSAMLphp](/content/authentication-processing-filters-simplesamlphp)
+  * [Read more about processing filters in simpleSAMLphp](simplesamlphp-authproc)
 
 
 Configure the user ID
diff --git a/modules/consentAdmin/docs/consentAdmin.txt b/modules/consentAdmin/docs/consentAdmin.txt
index a4e176a457c875746aef0ffa02fea0fab0f68fd3..e346637446504fa904e1f4173e55cb37cd27756a 100644
--- a/modules/consentAdmin/docs/consentAdmin.txt
+++ b/modules/consentAdmin/docs/consentAdmin.txt
@@ -5,7 +5,7 @@ the consentAdmin module is an addon to the consent module. This emans that
 you can not use the consentAdmin without the consent module. If you have not
 installed and configured the consent module, please do.
 
-  * [How to install and configure the consent module](/content/consent-module)
+  * [How to install and configure the consent module](consent:consent)
  
 The consentAdmin module only works when the consent module is using a 
 database to store the consents.
diff --git a/modules/saml/docs/sp.txt b/modules/saml/docs/sp.txt
index f956959f3810892070cd29d707146ff133b6c421..3164bc6aca13145b5019cd22c37427ffa486d5f7 100644
--- a/modules/saml/docs/sp.txt
+++ b/modules/saml/docs/sp.txt
@@ -122,7 +122,7 @@ Options
 
 `authproc`
 :   Processing filters that should be run after SP authentication.
-    See the [authentication processing filter manual](http://rnd.feide.no/content/authentication-processing-filters-simplesamlphp).
+    See the [authentication processing filter manual](simplesamlphp-authproc).
 
 `certData`
 :   Base64 encoded certificate data. Can be used instead of the `certificate` option.