From 4c84805ac9b824fed3816c9f986c322bd8c24e85 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Tue, 28 Jan 2014 16:51:05 -0600
Subject: [PATCH] SEC-2466: CSRF MutipartFilter doc now uses <url-pattern>

---
 docs/manual/src/asciidoc/index.adoc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/manual/src/asciidoc/index.adoc b/docs/manual/src/asciidoc/index.adoc
index 2e729aa62e..08d34a661e 100644
--- a/docs/manual/src/asciidoc/index.adoc
+++ b/docs/manual/src/asciidoc/index.adoc
@@ -3244,7 +3244,7 @@ There are two options to using CSRF protection with multipart/form-data. Each op
 
 [NOTE]
 ====
-More information about using multipart forms with Spring can be found within the http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/mvc.html#mvc-multipart[17.10 Spring's multipart (file upload) support] section of the Spring reference.
+Before you integrate Spring Security's CSRF protection with multipart file upload, ensure that you can upload without the CSRF protection first. More information about using multipart forms with Spring can be found within the http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/mvc.html#mvc-multipart[17.10 Spring's multipart (file upload) support] section of the Spring reference.
 ====
 
 [[csrf-multipartfilter]]
@@ -3278,13 +3278,12 @@ To ensure `MultipartFilter` is specified before the Spring Security filter with
 </filter>
 <filter-mapping>
     <filter-name>MultipartFilter</filter-name>
-    <servlet-name>/*</servlet-name>
+    <url-pattern>/*</url-pattern>
 </filter-mapping>
 <filter-mapping>
     <filter-name>springSecurityFilterChain</filter-name>
     <url-pattern>/*</url-pattern>
 </filter-mapping>
-
 ----
 
 [[csrf-include-csrf-token-in-action]]