diff --git a/spring-webflow-samples/booking-mvc/.classpath b/spring-webflow-samples/booking-mvc/.classpath
index 275fd7fb..13087534 100755
--- a/spring-webflow-samples/booking-mvc/.classpath
+++ b/spring-webflow-samples/booking-mvc/.classpath
@@ -2,13 +2,13 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="build/dev"/>
 </classpath>
diff --git a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
index 297ca111..79538943 100755
--- a/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-mvc/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,9 @@
 <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
 <wb-resource deploy-path="/WEB-INF/lib" source-path="/target/war-expanded/WEB-INF/lib"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-<property name="java-output-path" value="target/classes"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+<property name="java-output-path" value="build/dev"/>
 <property name="context-root" value="/swf-booking-mvc"/>
 </wb-module>
 </project-modules>
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java
index 8fcb4a67..13c340dd 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java
@@ -26,31 +26,28 @@ import org.springframework.util.StringUtils;
 import org.springframework.webflow.core.collection.AttributeMap;
 
 /**
- * The default flow url handler for Spring Web Flow.
+ * The default FlowUrlHandler implementation for Spring Web Flow.
  * <p>
  * Expects URLs to launch flow to be of this pattern:
+ * </p>
  * 
  * <pre>
- * http://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow id&gt;
- * </pre>
- * 
- * For example:
- * 
- * <pre>
- * http://localhost/springtravel/app/booking
+ * http://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow path&gt;
  * </pre>
  * 
+ * As an example, the URL http://localhost/springtravel/app/booking would map to flow "booking", while the URL
+ * http://localhost/springtravel/app/hotels/booking would map to flow "hotels/booking". If the resource path ends in an
+ * extension it will be stripped; for example, /springtravel/app/booking.htm would still map to flow "booking".
+ * <p>
  * Expects URLs to resume flows to be of this pattern:
+ * </p>
  * 
  * <pre>
- * http://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow id&gt;?execution=&lt;flow execution key&gt;
+ * http://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow path&gt;?execution=&lt;flow execution key&gt;
  * </pre>
  * 
- * For example:
- * 
- * <pre>
- * http://localhost/springtravel/app/booking?execution=c1v1
- * </pre>
+ * As an example, the URL http://localhost/springtravel/app/hotels/booking?execution=e1s1 would attempt to resume
+ * execution "e1s1" of the "hotels/booking" flow.
  * 
  * @author Keith Donald
  *