diff --git a/spring-webflow-samples/booking-faces/.springWebflow b/spring-webflow-samples/booking-faces/.springWebflow
index 5ce16830..35c30362 100755
--- a/spring-webflow-samples/booking-faces/.springWebflow
+++ b/spring-webflow-samples/booking-faces/.springWebflow
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <webflow-project-description>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.1.0.v200808011800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.2.0.v200809261800]]></pluginVersion>
 	<configs>
 		<config>
-			<file>src/main/webapp/WEB-INF/flows/booking/booking.xml</file>
-			<name><![CDATA[booking]]></name>
+			<file>src/main/webapp/WEB-INF/flows/main/main-flow.xml</file>
+			<name><![CDATA[main-flow]]></name>
 		</config>
 		<config>
-			<file>src/main/webapp/WEB-INF/flows/main/main.xml</file>
-			<name><![CDATA[main]]></name>
+			<file>src/main/webapp/WEB-INF/flows/booking/booking-flow.xml</file>
+			<name><![CDATA[booking-flow]]></name>
 		</config>
 	</configs>
 </webflow-project-description>
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd b/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd
index 346aa109..e315ad49 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd
+++ b/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd
@@ -100,9 +100,11 @@ its parent registry will be queried.
 						<xsd:annotation>
 							<xsd:documentation>
 								<![CDATA[
-The base path where flow definitions are found.  All flow locations must be referenced relative to the base path.  The default 
-flow id is constructed based on the path to the flow minus the base path.  The remaining directory path will be used as the flow 
-id.  If flow definition is found directly on the base path, the file name, without extension, is used as the flow id 
+The base path where flow definitions are found.  When specified, all flow locations are relative to this path.
+Also when specified, by default flows are assigned ids equal to the the path segment between their base path and file name.
+For example, if a flow definition is located at '/WEB-INF/hotels/booking/booking-flow.xml' and the base path is '/WEB-INF', 
+the remaining path to this flow is 'hotels/booking' which then becomes the flow id.
+If a flow definition is found directly on the base path, the file name minus its extension is used as the flow id. 
 ]]>
 							</xsd:documentation>
 						</xsd:annotation>