diff options
| author | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
| commit | b217869b73c7ceb7653972740e0f796cf9bbd383 (patch) | |
| tree | ca10c13dc56d3c1665f5e89759e91ede7489bffc /swamid-2.0/fs.liu.se.xml | |
| parent | 5b14805f2ecc3b89ea0ff9b08a8714a3b895347e (diff) | |
| parent | c5391135cbba3c20214e9e44c433925931df1453 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0/shib-idp-1.oru.se.xml
Diffstat (limited to 'swamid-2.0/fs.liu.se.xml')
| -rw-r--r-- | swamid-2.0/fs.liu.se.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swamid-2.0/fs.liu.se.xml b/swamid-2.0/fs.liu.se.xml index e5e34493..0b75b816 100644 --- a/swamid-2.0/fs.liu.se.xml +++ b/swamid-2.0/fs.liu.se.xml @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.liu.se/adfs/services/trust"> <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se"> <KeyDescriptor use="encryption"> @@ -316,8 +316,8 @@ <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> + <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> </Organization> <ContactPerson contactType="support"> |