Merge branch 'master' of md-master.swamid.se:swamid-metadata

5 files changed, 0 insertions, 100 deletions

diff --git a/swamid-discovery.mxml b/swamid-discovery.mxml
index 8fe77841..74333f9b 100644
--- a/swamid-discovery.mxml
+++ b/swamid-discovery.mxml
@@ -3,25 +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-no-interfederation-combined.xml">
-
-    <!--
-
-       IMPORTANT NOTICE: READ CAREFULLY
-
-You are reading this because You wish to use the technical information (the “Metadata”) 
-published on behalf of the Registrars. These Terms of Access and Use (these “Terms”) govern 
-the use of the Metadata. By accessing or using the Metadata You accept that the access and 
-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/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])"/>
 </EntitiesDescriptor>
diff --git a/swamid-idp-transitive.mxml b/swamid-idp-transitive.mxml
index 05bd5d51..50b683c0 100644
--- a/swamid-idp-transitive.mxml
+++ b/swamid-idp-transitive.mxml
@@ -3,26 +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
-
-You are reading this because You wish to use the technical information (the “Metadata”) 
-published on behalf of the Registrars. These Terms of Access and Use (these “Terms”) govern 
-the use of the Metadata. By accessing or using the Metadata You accept that the access and 
-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/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.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-interfederations-idp-2.0.xml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-idp.mxml b/swamid-idp.mxml
index 0adfb3c0..43c87daf 100644
--- a/swamid-idp.mxml
+++ b/swamid-idp.mxml
@@ -3,24 +3,5 @@
                     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
-
-You are reading this because You wish to use the technical information (the “Metadata”) 
-published on behalf of the Registrars. These Terms of Access and Use (these “Terms”) govern 
-the use of the Metadata. By accessing or using the Metadata You accept that the access and 
-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/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])"/>
 </EntitiesDescriptor>
diff --git a/swamid-no-interfederation-combined.mxml b/swamid-no-interfederation-combined.mxml
index eb79fe32..74333f9b 100644
--- a/swamid-no-interfederation-combined.mxml
+++ b/swamid-no-interfederation-combined.mxml
@@ -3,28 +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-no-interfederation-combined.xml">
-
-  <!--
-
-       IMPORTANT NOTICE: READ CAREFULLY
-
-You are reading this because You wish to use the technical information (the “Metadata”) 
-published on behalf of the Registrars. These Terms of Access and Use (these “Terms”) govern 
-the use of the Metadata. By accessing or using the Metadata You accept that the access and 
-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/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])"/>
 </EntitiesDescriptor>
diff --git a/swamid-registered.mxml b/swamid-registered.mxml
index b4307916..067b1e38 100644
--- a/swamid-registered.mxml
+++ b/swamid-registered.mxml
@@ -3,26 +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
-
-You are reading this because You wish to use the technical information (the “Metadata”) 
-published on behalf of the Registrars. These Terms of Access and Use (these “Terms”) govern 
-the use of the Metadata. By accessing or using the Metadata You accept that the access and 
-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/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])"/>
 </EntitiesDescriptor>