Skip to content

Commit d3ef340

Browse files
committed
Fix typos
1 parent 808b8c3 commit d3ef340

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public void configure(B http) throws Exception {
299299
* </p>
300300
*
301301
* <p>
302-
* If a URL is specified or this is not being used in conjuction with
302+
* If a URL is specified or this is not being used in conjunction with
303303
* {@link WebSecurityConfigurerAdapter}, users are required to process the specified
304304
* URL to generate a login page.
305305
* </p>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public FormLoginConfigurer() {
8989
* </p>
9090
*
9191
* <p>
92-
* If a URL is specified or this is not being used in conjuction with
92+
* If a URL is specified or this is not being used in conjunction with
9393
* {@link WebSecurityConfigurerAdapter}, users are required to process the specified
9494
* URL to generate a login page. In general, the login page should create a form that
9595
* submits a request with the following requirements to work with

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public OpenIDLoginConfigurer<H> loginProcessingUrl(String loginProcessingUrl) {
234234
* </p>
235235
*
236236
* <p>
237-
* If a URL is specified or this is not being used in conjuction with
237+
* If a URL is specified or this is not being used in conjunction with
238238
* {@link WebSecurityConfigurerAdapter}, users are required to process the specified
239239
* URL to generate a login page.
240240
* </p>

core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
* </pre>
5555
*
5656
* <p>
57-
* It is common for users to use {@link AnnotationParameterNameDiscoverer} in conjuction
57+
* It is common for users to use {@link AnnotationParameterNameDiscoverer} in conjunction
5858
* with {@link PrioritizedParameterNameDiscoverer}. In fact, Spring Security's
5959
* {@link DefaultSecurityParameterNameDiscoverer} (which is used by default with method
6060
* level security) extends {@link PrioritizedParameterNameDiscoverer} and will

docs/manual/src/docs/asciidoc/_includes/servlet/authentication/jaas.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ For details, refer to the class level javadoc of `InMemoryConfiguration`.
6666

6767
[[jaas-djap-config]]
6868
==== DefaultJaasAuthenticationProvider Example Configuration
69-
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.
69+
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.
7070

7171
An example configuration of `DefaultJaasAuthenticationProvider` using `InMemoryConfiguration` is provided below.
7272
Note that custom implementations of `Configuration` can easily be injected into `DefaultJaasAuthenticationProvider` as well.

0 commit comments

Comments
 (0)