Merge branch '6.0.x' into 6.1.x

3 years ago · 36d0ca340a
1 changed files with 1 additions and 1 deletions
--- a/docs/modules/ROOT/pages/servlet/configuration/java.adoc
+++ b/docs/modules/ROOT/pages/servlet/configuration/java.adoc
@ -286,7 +286,7 @@ public class Config {
				@@ -286,7 +286,7 @@ public class Config {

 The code is invoked in the following order:

-* Code in the `Config.configure` method is invoked
+* Code in the `Config.filterChain` method is invoked
 * Code in the `MyCustomDsl.init` method is invoked
 * Code in the `MyCustomDsl.configure` method is invoked