From 87caa133634c9e0ebcd9aa7f7231552dd93bcbe6 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Tue, 10 Aug 2010 13:48:44 +0000
Subject: [PATCH] Clarify ConversionServiceFactoryBean documentation (SPR-7362)

- The sentence at the end of section 5.5.5 now refers to the
  <mvc:annotation-driven conversion-service="..."/> example at the end
  of section 5.6.

- The sentence at the end of section 5.5.5 refers to the
  FormatterConversionServiceFactoryBean section that follows.
---
 spring-framework-reference/src/validation.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spring-framework-reference/src/validation.xml b/spring-framework-reference/src/validation.xml
index 280c0ff96d..cb437faca5 100644
--- a/spring-framework-reference/src/validation.xml
+++ b/spring-framework-reference/src/validation.xml
@@ -1106,6 +1106,16 @@ public interface ConversionService {
         </list>
     </property>
 </bean>]]></programlisting>
+
+      <para>It is also common to use a ConversionService within a Spring MVC
+        application. See <xref linkend="format-configuring-FormatterRegistry"/>
+        for details on use with
+        <literal>&lt;mvc:annotation-driven/&gt;</literal>.</para>
+
+      <para>In certain situations you may wish to apply formatting during
+        conversion. See <xref linkend="format-FormatterRegistry-SPI"/> for
+        details on using
+        <classname>FormattingConversionServiceFactoryBean</classname>.</para>
     </section>
 
     <section id="core-convert-programmatic-usage">