new ToU text

5 files changed, 23 insertions, 8 deletions

diff --git a/swamid-2.0.mxml b/swamid-2.0.mxml
index 4fc4ce94..3d7fd633 100644
--- a/swamid-2.0.mxml
+++ b/swamid-2.0.mxml
@@ -14,7 +14,10 @@ the use of the Metadata. By accessing or using the Metadata You accept that the
 use will be on and subject to these Terms. These Terms will be binding and enforceable on 
 You as contractual obligations.
 
-The Terms is available at http://md.swamid.se/md/terms-of-use.txt
+The Terms is available at 
+
+- http://md.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding!
+- http://md.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation
 
 If You do not accept these Terms, then You must not continue to use this Metadata.
 
diff --git a/swamid-discovery.mxml b/swamid-discovery.mxml
index 251ab211..0220da4f 100644
--- a/swamid-discovery.mxml
+++ b/swamid-discovery.mxml
@@ -4,7 +4,7 @@
                     validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
                     Name="http://md.swamid.se/md/swamid-no-interfederation-combined.xml">
 
-  <!--
+    <!--
 
        IMPORTANT NOTICE: READ CAREFULLY
 
@@ -14,12 +14,14 @@ the use of the Metadata. By accessing or using the Metadata You accept that the
 use will be on and subject to these Terms. These Terms will be binding and enforceable on 
 You as contractual obligations.
 
-The Terms is available at http://md.swamid.se/md/terms-of-use.txt
+The Terms is available at 
+
+- http://md.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding!
+- http://md.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation
 
 If You do not accept these Terms, then You must not continue to use this Metadata.
 
     -->
-
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-idp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>
diff --git a/swamid-idp-transitive.mxml b/swamid-idp-transitive.mxml
index b8ca0501..05bd5d51 100644
--- a/swamid-idp-transitive.mxml
+++ b/swamid-idp-transitive.mxml
@@ -14,7 +14,10 @@ the use of the Metadata. By accessing or using the Metadata You accept that the
 use will be on and subject to these Terms. These Terms will be binding and enforceable on 
 You as contractual obligations.
 
-The Terms is available at http://md.swamid.se/md/terms-of-use.txt
+The Terms is available at 
+
+- http://md.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding!
+- http://md.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation
 
 If You do not accept these Terms, then You must not continue to use this Metadata.
 
diff --git a/swamid-idp.mxml b/swamid-idp.mxml
index e8a256f6..39019461 100644
--- a/swamid-idp.mxml
+++ b/swamid-idp.mxml
@@ -3,7 +3,6 @@
                     xmlns:xi="http://www.w3.org/2001/XInclude" 
                     validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
                     Name="http://md.swamid.se/md/swamid-2.0.xml">
-
   <!--
 
        IMPORTANT NOTICE: READ CAREFULLY
@@ -14,7 +13,10 @@ the use of the Metadata. By accessing or using the Metadata You accept that the
 use will be on and subject to these Terms. These Terms will be binding and enforceable on 
 You as contractual obligations.
 
-The Terms is available at http://md.swamid.se/md/terms-of-use.txt
+The Terms is available at 
+
+- http://md.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding!
+- http://md.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation
 
 If You do not accept these Terms, then You must not continue to use this Metadata.
 
diff --git a/swamid-no-interfederation-combined.mxml b/swamid-no-interfederation-combined.mxml
index 251ab211..37c2e948 100644
--- a/swamid-no-interfederation-combined.mxml
+++ b/swamid-no-interfederation-combined.mxml
@@ -14,12 +14,17 @@ the use of the Metadata. By accessing or using the Metadata You accept that the
 use will be on and subject to these Terms. These Terms will be binding and enforceable on 
 You as contractual obligations.
 
-The Terms is available at http://md.swamid.se/md/terms-of-use.txt
+The Terms is available at 
+
+- http://md.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding!
+- http://md.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation
 
 If You do not accept these Terms, then You must not continue to use this Metadata.
 
     -->
 
+   <!-- This metadata is deprecated -->
+
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-idp-1.0.xml" xpointer="xpointer(//*[@entityID])"/>