diff --git a/src/docbkx/namespace-config.xml b/src/docbkx/namespace-config.xml
index d4029febc1..dce9a8ba24 100644
--- a/src/docbkx/namespace-config.xml
+++ b/src/docbkx/namespace-config.xml
@@ -301,7 +301,18 @@
Where "securityDataSource" is the name of a DataSource bean in the application context,
pointing at a database containing the standard Spring Security user data tables. Alternatively, you could configure
a Spring Security JdbcDaoImpl bean and point at that using the user-service-ref
- attribute.
+ attribute:
+
+
+
+
+
+ ]]>
+
+ You can also use standard AuthenticationProvider beans by adding the
+ <custom-authentication-provider> element within the bean definition. See
+ for more on this.
Adding a Password Encoder
@@ -683,7 +694,7 @@
For method security, you do this by setting the access-decision-manager-ref attribute
- on global-securityto the Id of the appropriate
+ on global-method-securityto the Id of the appropriate
AccessDecisionManager bean in the application context:
@@ -699,31 +710,33 @@
]]>
-
-
-
- The Authentication Manager
-
- We've touched on the idea that the namespace configuration automatically registers an authentication manager bean for
- you. This is an instance of Spring Security's ProviderManager class, which you may already
- be familiar with if you've used the framework before.
-
-
- You may want to register additional AuthenticationProvider beans with the ProviderManager
- and you can do this using the <custom-authentication-provider> element within the bean. For example:
-
+
+
+ The Default Authentication Manager
+
+ We've touched on the idea that the namespace configuration automatically registers an authentication manager bean for
+ you. This is an instance of Spring Security's ProviderManager class, which you may already
+ be familiar with if you've used the framework before. You can't use a custom AuthenticationProvider if you are
+ using either HTTP or method security through the namespace, but this should not be a problem as you have full control over
+ the AuthenticationProviders that are used.
+
+
+ You may want to register additional AuthenticationProvider beans with the ProviderManager
+ and you can do this using the <custom-authentication-provider> element within the bean. For example:
+
...
]]>
-
-
- Another common requirement is that another bean in the context may require a reference to the AuthenticationManager.
- There is a special element which lets you register an alias for the AuthenticationManager and you can then
- use this name elsewhere in your application context.
-
+
+ Another common requirement is that another bean in the context may require a reference to the AuthenticationManager.
+ There is a special element which lets you register an alias for the AuthenticationManager and you can then
+ use this name elsewhere in your application context.
+
@@ -732,8 +745,7 @@
...
]]>
-
-
-
+
+
\ No newline at end of file