diff --git a/spring-webflow/changelog.txt b/spring-webflow/changelog.txt
index a1969f2c..6d7c2a02 100644
--- a/spring-webflow/changelog.txt
+++ b/spring-webflow/changelog.txt
@@ -9,6 +9,8 @@ Package org.springframework.binding
 * Fixed serializability problems in ConversionException, EvaluationException and MethodInvocationException.
 * Added targetCollection(String) method to MappingBuilder.
 
+Package org.springframework.webflow.action
+* Improved FormAction.setupForm() JavaDoc (SWF-325).
 
 Package org.springframework.webflow.config
 * FlowExecutorFactoryBean now has an 'inputMapper' property to conveniently configure the 'inputMapper'
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java
index 0e8d3790..6a3b70f2 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java
@@ -512,6 +512,13 @@ public class FormAction extends MultiAction implements InitializingBean {
 	 * custom property editors for formatting form object values in UI controls
 	 * such as text fields.
 	 * <p>
+	 * A new form object instance will only be created (or more generally
+	 * acquired) with a call to {@link #createFormObject(RequestContext)},
+	 * if the form object does not yet exist in the configured 
+	 * {@link #getFormObjectScope() scope}. If you want to reset the form
+	 * handling machinery, including creation or loading of a fresh form object
+	 * instance, call {@link #resetForm(RequestContext)} instead.
+	 * <p>
 	 * NOTE: This action method is not designed to be overidden and might
 	 * become <code>final</code> in a future version of Spring Web Flow. If
 	 * you need to execute custom form setup logic have your flow call this