diff --git a/docs/manual/src/docbook/el-access.xml b/docs/manual/src/docbook/el-access.xml index 4ff2453452..afdc002514 100644 --- a/docs/manual/src/docbook/el-access.xml +++ b/docs/manual/src/docbook/el-access.xml @@ -157,14 +157,15 @@ if you wanted a particular method to only allow access to a user whose username matched that of the contact, you could write - @PreAuthorize("#contact.name == principal.name)") + @PreAuthorize("#contact.name == authentication.name") public void doSomething(Contact contact); - Here we are accessing another built–in expression, which is the - principal of the current Spring Security - Authentication object obtained from the security - context. You can also access the Authentication - object itself directly using the expression name - authentication. + Here we are accessing another built–in expression, authentication, + which is the Authentication stored in the + security context. You can also access its principal property + directly, using the expression principal. The value will + often be a UserDetails instance, so you might use an + expression like principal.username or + principal.enabled. Less commonly, you may wish to perform an access-control check after the method has been invoked. This can be achieved using the @PostAuthorize annotation. To access the return value from a diff --git a/docs/manual/src/docbook/introduction.xml b/docs/manual/src/docbook/introduction.xml index e465107cd6..774ddc7915 100644 --- a/docs/manual/src/docbook/introduction.xml +++ b/docs/manual/src/docbook/introduction.xml @@ -260,10 +260,10 @@
Config - <literal>spring-security-config.jar</literal> - Contains the security namespace parsing code (and hence nothing that you are - likely yo use directly in your application). You need it if you are using the + Contains the security namespace parsing code. You need it if you are using the Spring Security XML namespace for configuration. The main package is - org.springframework.security.config. + org.springframework.security.config. None of the + classes are intended for direct use in an application.
LDAP - <literal>spring-security-ldap.jar</literal>