diff --git a/docs/manual/src/docbook/dao-auth-provider.xml b/docs/manual/src/docbook/dao-auth-provider.xml
deleted file mode 100644
index 528c57c2aa..0000000000
--- a/docs/manual/src/docbook/dao-auth-provider.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
- DAO Authentication Provider
-
-
-
- Overview
-
- Spring Security includes a production-quality
- AuthenticationProvider implementation called
- DaoAuthenticationProvider. This authentication provider is compatible
- with all of the authentication mechanisms that generate a
- UsernamePasswordAuthenticationToken, and is probably the most
- commonly used provider in the framework. Like most of the other authentication
- providers, the DaoAuthenticationProvider leverages a UserDetailsService in order to
- lookup the username, password and GrantedAuthority[]s. Unlike most of the other
- authentication providers that leverage UserDetailsService, this authentication provider
- actually requires the password to be presented, and the provider will actually evaluate
- the validity or otherwise of the password presented in an authentication request
- object.
-
-
-
- Configuration
-
- Aside from adding DaoAuthenticationProvider to your ProviderManager list (as discussed
- at the start of this part of the reference guide), and ensuring a suitable
- authentication mechanism is configured to present a UsernamePasswordAuthenticationToken,
- the configuration of the provider itself is rather simple:
-
-
-
-
-
- ]]>
-
- The PasswordEncoder and SaltSource are optional.
- A PasswordEncoder provides encoding and decoding of passwords
- presented in the UserDetails object that is returned from
- the configured UserDetailsService. A
- SaltSource enables the passwords to be populated with a "salt", which
- enhances the security of the passwords in the authentication repository.
- PasswordEncoder implementations are provided with Spring Security
- covering MD5, SHA and cleartext encodings. Two SaltSource
- implementations are also provided: SystemWideSaltSource which encodes
- all passwords with the same salt, and ReflectionSaltSource, which
- inspects a given property of the returned UserDetails
- object to obtain the salt. Please refer to the JavaDocs for further details on these
- optional features.
- In addition to the properties above, the DaoAuthenticationProvider
- supports optional caching of UserDetails objects. The
- UserCache interface enables the
- DaoAuthenticationProvider to place a
- UserDetails object into the cache, and retrieve it from
- the cache upon subsequent authentication attempts for the same username. By default the
- DaoAuthenticationProvider uses the NullUserCache,
- which performs no caching. A usable caching implementation is also provided,
- EhCacheBasedUserCache, which is configured as follows:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]]>
-
- All Spring Security EH-CACHE implementations (including
- EhCacheBasedUserCache) require an EH-CACHE Cache
- object. The Cache object can be obtained from wherever you like,
- although we recommend you use Spring's factory classes as shown in the above
- configuration. If using Spring's factory classes, please refer to the Spring
- documentation for further details on how to optimise the cache storage location, memory
- usage, eviction policies, timeouts etc.
-
- In the majority of cases, where your application is a stateful web application,
- you don't need to use a cache as the user's authentication information will be
- stored in the HttpSession.
-
-
-
diff --git a/docs/manual/src/docbook/springsecurity.xml b/docs/manual/src/docbook/springsecurity.xml
index 4c4d54dfef..aded484602 100644
--- a/docs/manual/src/docbook/springsecurity.xml
+++ b/docs/manual/src/docbook/springsecurity.xml
@@ -130,31 +130,7 @@
-
+
Authorization