Merge branch 'master' of github.com:keycloak/server_admin_guide

This commit is contained in:
Bill Burke 2016-06-06 10:00:52 -04:00
commit 8aec3bf8e0
2 changed files with 2 additions and 2 deletions

2
topics/clients/client-saml.adoc Executable file → Normal file
View file

@ -99,7 +99,7 @@ Root URL::
Valid Redirect URIs::
This is an optional field. Enter in a URL pattern and click the + sign to add. Click the - sign next to URLs you want to remove.
Remember that you still have to click the `Save` button!
Wildcards (*) are only allowed at the end of of a URI, i.e. http://host.com/*. This field is used when the exact SAML
Wildcards (\*) are only allowed at the end of of a URI, i.e. http://host.com/*. This field is used when the exact SAML
endpoints are not registered and {{book.project.name}} is pull the Assertion Consumer URL from the request.
Base URL::

2
topics/user-federation/ldap.adoc Executable file → Normal file
View file

@ -57,7 +57,7 @@ When you configure a secured connection URL to your LDAP store(for example `ldap
The important thing is to properly configure a truststore on the {{book.project.name}} server side, because SSL won't work
if {{book.project.name}} can't trust the SSL connection with LDAP ({{book.project.name}}.
The global truststore for the {{book.project.name}} can be configured with Truststore SPI. Please check out the link:{{book.installguide.link}}[book.installguide.name}}] for more detail.
The global truststore for the {{book.project.name}} can be configured with Truststore SPI. Please check out the link:{{book.installguide.link}}[{{book.installguide.name}}] for more detail.
If you don't configure truststore SPI, the truststore will fallback to the default mechanism provided by Java (either the file provided by system property `javax.net.ssl.trustStore`
or the cacerts file from JDK if the system property is not set).