From dc20a32dedb421712adcc666bec94b07396544c8 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Fri, 8 Apr 2016 22:29:56 +0200
Subject: [PATCH] Backported reference documentation fixes

Issue: SPR-13832
Issue: SPR-14003
---
 src/reference/docbook/beans-context-additional.xml | 6 +++---
 src/reference/docbook/mvc.xml                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/reference/docbook/beans-context-additional.xml b/src/reference/docbook/beans-context-additional.xml
index 1e97fb66247..8cf19e31ad7 100644
--- a/src/reference/docbook/beans-context-additional.xml
+++ b/src/reference/docbook/beans-context-additional.xml
@@ -150,7 +150,7 @@
 message=Alligators rock!</programlisting>
 
     <programlisting language="java"><lineannotation># in exceptions.properties</lineannotation>
-argument.required=The '{0}' argument is required.</programlisting>
+argument.required=The {0} argument is required.</programlisting>
 
     <para>A program to execute the <classname>MessageSource</classname>
       functionality is shown in the next example. Remember that all
@@ -219,7 +219,7 @@ argument.required=The '{0}' argument is required.</programlisting>
     <programlisting>The userDao argument is required.</programlisting>
 
     <para>With regard to internationalization (i18n), Spring's various
-      <classname>MessageResource</classname> implementations follow the same
+      <classname>MessageSource</classname> implementations follow the same
       locale resolution and fallback rules as the standard JDK
       <classname>ResourceBundle</classname>. In short, and continuing with the
       example <literal>messageSource</literal> defined previously, if you want
@@ -233,7 +233,7 @@ argument.required=The '{0}' argument is required.</programlisting>
       messages will be resolved is specified manually.</para>
 
     <programlisting><lineannotation># in exceptions_en_GB.properties</lineannotation>
-argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</programlisting>
+argument.required=Ebagum lad, the {0} argument is required, I say, required.</programlisting>
 
     <programlisting language="java">public static void main(final String[] args) {
   MessageSource resources = new ClassPathXmlApplicationContext("beans.xml");
diff --git a/src/reference/docbook/mvc.xml b/src/reference/docbook/mvc.xml
index 10af04d3b8e..6d1101cf035 100644
--- a/src/reference/docbook/mvc.xml
+++ b/src/reference/docbook/mvc.xml
@@ -2751,7 +2751,7 @@ deferredResult.setResult(data);
     <para>The following example shows how to configure an interceptor:</para>
 
     <programlisting language="xml">&lt;beans&gt;
-  &lt;bean id="handlerMapping" class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping"&gt;
+  &lt;bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping"&gt;
     &lt;property name="interceptors"&gt;
       &lt;bean class="example.MyInterceptor"/&gt;
     &lt;/property&gt;