Review recent documentation and default servlet changes

- Relocate and fix typos in interface-based @RequestMapping tip (SPR-7537)
- Fix typos in constructor-arg 'name' disambiguation section (SPR-7443)
- Polish whitespace in DefaultServletHttpRequestHandler (SPR-7553)

Author: cbeams

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java

@@ -51,16 +51,16 @@ public class DefaultServletHttpRequestHandler implements HttpRequestHandler, Ser
 
 	/** Default Servlet name used by Tomcat, Jetty, JBoss, and GlassFish */
 	private static final String COMMON_DEFAULT_SERVLET_NAME = "default";
-	
+
 	/** Default Servlet name used by Google App Engine */
 	private static final String GAE_DEFAULT_SERVLET_NAME = "_ah_default";
-	
+
 	/** Default Servlet name used by Resin */
 	private static final String RESIN_DEFAULT_SERVLET_NAME = "resin-file";
-	
+
 	/** Default Servlet name used by WebLogic */
 	private static final String WEBLOGIC_DEFAULT_SERVLET_NAME = "FileServlet";
-	
+
 	/** Default Servlet name used by WebSphere */
 	private static final String WEBSPHERE_DEFAULT_SERVLET_NAME = "SimpleFileServlet";
 
@@ -104,7 +104,7 @@ else if (this.servletContext.getNamedDispatcher(WEBSPHERE_DEFAULT_SERVLET_NAME)
 				throw new IllegalStateException("Unable to locate the default servlet for serving static content. " +
 						"Please set the 'defaultServletName' property explicitly.");
 			}
-		}		
+		}
 	}
 
 

spring-framework-reference/src/beans-dependencies.xml

@@ -171,8 +171,8 @@ public class ExampleBean {
 &lt;/bean&gt;</programlisting>
 
           <para>Keep in mind that to make this work out of the box your code
-          has to be compiled with the debug flag enabled so that Spring can
-          lookup the parameter name from the constructor. If you can't compile
+          must be compiled with the debug flag enabled so that Spring can
+          look up the parameter name from the constructor. If you can't compile
           your code with debug flag (or don't want to) you can use
           <interfacename><ulink
           url="http://download.oracle.com/javase/6/docs/api/java/beans/ConstructorProperties.html">@ConstructorProperties</ulink></interfacename>

spring-framework-reference/src/mvc.xml

@@ -667,18 +667,6 @@ public class HelloWorldController {
 
 &lt;/beans&gt;</programlisting>
 
-      <para>A common pitfall when working with annotated controller classes is
-      a scenario where you want apply functionality to it that involves
-      creating a proxy for the controller object (transactional controllers
-      e.g.). Usually you will introduce an interface for the controller then
-      to use JDK dynamic proxies. To make this work you have to move the
-      <interfacename>@RequestMapping</interfacename> annotations to the
-      interface as well as the mapping lookup only "sees" the interface
-      exposed by the proxy then. An alternative might be to activate
-      <code>proxy-target-class="true"</code> in the configuration for the
-      functionality applied to the controller (in our transaction scenario in
-      <code>&lt;tx:annotation-driven /&gt;</code>). For more information on
-      various proxying mechanisms see <xref linkend="aop-proxying" />.</para>
     </section>
 
     <section id="mvc-ann-requestmapping">
@@ -777,6 +765,25 @@ public class ClinicController {
 
 }</programlisting>
 
+      <tip>
+        <title>Working with interface-based @Controller classes</title>
+        <para>A common pitfall when working with annotated controller classes
+        happens when applying functionality that requires creating a proxy
+        proxy for the controller object (e.g.
+        <interfacename>@Transactional</interfacename> methods). Usually you
+        will introduce an interface for the controller in order to use JDK
+        dynamic proxies. To make this work you must move the
+        <interfacename>@RequestMapping</interfacename> annotations to the
+        interface as as the mapping mechanism can only "see" the interface
+        exposed by the proxy. As an alternative, you may choose to activate
+        <code>proxy-target-class="true"</code> in the configuration for the
+        functionality applied to the controller (in our transaction scenario
+        in <code>&lt;tx:annotation-driven /&gt;</code>). Doing so indicates
+        that CGLIB-based subclass proxies should be used instead of
+        interface-based JDK proxies. For more information on various proxying
+        mechanisms see <xref linkend="aop-proxying"/>.</para>
+      </tip>
+
       <section id="mvc-ann-requestmapping-uri-templates">
         <title>URI Templates</title>