Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backported reference documentation fixes

Browse Source 
Issue: SPR-13832
Issue: SPR-14003
This commit is contained in:
Juergen Hoeller
2016-04-08 22:29:56 +02:00
parent ac5b9c7bd6
commit dc20a32ded
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/reference/docbook/beans-context-additional.xml
View File

@@ -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");

2
src/reference/docbook/mvc.xml
View File

@@ -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;