diff --git a/docs/faq/src/docbook/faq.xml b/docs/faq/src/docbook/faq.xml
index cb7120ee4c..6d9b2ccae3 100644
--- a/docs/faq/src/docbook/faq.xml
+++ b/docs/faq/src/docbook/faq.xml
@@ -199,7 +199,8 @@
                     chain configuration.
                     <programlisting>
     DEBUG [ExceptionTranslationFilter] - Authentication exception occurred; redirecting to authentication entry point
-    org.springframework.security.AuthenticationCredentialsNotFoundException: An Authentication object was not found in the SecurityContext
+    org.springframework.security.AuthenticationCredentialsNotFoundException:
+                   An Authentication object was not found in the SecurityContext
     at org.springframework.security.intercept.AbstractSecurityInterceptor.credentialsNotFound(AbstractSecurityInterceptor.java:342)
     at org.springframework.security.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:254)
                 </programlisting>
@@ -580,7 +581,9 @@
     JdbcTemplate template;
 
     List<GrantedAuthority> getGrantedAuthorities(DirContextOperations userData, String username) {
-      List<GrantedAuthority> = template.query("select role from roles where username = ?", new String[] {username}, new RowMapper<GrantedAuthority>() {
+      List<GrantedAuthority> = template.query("select role from roles where username = ?",
+                                                   new String[] {username},
+                                                   new RowMapper<GrantedAuthority>() {
         /**
          *  We're assuming here that you're using the standard convention of using the role
          *  prefix "ROLE_" to mark attributes which are supported by Spring Security's RoleVoter.
diff --git a/docs/manual/src/docbook/appendix-namespace.xml b/docs/manual/src/docbook/appendix-namespace.xml
index b51b54448c..6ceb1b03b9 100644
--- a/docs/manual/src/docbook/appendix-namespace.xml
+++ b/docs/manual/src/docbook/appendix-namespace.xml
@@ -591,7 +591,7 @@
             </section>
         </section>
     </section>
-    <section xml:id="ns-method-security">
+    <section xml:id="nsa-method-security">
         <title>Method Security</title>
         <section xml:id="nsa-gms">
             <title>The <literal>&lt;global-method-security&gt;</literal> Element</title>
diff --git a/docs/manual/src/docbook/namespace-config.xml b/docs/manual/src/docbook/namespace-config.xml
index 26f42c2e4b..07ff230320 100644
--- a/docs/manual/src/docbook/namespace-config.xml
+++ b/docs/manual/src/docbook/namespace-config.xml
@@ -9,7 +9,7 @@
         <para> Namespace configuration has been available since version 2.0 of the Spring framework.
             It allows you to supplement the traditional Spring beans application context syntax with
             elements from additional XML schema. You can find more information in the Spring <link
-            xlink:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/apc.html"
+            xlink:href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/htmlsingle/spring-framework-reference.html"
             > Reference Documentation</link>. A namespace element can be used simply to allow a more
             concise way of configuring an individual bean or, more powerfully, to define an
             alternative configuration syntax which more closely matches the problem domain and hides