Eleftheria Stein 4 gadi atpakaļ
vecāks
revīzija
d3ef340b26

+ 1 - 1
config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java

@@ -299,7 +299,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 	 * </p>
 	 *
 	 * <p>
-	 * If a URL is specified or this is not being used in conjuction with
+	 * If a URL is specified or this is not being used in conjunction with
 	 * {@link WebSecurityConfigurerAdapter}, users are required to process the specified
 	 * URL to generate a login page.
 	 * </p>

+ 1 - 1
config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java

@@ -89,7 +89,7 @@ public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>> extends
 	 * </p>
 	 *
 	 * <p>
-	 * If a URL is specified or this is not being used in conjuction with
+	 * If a URL is specified or this is not being used in conjunction with
 	 * {@link WebSecurityConfigurerAdapter}, users are required to process the specified
 	 * URL to generate a login page. In general, the login page should create a form that
 	 * submits a request with the following requirements to work with

+ 1 - 1
config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java

@@ -234,7 +234,7 @@ public final class OpenIDLoginConfigurer<H extends HttpSecurityBuilder<H>>
 	 * </p>
 	 *
 	 * <p>
-	 * If a URL is specified or this is not being used in conjuction with
+	 * If a URL is specified or this is not being used in conjunction with
 	 * {@link WebSecurityConfigurerAdapter}, users are required to process the specified
 	 * URL to generate a login page.
 	 * </p>

+ 1 - 1
core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java

@@ -54,7 +54,7 @@ import org.springframework.util.ReflectionUtils;
  * </pre>
  *
  * <p>
- * It is common for users to use {@link AnnotationParameterNameDiscoverer} in conjuction
+ * It is common for users to use {@link AnnotationParameterNameDiscoverer} in conjunction
  * with {@link PrioritizedParameterNameDiscoverer}. In fact, Spring Security's
  * {@link DefaultSecurityParameterNameDiscoverer} (which is used by default with method
  * level security) extends {@link PrioritizedParameterNameDiscoverer} and will

+ 1 - 1
docs/manual/src/docs/asciidoc/_includes/servlet/authentication/jaas.adoc

@@ -66,7 +66,7 @@ For details, refer to the class level javadoc of `InMemoryConfiguration`.
 
 [[jaas-djap-config]]
 ==== DefaultJaasAuthenticationProvider Example Configuration
-While the Spring configuration for `InMemoryConfiguration` can be more verbose than the standarad JAAS configuration files, using it in conjuction with `DefaultJaasAuthenticationProvider` is more flexible than `JaasAuthenticationProvider` since it not dependant on the default `Configuration` implementation.
+While the Spring configuration for `InMemoryConfiguration` can be more verbose than the standard JAAS configuration files, using it in conjunction with `DefaultJaasAuthenticationProvider` is more flexible than `JaasAuthenticationProvider` since it not dependant on the default `Configuration` implementation.
 
 An example configuration of `DefaultJaasAuthenticationProvider` using `InMemoryConfiguration` is provided below.
 Note that custom implementations of `Configuration` can easily be injected into `DefaultJaasAuthenticationProvider` as well.