diff --git a/docs/manual/src/docs/asciidoc/_includes/migrating.adoc b/docs/manual/src/docs/asciidoc/_includes/migrating.adoc deleted file mode 100644 index 2752551fac..0000000000 --- a/docs/manual/src/docs/asciidoc/_includes/migrating.adoc +++ /dev/null @@ -1,17 +0,0 @@ -[[m3to4]] -== Migrating from 3.x to 4.x - -NOTE: Upgrading from Spring Security 4.0.x is passive. -These instructions are for users who are updating from Spring Security 3.2.x to 4.1.x. - -As exploits against applications evolve, so must Spring Security. -As a major release version, the Spring Security team took the opportunity to make some non-passive changes which focus on: - -* Ensuring Spring Security is more https://www.owasp.org/index.php/Establish_secure_defaults[secure by default] -* Minimizing https://www.owasp.org/index.php/Information_Leakage[Information Leakage] -* Removing deprecated APIs - -For complete details on migrating from Spring Security 3 to Spring Security 4 refer to one of the guides below: - -* http://docs.spring.io/spring-security/site/migrate/current/3-to-4/html5/migrate-3-to-4-xml.html[Migrating from Spring Security 3.x to 4.x (XML Configuration)] -* http://docs.spring.io/spring-security/site/migrate/current/3-to-4/html5/migrate-3-to-4-jc.html[Migrating from Spring Security 3.x to 4.x (Java Configuration)] diff --git a/docs/manual/src/docs/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc index 02620b7b03..929018c24b 100644 --- a/docs/manual/src/docs/asciidoc/index.adoc +++ b/docs/manual/src/docs/asciidoc/index.adoc @@ -4134,15 +4134,14 @@ CSRF protection is enabled by default with Java Configuration. If you would like public class WebSecurityConfig extends WebSecurityConfigurerAdapter { -@Override -protected void configure(HttpSecurity http) throws Exception { - http - .csrf().disable(); -} + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .csrf().disable(); + } } ---- - [[csrf-include-csrf-token]] ==== Include the CSRF Token @@ -11405,5 +11404,3 @@ Provides Spring Security's JSP tag implementations. include::{include-dir}/proxy-server.adoc[] include::{include-dir}/faq.adoc[] - -include::{include-dir}/migrating.adoc[]