Skip to content

Commit 16fc083

Browse files
committed
SPR-8391 Minor documentation fixes
1 parent f1ad53d commit 16fc083

File tree

1 file changed

+10
-9
lines changed
  • spring-framework-reference/src

1 file changed

+10
-9
lines changed

spring-framework-reference/src/mvc.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
<imagedata align="center" fileref="images/mvc.png" format="PNG" />
238238
</imageobject>
239239

240-
<caption><para>The requesting processing workflow in Spring Web MVC
240+
<caption><para>The request processing workflow in Spring Web MVC
241241
(high level)</para></caption>
242242
</mediaobject></para>
243243

@@ -843,7 +843,7 @@ public String findOwner(<emphasis role="bold">@PathVariable</emphasis>("ownerId"
843843
<programlisting language="java">@RequestMapping(value="/owners/{ownerId}/pets/{petId}", method=RequestMethod.GET)
844844
public String findPet(<emphasis role="bold">@PathVariable</emphasis> String ownerId, <emphasis
845845
role="bold">@PathVariable</emphasis> String petId, Model model) {
846-
Owner owner = ownerService.findOwner(ownderId);
846+
Owner owner = ownerService.findOwner(ownerId);
847847
Pet pet = owner.getPet(petId);
848848
model.addAttribute("pet", pet);
849849
return "displayPet";
@@ -3208,21 +3208,22 @@ public class SimpleController {
32083208
</sidebar>
32093209

32103210
<para>The strategy for generating a name after adding a
3211-
<interfacename>Set</interfacename>, <interfacename>List</interfacename>
3212-
or array object is to peek into the collection, take the short class
3213-
name of the first object in the collection, and use that with
3214-
<literal>List</literal> appended to the name. Some examples will make
3215-
the semantics of name generation for collections clearer...</para>
3211+
<interfacename>Set</interfacename> or a <interfacename>List</interfacename>
3212+
is to peek into the collection, take the short class name of the first object
3213+
in the collection, and use that with <literal>List</literal> appended to the
3214+
name. The same applies to arrays although with arrays it is not necessary to
3215+
peek into the array contents. A few examples will make the semantics of name
3216+
generation for collections clearer:</para>
32163217

32173218
<itemizedlist>
32183219
<listitem>
3219-
<para>An <classname>x.y.User[]</classname> array with one or more
3220+
<para>An <classname>x.y.User[]</classname> array with zero or more
32203221
<classname>x.y.User</classname> elements added will have the name
32213222
<literal>userList</literal> generated.</para>
32223223
</listitem>
32233224

32243225
<listitem>
3225-
<para>An <classname>x.y.Foo[]</classname> array with one or more
3226+
<para>An <classname>x.y.Foo[]</classname> array with zero or more
32263227
<classname>x.y.User</classname> elements added will have the name
32273228
<literal>fooList</literal> generated.</para>
32283229
</listitem>

0 commit comments

Comments
 (0)