diff --git a/docs/manual/src/docs/asciidoc/_includes/about/getting-spring-security.adoc b/docs/manual/src/docs/asciidoc/_includes/about/getting-spring-security.adoc index 79652ef76f..aa73d87dfb 100644 --- a/docs/manual/src/docs/asciidoc/_includes/about/getting-spring-security.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/about/getting-spring-security.adoc @@ -77,6 +77,7 @@ You can do so by adding a Maven property, as the following example shows: If you use additional features (such as LDAP, OpenID, and others), you need to also include the appropriate <>. +[[getting-maven-no-boot]] === Maven Without Spring Boot When you use Spring Security without Spring Boot, the preferred way is to use Spring Security's BOM to ensure a consistent version of Spring Security is used throughout the entire project. The following example shows how to do so: diff --git a/docs/manual/src/docs/asciidoc/_includes/about/whats-new.adoc b/docs/manual/src/docs/asciidoc/_includes/about/whats-new.adoc index 0a4793a76c..0e1a3f8a93 100644 --- a/docs/manual/src/docs/asciidoc/_includes/about/whats-new.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/about/whats-new.adoc @@ -44,7 +44,7 @@ Below are the highlights of the release. === Core -* Introducing <> support +* Introducing <> support * Introducing https://github.com/spring-projects/spring-security/issues/6019[SAML Service Provider] support * Introducing https://github.com/spring-projects/spring-security/issues/6722[AuthenticationManagerResolver] * Introducing https://github.com/spring-projects/spring-security/issues/6506[AuthenticationFilter] diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/form.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/form.adoc index 0ec333f6d6..64ea770b75 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/form.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/form.adoc @@ -77,7 +77,7 @@ We could easily update our configuration if some of the defaults do not meet our <3> If the query parameter `logout` exists, the user was successfully logged out <4> The username must be present as the HTTP parameter named __username__ <5> The password must be present as the HTTP parameter named __password__ -<6> We must <> To learn more read the <> section of the reference +<6> We must <> To learn more read the <> section of the reference === Form Login XML Configuration diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/logout.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/logout.adoc index 17d35bf47f..4d8cf44b2d 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/logout.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/logout.adoc @@ -123,6 +123,6 @@ If not configured a status code 200 will be returned by default. - <> - <> - <> -- <> in section CSRF Caveats +- <> in section CSRF Caveats - Section <> (CAS protocol) - Documentation for the <> in the Spring Security XML Namespace section diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/exploits/csrf.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/exploits/csrf.adoc index aa94055f09..1480c40439 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/exploits/csrf.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/exploits/csrf.adoc @@ -205,7 +205,7 @@ By storing the expected CSRF in a cookie, JavaScript frameworks like https://doc [[servlet-csrf-include-ajax-meta]] ===== Meta tags -An alternative pattern to <> is to include the CSRF token within your `meta` tags. +An alternative pattern to <> is to include the CSRF token within your `meta` tags. The HTML might look something like this: .CSRF meta tag HTML @@ -278,7 +278,7 @@ Refer to <> for a more general discussion. It is important to <> requests to protect against forging log in attempts. Spring Security's servlet support does this out of the box. -[[servlet-considerations-csrf-login]] +[[servlet-considerations-csrf-logout]] === Logging Out It is important to <> requests to protect against forging log out attempts. diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/hello/java-configuration.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/hello/java-configuration.adoc index 77271862a9..7434dadf7d 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/hello/java-configuration.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/hello/java-configuration.adoc @@ -9,7 +9,7 @@ NOTE: You can find the completed application at {gh-samples-url}/javaconfig/hell == Updating Dependencies -The first step is to update the dependencies by using <> or <>. +The first step is to update the dependencies by using <> or <>. [[servlet-hello-jc-ews]] @@ -96,7 +96,7 @@ public class SecurityInitializer The `SecurityInitializer` does the following things: -* Adds a `ContextLoaderListener` that loads the <>. +* Adds a `ContextLoaderListener` that loads the <>. * Finds the bean of type `Filter` named `springSecurityFilterChain` and registers it to process every URL in the application. diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/mvc.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/mvc.adoc index 96d2b42b79..4c779e6408 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/mvc.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/mvc.adoc @@ -312,7 +312,7 @@ However, you can still use <> to provide transp ==== Automatic Token Inclusion -Spring Security will automatically <> within forms that use the https://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/view.html#view-jsp-formtaglib-formtag[Spring MVC form tag]. +Spring Security will automatically <> within forms that use the https://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/view.html#view-jsp-formtaglib-formtag[Spring MVC form tag]. For example, the following JSP: [source,xml] diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/websocket.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/websocket.adoc index f0fa456369..1fb7dfd0c6 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/websocket.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/integrations/websocket.adoc @@ -222,7 +222,7 @@ Typically we need to include the CSRF token in an HTTP header or an HTTP paramet However, SockJS does not allow for these options. Instead, we must include the token in the Stomp headers -Applications can <> by accessing the request attribute named _csrf. +Applications can <> by accessing the request attribute named _csrf. For example, the following will allow accessing the `CsrfToken` in a JSP: [source,javascript]