diff options
author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-2.0/urn-urkund-shibboleth-sp.xml | |
parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) |
resolve conflicts and merge
Diffstat (limited to 'swamid-2.0/urn-urkund-shibboleth-sp.xml')
-rw-r--r-- | swamid-2.0/urn-urkund-shibboleth-sp.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml index 9db7884b..9407e844 100644 --- a/swamid-2.0/urn-urkund-shibboleth-sp.xml +++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml @@ -12,6 +12,14 @@ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol"> <md:Extensions> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.urkund.com/Shibboleth.sso/DS" index="1"/> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName> + <mdui:Description xml:lang="sv">Detect and check for plagiarism with URKUND</mdui:Description> + <mdui:Description xml:lang="en">Detect and check for plagiarism with URKUND</mdui:Description> + <mdui:InformationURL xml:lang="sv">http://www.urkund.com</mdui:InformationURL> + <mdui:InformationURL xml:lang="en">http://www.urkund.com</mdui:InformationURL> + </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> |