diff --git a/doc/xdocs/faq.html b/doc/xdocs/faq.html
index 4525c9094d..0c24019a8e 100644
--- a/doc/xdocs/faq.html
+++ b/doc/xdocs/faq.html
@@ -156,7 +156,8 @@
   <h2>Common Problem #1: My application goes into an "endless loop" when I try to login, what's going on?</h2>
   <p>A common user problem with infinite loop and redirecting to the login page
      is caused by accidently configuring the login page as a "secured" resource.
-     See this forum <a href="http://forum.springframework.org/viewtopic.php?t=8766">post</a> for more details.</p>
+     Generally make sure you mark your login page as requiring ROLE_ANONYMOUS.
+     </p>
 
   <h2>Common Problem #2: My application pages don't seem to be protected.</h2>
   <p>If you are securing web resources and they dont seem to be matched in the URL patterns,
@@ -176,8 +177,6 @@
   &lt;value>
 &lt;/property>     
 </pre>
-   <p>	
-   See this forum <a href="http://forum.springframework.org/viewtopic.php?t=8746">post</a> for more details.</p>
 
   <h2>Common Problem #3: How do I disable a user after a number of failed logins?</h2>
   <p>A common user requirement is to disable / lock an account after a number of failed login attempts.
@@ -197,16 +196,14 @@
        }  
      }
      </pre>
-     See this forum <a href="http://forum.springframework.org/viewtopic.php?t=8525">post</a> for more details.</p>
 
   <h2>Common Problem #4: I am changing my password using a web controller and DAO, why is my password still not being refreshed?</h2>
   <p>There are three things you must do to make a user password change take affect:
   <ul>
   <li> Change the password using your authentication DAO</li>
   <li> Remove the user from the User Cache (i.e. if you have a cache configured) </li>
-  <li> Update the <tt>ContextHolder</tt> to include the new <tt>Authentication</tt> object and password</li>
+  <li> Update the <tt>SecurityContextHolder</tt> to include the new <tt>Authentication</tt> object and password</li>
   </ul>
-  See this forum <a href="http://forum.springframework.org/viewtopic.php?t=4624">post</a> for more details.</p>
 
   <h2>I need some help. What files should I post?</h2>
   <p>The most important things to post with any support requests on the