diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-08-22 10:01:46 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-08-22 10:01:46 +0200 |
| commit | bb5430082bba7887b9e8903c6dd140c12f892ca8 (patch) | |
| tree | a9a38d9e2eea745999ee27ff05aa35ba62af7368 /swamid-2.0 | |
| parent | bc976dd420908508545faef7c2174f530bf15dac (diff) | |
| parent | 7f13cdbcc7c1bcf31b1dcdb85151abdc7ae7cdd4 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Diffstat (limited to 'swamid-2.0')
| -rw-r--r-- | swamid-2.0/fs.liu.se-adfs-services-trust.xml | 7 | ||||
| -rw-r--r-- | swamid-2.0/idp.esh.se-idp-shibboleth.xml | 6 | ||||
| -rw-r--r-- | swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml | 2 | ||||
| -rw-r--r-- | swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml index 0b75b816..b4769dc9 100644 --- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml +++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml @@ -316,9 +316,10 @@ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/> </IDPSSODescriptor> <Organization> - <OrganizationName xml:lang="sv-SE">Linköping University</OrganizationName> - <OrganizationDisplayName xml:lang="sv-SE">Linköping University (ADFS)</OrganizationDisplayName> - <OrganizationURL xml:lang="sv-SE">http://www.liu.se/</OrganizationURL> + <OrganizationName xml:lang="sv">Linköping University</OrganizationName> + <OrganizationDisplayName xml:lang="sv">Linköping University (ADFS)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName> + <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL> </Organization> <ContactPerson contactType="support"> <GivenName>Johan</GivenName> diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml index 5e57f0d0..80d5667c 100644 --- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.esh.se-idp-shibboleth.xml @@ -82,4 +82,10 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1 <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> </AttributeAuthorityDescriptor> + <Organization> + <OrganizationName xml:lang="sv">Ersta Sköndal Högskola</OrganizationName> + <OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</OrganizationDisplayName> + <OrganizationURL xml:lang="sv">http://www.esh.se/</OrganizationURL> + </Organization> </EntityDescriptor> diff --git a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml index 359287e1..8f24258b 100644 --- a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml @@ -78,8 +78,8 @@ o04ltBnMhQ==</ds:X509Certificate> </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName> - <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName> <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL> </Organization> <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical"> diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml index 3f388b28..2f39bf01 100644 --- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml +++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml @@ -78,7 +78,8 @@ g3K9tR/NfPn3yNgy/kBRABuYJVjrtsbq/1PJ6Kg807taKYrz+vyERbn0 </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">UniversitetsOchHogskoleradet</OrganizationName> - <OrganizationDisplayName xml:lang="en">Universitets- och högskolerådet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet (UHR)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education (UHR)</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL> </Organization> <ContactPerson contactType="technical"> |