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-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml index bb7049b7..2c97e2b2 100644 --- a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml @@ -4,11 +4,6 @@ This is a Shibboleth IdP for Hillcroft College. --> <Extensions> - <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> - <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> - <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue> - </saml:Attribute> - </mdattr:EntityAttributes> <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-09T10:50:01Z"> <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> @@ -17,7 +12,7 @@ <Extensions> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hillcroft.ac.uk</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="en">Hillcroft College for Women (Shibboleth)</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Hillcroft College</mdui:DisplayName> <mdui:Logo height="60" width="80">https://shibboleth.hillcroft.ac.uk/logo.jpg</mdui:Logo> <mdui:Logo height="16" width="16">https://shibboleth.hillcroft.ac.uk/icon.jpg</mdui:Logo> </mdui:UIInfo> @@ -97,7 +92,7 @@ </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">Hillcroft College</OrganizationName> - <OrganizationDisplayName xml:lang="en">Hillcroft College for Women (Shibboleth)</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Hillcroft College</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.hillcroft.ac.uk/</OrganizationURL> </Organization> <ContactPerson contactType="support"> |