diff --git a/docbook/reference/en/en-US/modules/adapter-config.xml b/docbook/reference/en/en-US/modules/adapter-config.xml index a9d4e08a16..d4ef6423c3 100755 --- a/docbook/reference/en/en-US/modules/adapter-config.xml +++ b/docbook/reference/en/en-US/modules/adapter-config.xml @@ -38,7 +38,7 @@ Some of these configuration switches may be adapter specific and some are common across all adapters. For Java adapters you can use ${...} enclosure as System property replacement. For example ${jboss.server.config.dir}. Also, you can obtain a template - for this config file from the admin console. Go to the realm and application you want a template for. + for this config file from the admin console. Go to the realm and select the application you want a template for. Go to the Installation tab and this will provide you with a template that includes the public key of the realm. @@ -348,7 +348,7 @@ If true, then adapter will send registration request to Keycloak. It's false - by default as useful just in cluster (See Registration of application nodes to Keycloak) + by default and useful just in cluster (See Registration of application nodes to Keycloak) diff --git a/docbook/reference/en/en-US/modules/admin-rest-api.xml b/docbook/reference/en/en-US/modules/admin-rest-api.xml index 74533cd4b5..56d5ccd63e 100755 --- a/docbook/reference/en/en-US/modules/admin-rest-api.xml +++ b/docbook/reference/en/en-US/modules/admin-rest-api.xml @@ -3,7 +3,7 @@ The Keycloak Admin Console is implemented entirely with a fully functional REST admin API. You can invoke this REST API from your Java applications by obtaining an access token. You must have the appropriate - permissions set up as describe in and + permissions set up as described in and The documentation for this REST API is auto-generated and is contained in the distribution of keycloak under diff --git a/docbook/reference/en/en-US/modules/events.xml b/docbook/reference/en/en-US/modules/events.xml index e580448d62..57cac03ded 100755 --- a/docbook/reference/en/en-US/modules/events.xml +++ b/docbook/reference/en/en-US/modules/events.xml @@ -40,7 +40,7 @@
Event Listener - Keycloak comes with an Email Event Listener and a JBogg Logging Event Listener. The Email Event Listener + Keycloak comes with an Email Event Listener and a JBoss Logging Event Listener. The Email Event Listener sends an email to the users account when an event occurs. The JBoss Logging Event Listener writes to a log file when an events occurs. diff --git a/docbook/reference/en/en-US/modules/javascript-adapter.xml b/docbook/reference/en/en-US/modules/javascript-adapter.xml index c20856210c..80f04ede87 100755 --- a/docbook/reference/en/en-US/modules/javascript-adapter.xml +++ b/docbook/reference/en/en-US/modules/javascript-adapter.xml @@ -206,7 +206,7 @@ new Keycloak({ url: 'http://localhost/auth', realm: 'myrealm', clientId: 'myApp' Options is an Object, where: redirectUri - specifies the uri to redirect to after login - prompt - can be set to 'none' to check if the user is logged in already (if not logged in a login form is not displayed) + prompt - can be set to 'none' to check if the user is logged in already (if not logged in, a login form is not displayed) loginHint - used to pre-fill the username/email field on the login form @@ -218,7 +218,7 @@ new Keycloak({ url: 'http://localhost/auth', realm: 'myrealm', clientId: 'myApp' Options is an Object, where: redirectUri - specifies the uri to redirect to after login - prompt - can be set to 'none' to check if the user is logged in already (if not logged in a login form is not displayed) + prompt - can be set to 'none' to check if the user is logged in already (if not logged in, a login form is not displayed) diff --git a/docbook/reference/en/en-US/modules/multi-tenancy.xml b/docbook/reference/en/en-US/modules/multi-tenancy.xml index 410621f049..e7b385ee8c 100644 --- a/docbook/reference/en/en-US/modules/multi-tenancy.xml +++ b/docbook/reference/en/en-US/modules/multi-tenancy.xml @@ -9,7 +9,7 @@ The same WAR file deployed under two different names, each with its own Keycloak configuration (probably via the Keycloak Subsystem). This scenario is suitable when the number of realms is known in advance or when there's a dynamic provision of application instances. - One example would be a service provider that dinamically creates servers/deployments for their clients, like a PaaS. + One example would be a service provider that dynamically creates servers/deployments for their clients, like a PaaS. @@ -37,7 +37,7 @@ Add a context parameter to the web.xml, named keycloak.config.resolver. - The value of this property should be the fully qualified name of the a class extending + The value of this property should be the fully qualified name of the class extending org.keycloak.adapters.KeycloakConfigResolver. @@ -51,6 +51,6 @@ - An implementation of this feature can be found on the examples. + An implementation of this feature can be found in the examples.
diff --git a/docbook/reference/en/en-US/modules/providers.xml b/docbook/reference/en/en-US/modules/providers.xml index 62b5b8e3d8..4e2239dcbd 100755 --- a/docbook/reference/en/en-US/modules/providers.xml +++ b/docbook/reference/en/en-US/modules/providers.xml @@ -80,9 +80,7 @@ public class MyEventListenerProvider implements EventListenerProvider { The file META-INF/services/org.keycloak.events.EventListenerProviderFactory should contain the full name of your ProviderFactory implementation: - + @@ -142,7 +140,7 @@ org.acme.provider.MyEventListenerProviderFactory Connections Jpa - Loads and configures Infinispan connections. The default implementation can load datasources + Loads and configures Jpa connections. The default implementation can load datasources from WildFly/EAP, or alternatively can be manually configured in keycloak-server.json. @@ -188,15 +186,15 @@ org.acme.provider.MyEventListenerProviderFactory Exports the Keycloak database. Keycloak provides implementations that export to JSON files either - as a single file, multiple file in a directory or a encrypted ZIP archive. + as a single file, multiple files in a directory or a encrypted ZIP archive. Import - Imports and exported Keycloak database. Keycloak provides implementations that import from JSON + Imports an exported Keycloak database. Keycloak provides implementations that import from JSON files either - as a single file, multiple file in a directory or a encrypted ZIP archive. + as a single file, multiple files in a directory or a encrypted ZIP archive. diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml index a4b5455fe3..35d231db30 100755 --- a/docbook/reference/en/en-US/modules/server-installation.xml +++ b/docbook/reference/en/en-US/modules/server-installation.xml @@ -94,8 +94,8 @@ keycloak-war-dist-all-&project.version;/ $ cd keycloak-war-dist-all-&project.version; - $ cp -r deployments $JBOSS_HOME/standalone - $ cp -r configuration $JBOSS_HOME/standalone + $ cp -r deployments $JBOSS_HOME/standalone/deployments + $ cp -r configuration $JBOSS_HOME/standalone/configuration @@ -515,7 +515,7 @@ keycloak-war-dist-all-&project.version;/ - You should answer the What is your first and last name? question with + You should answer What is your first and last name ? question with the DNS name of the machine you're installing the server on. For testing purposes, localhost should be used. After executing this command, the keycloak.jks file will be generated in the same directory as you executed diff --git a/docbook/reference/en/en-US/modules/timeouts.xml b/docbook/reference/en/en-US/modules/timeouts.xml index 62d72a6ade..ef410199a6 100755 --- a/docbook/reference/en/en-US/modules/timeouts.xml +++ b/docbook/reference/en/en-US/modules/timeouts.xml @@ -11,7 +11,7 @@ If you go to the admin console page of Settings->General, you should see a Remember Me on/off switch. Your realm sets a SSO cookie so that you only have to enter in your login credentials once. This Remember Me admin config option, when turned on, will show a "Remember Me" checkbox on the user's login page. - If the user clicks this, the realm's SSO. cookie will be persistent. This means that if the user closes their browser + If the user clicks this, the realm's SSO cookie will be persistent. This means that if the user closes their browser they will still be logged in the next time they start up their browser. diff --git a/docbook/reference/en/en-US/modules/user-federation.xml b/docbook/reference/en/en-US/modules/user-federation.xml index f1ba3babf3..777f4b71fe 100755 --- a/docbook/reference/en/en-US/modules/user-federation.xml +++ b/docbook/reference/en/en-US/modules/user-federation.xml @@ -155,7 +155,7 @@ The keycloak examples directory contains an example of a simple User Federation Provider backed by a simple properties file. See examples/providers/federation-provider. Most of how - to create a federation provider is explain directly within the example code, but some information is here too. + to create a federation provider is explained directly within the example code, but some information is here too. Writing a User Federation Provider starts by implementing the UserFederationProvider