Browse Source

Minor doc corrections

Luke Taylor 15 years ago
parent
commit
40056f2e4a

+ 2 - 2
docs/manual/src/docbook/appendix-namespace.xml

@@ -12,11 +12,11 @@
     intended as a supplement to the information there. Using a good quality XML editor while editing
     a configuration based on the schema is recommended as this will provide contextual information
     on which elements and attributes are available as well as comments explaining their purpose. The
-    namespace is captured in <link xlink:href="http://www.relaxng.org/">RELAX NG</link> Compact
+    namespace is written in <link xlink:href="http://www.relaxng.org/">RELAX NG</link> Compact
     format and later converted into an XSD schema. If you are familiar with this format, you may
     wish to examine the <link
       xlink:href="https://src.springsource.org/svn/spring-security/trunk/config/src/main/resources/org/springframework/security/config/spring-security-3.0.rnc"
-      >schema file</link>.</para>
+      >schema file</link> directly.</para>
   <section xml:id="nsa-http">
     <title>Web Application Security - the <literal>&lt;http&gt;</literal> Element</title>
     <para> The <literal>&lt;http&gt;</literal> element encapsulates the security configuration for

+ 9 - 3
docs/manual/src/docbook/cas-auth-provider.xml

@@ -270,14 +270,20 @@
       Instead, the user will need to re-enter their username and password in order to gain access to
       the service.</para>
     <para>The following beans should be configured to commence the CAS authentication
-      process:</para>
+      process (assuming you're using a namespace configuration):</para>
     <para>
       <programlisting><![CDATA[
-<security:authentication-manager alias="authenticationManager"/>      
+<security:authentication-manager alias="authenticationManager">
+  ...
+</security:authentication-manager>
+      
+<security:http>
+   ...
+   <custom-filter position="FORM_LOGIN_FILTER" ref="myFilter" />
+</security:http>
       
 <bean id="casFilter" 
       class="org.springframework.security.cas.web.CasAuthenticationFilter">
-  <security:custom-filter after="CAS_PROCESSING_FILTER"/>
   <property name="authenticationManager" ref="authenticationManager"/>
   <property name="authenticationFailureUrl" value="/casfailed.jsp"/>
   <property name="defaultTargetUrl" value="/"/>