diff --git a/docs/manual/src/docbook/cas-auth-provider.xml b/docs/manual/src/docbook/cas-auth-provider.xml
index c576aa5019..400a77a6bd 100644
--- a/docs/manual/src/docbook/cas-auth-provider.xml
+++ b/docs/manual/src/docbook/cas-auth-provider.xml
@@ -292,7 +292,7 @@
     </programlisting>
     </para>
     <para> The <classname>CasAuthenticationEntryPoint</classname> should be selected to drive
-      authentication using <link xlink:href="ns-entry-point-ref"
+      authentication using <link xlink:href="#ns-entry-point-ref"
         ><literal>entry-point-ref</literal></link>. </para>
     <para>The <classname>CasAuthenticationFilter</classname> has very similar properties to the
         <classname>UsernamePasswordAuthenticationFilter</classname> (used for form-based logins).
diff --git a/docs/manual/src/docbook/core-services.xml b/docs/manual/src/docbook/core-services.xml
index 29cd586e6b..03e2bffcca 100644
--- a/docs/manual/src/docbook/core-services.xml
+++ b/docs/manual/src/docbook/core-services.xml
@@ -97,7 +97,7 @@
                     <interfacename>SaltSource</interfacename> enables the passwords to be populated
                 with a "salt", which enhances the security of the passwords in the authentication
                 repository. These will be discussed in more detail <link
-                    xlink:href="core-services-password-encodin">below</link>. </para>
+                    xlink:href="#core-services-password-encoding">below</link>. </para>
         </section>
         <section xml:id="core-services-erasing-credentials">
             <title>Erasing Credentials on Successful Authentication</title>
diff --git a/docs/manual/src/docbook/namespace-config.xml b/docs/manual/src/docbook/namespace-config.xml
index 8ad6f8602e..0c8037576f 100644
--- a/docs/manual/src/docbook/namespace-config.xml
+++ b/docs/manual/src/docbook/namespace-config.xml
@@ -518,7 +518,7 @@ List&lt;OpenIDAttribute> attributes = token.getAttributes();</programlisting>The
             <classname>OpenIDAttribute</classname> contains the attribute type and the retrieved
           value (or values in the case of multi-valued attributes). We'll see more about how the
             <classname>SecurityContextHolder</classname> class is used when we look at core Spring
-          Security components in the <link xlink:href="core-components">technical overview</link>
+          Security components in the <link xlink:href="#core-components">technical overview</link>
           chapter.</para>
       </section>
     </section>
@@ -624,7 +624,7 @@ List&lt;OpenIDAttribute> attributes = token.getAttributes();</programlisting>The
     <para>From version 2.0 onwards Spring Security has improved support substantially for adding
       security to your service layer methods. It provides support for JSR-250 annotation security as
       well as the framework's original <literal>@Secured</literal> annotation. From 3.0 you can also
-      make use of new <link xlink:href="el-access">expression-based annotations</link>. You can
+      make use of new <link xlink:href="#el-access">expression-based annotations</link>. You can
       apply security to a single bean, using the <literal>intercept-methods</literal> element to
       decorate the bean declaration, or you can secure multiple beans across the entire service
       layer using the AspectJ style pointcuts. </para>
diff --git a/docs/manual/src/docbook/preauth.xml b/docs/manual/src/docbook/preauth.xml
index 959c778d03..a7fb9d61c9 100644
--- a/docs/manual/src/docbook/preauth.xml
+++ b/docs/manual/src/docbook/preauth.xml
@@ -166,7 +166,7 @@ class="org.springframework.security.web.authentication.preauth.PreAuthenticatedA
           configuration (hence the user of the <literal>custom-filter</literal>,
             <literal>authentication-manager</literal> and
             <literal>custom-authentication-provider</literal> elements (you can read more about them
-          in the <link xlink:href="ns-config">namespace chapter</link>). You would leave these out
+          in the <link xlink:href="#ns-config">namespace chapter</link>). You would leave these out
           of a traditional bean configuration. It's also assumed that you have added a
             <interfacename>UserDetailsService</interfacename> (called
             <quote>userDetailsService</quote>) to your configuration to load the user's roles.
diff --git a/docs/manual/src/docbook/samples.xml b/docs/manual/src/docbook/samples.xml
index de0ce1d326..e29bcb103d 100644
--- a/docs/manual/src/docbook/samples.xml
+++ b/docs/manual/src/docbook/samples.xml
@@ -103,7 +103,7 @@ Success! Your web filters appear to be properly configured!
         <title>CAS Sample</title>
         <para> The CAS sample requires that you run both a CAS server and CAS client. It isn't
             included in the distribution so you should check out the project code as described in
-                <link xlink:href="get-source">the introduction</link>. You'll find the relevant
+                <link xlink:href="#get-source">the introduction</link>. You'll find the relevant
             files under the <filename>sample/cas</filename> directory. There's also a
                 <filename>Readme.txt</filename> file in there which explains how to run both the
             server and the client directly from the source tree, complete with SSL support. You have
diff --git a/docs/manual/src/docbook/taglibs.xml b/docs/manual/src/docbook/taglibs.xml
index c85bb759b1..f3544b4dd1 100644
--- a/docs/manual/src/docbook/taglibs.xml
+++ b/docs/manual/src/docbook/taglibs.xml
@@ -16,7 +16,7 @@
             Spring Security 3.0, it can be used in two ways <footnote>
                 <para>The legacy options from Spring Security 2.0 are also supported, but
                     discouraged.</para>
-            </footnote>. The first approach uses a <link xlink:href="el-access-we">web-security
+            </footnote>. The first approach uses a <link xlink:href="#el-access-web">web-security
                 expression</link>, specified in the <literal>access</literal> attribute of the tag.
             The expression evaluation will be delegated to the
                 <interfacename>WebSecurityExpressionHandler</interfacename> defined in the
diff --git a/docs/manual/src/docbook/technical-overview.xml b/docs/manual/src/docbook/technical-overview.xml
index 0b733fcf5f..d9136cc2d4 100644
--- a/docs/manual/src/docbook/technical-overview.xml
+++ b/docs/manual/src/docbook/technical-overview.xml
@@ -521,7 +521,7 @@ Successfully authenticated. Security context contains: \
           and should be consumed by Spring Security's <classname>RoleVoter</classname>. This is only
           relevant when a voter-based <interfacename>AccessDecisionManager</interfacename> is in
           use. We'll see how the <interfacename>AccessDecisionManager</interfacename> is implemented
-          in the <link xlink:href="authz-arch">authorization chapter</link>.</para>
+          in the <link xlink:href="#authz-arch">authorization chapter</link>.</para>
       </section>
       <section>
         <title>RunAsManager</title>