diff --git a/src/docbkx/namespace-config.xml b/src/docbkx/namespace-config.xml
index 57298a26c8..1f0acb7685 100644
--- a/src/docbkx/namespace-config.xml
+++ b/src/docbkx/namespace-config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="namespace-config" xmlns:xlink="http://www.w3.org/1999/xlink">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="ns-config" xmlns:xlink="http://www.w3.org/1999/xlink">
   <info>
     <title>Security Namespace Configuration</title>
   </info>
@@ -151,7 +151,7 @@
     </section>
     
     <section xml:id="ns-minimal">
-      <title>A Minimal <literal>&lt;http&gt;</literal>Configuration</title>
+      <title>A Minimal <literal>&lt;http&gt;</literal> Configuration</title>
       <para>
  All you need to enable web security to begin with is
         <programlisting><![CDATA[
@@ -196,7 +196,8 @@
         The configuration above defines two users, their passwords and their roles within the application (which will
         be used for access control). It is also possible to load user information from
         a standard properties file using the <literal>properties</literal> attribute on 
-        <literal>user-service</literal>. See <link xlink:href="#in-memory-service"/> for more details. 
+        <literal>user-service</literal>. See the section on 
+        <link xlink:href="#in-memory-service">in-memory authentication</link> for more details. 
         Using the <literal>&lt;authentication-provider&gt;</literal>
         element means that the user information will be used by the authentication
         manager to process authentication requests.        
diff --git a/src/docbkx/remember-me-authentication.xml b/src/docbkx/remember-me-authentication.xml
index 72f3c10b5a..b2a76bd080 100644
--- a/src/docbkx/remember-me-authentication.xml
+++ b/src/docbkx/remember-me-authentication.xml
@@ -141,10 +141,11 @@
 <bean id="rememberMeProcessingFilter"
     class="org.springframework.security.ui.rememberme.RememberMeProcessingFilter">
   <property name="rememberMeServices" ref="rememberMeServices"/>
+  <property name="authenticationManager" ref="theAuthenticationManager" />    
 </bean>
         
 <bean id="rememberMeServices" class="org.springframework.security.ui.rememberme.TokenBasedRememberMeServices">
-  <property name="userDetailsService" ref="jdbcDaoImpl"/>
+  <property name="userDetailsService" ref="myUserDetailsService"/>
   <property name="key" value="springRocks"/>
 </bean>
         
@@ -161,7 +162,7 @@
                 <literal>AuthenticationManager.setProviders()</literal> list, and add
                 <literal>RememberMeProcessingFilter</literal> into your
                 <literal>FilterChainProxy</literal> (typically immediately after your
-                <literal>AuthenticationProcessingFilter</literal>)</para>            
+                <literal>AuthenticationProcessingFilter</literal>).</para>           
         </section>
         <section>
             <title>PersistentTokenBasedRememberMeServices</title>
diff --git a/src/docbkx/springsecurity.xml b/src/docbkx/springsecurity.xml
index fd8e6ad3dd..e7dd4f9998 100644
--- a/src/docbkx/springsecurity.xml
+++ b/src/docbkx/springsecurity.xml
@@ -145,7 +145,7 @@
       <para>
         With some exceptions, we will be discussing the full details of Spring Security
         bean configuration rather than the shorthand
-        <link xlink:href="#namespace-config">namespace syntax</link>. You should review
+        <link xlink:href="#ns-config">namespace syntax</link>. You should review
         the introduction to using namespace configuration and the options it provides
         to see if they will meet your needs. As you come to use the framework more,
         and need to customize the internal behaviour, you will probably want to understand
diff --git a/src/docbkx/supporting-infrastructure.xml b/src/docbkx/supporting-infrastructure.xml
index 88a1b02628..40a777db7b 100644
--- a/src/docbkx/supporting-infrastructure.xml
+++ b/src/docbkx/supporting-infrastructure.xml
@@ -26,11 +26,11 @@
     instead are hard-coded in English within Spring Security's
     code.</para>
 
-    <para>Shipping in the <literal>acegi-security-xx.jar</literal> you
+    <para>Shipping in the <literal>spring-security-core-xx.jar</literal> you
     will find an <literal>org.springframework.security</literal> package
     that in turn contains a <literal>messages.properties</literal> file.
     This should be referred to by your
-    <literal>ApplicationContext</literal>, as Acegi Security classes
+    <literal>ApplicationContext</literal>, as Spring Security classes
     implement Spring's <literal>MessageSourceAware</literal> interface and
     expect the message resolver to be dependency injected at application
     context startup time. Usually all you need to do is register a bean
@@ -39,7 +39,7 @@
 
     <para><programlisting><![CDATA[
 <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
-  <property name="basename" value="org/acegisecurity/messages"/>
+  <property name="basename" value="org/springframework/security/messages"/>
 </bean>
 ]]></programlisting></para>