Merge branch '6.1.x'

Author: jzheaux

docs/modules/ROOT/pages/servlet/configuration/java.adoc

@@ -348,7 +348,7 @@ 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