From a93f8b8da66f969adfa91d3b63950e5ee5fb77fa Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 15 Jun 2011 10:37:58 +0000 Subject: [PATCH] Javadoc git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4546 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../java/org/springframework/oxm/castor/CastorMarshaller.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java index 2864a6c68a1..eabaa9a2bb6 100644 --- a/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java +++ b/org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java @@ -66,7 +66,7 @@ import org.springframework.util.xml.StaxUtils; * control over the behavior of Castor. * *

If a target class is specified using setTargetClass, the CastorMarshaller can only be - * used to unmarshall XML that represents that specific class. If you want to unmarshall multiple classes, you have to + * used to unmarshal XML that represents that specific class. If you want to unmarshal multiple classes, you have to * provide a mapping file using setMappingLocations. * *

Due to limitations of Castor's API, it is required to set the encoding used for writing to output streams. It @@ -660,7 +660,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing * occurs * during marshalling or unmarshalling, since Castor itself does not make this distinction in its exception hierarchy. * - * @param ex Castor XMLException that occured + * @param ex Castor XMLException that occurred * @param marshalling indicates whether the exception occurs during marshalling (true), or unmarshalling * (false) * @return the corresponding XmlMappingException