From bbdc3765b535829e84311f82a795821b47e25797 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Thu, 7 Jul 2016 17:05:04 -0400
Subject: [PATCH] Update doc on flow inheritance

Issue: SWF-1679
---
 src/reference/flow-inheritance.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/reference/flow-inheritance.xml b/src/reference/flow-inheritance.xml
index b5e016c8..30560134 100644
--- a/src/reference/flow-inheritance.xml
+++ b/src/reference/flow-inheritance.xml
@@ -65,6 +65,16 @@
 			<programlisting language="xml"><![CDATA[
 <view-state id="child-state" parent="parent-flow#parent-view-state">]]>
 			</programlisting>
+			<note>
+				<para>
+					The intent for flow-level inheritance is to define common states to be
+					added to and shared among multiple flow definitions while the intent
+					for state-level inheritance is to extend from and merge with a single
+					parent state. Flow-level inheritance is a good fit for composition
+					and multiple inheritance but at the state level you can still only
+					inherit from a single parent state.
+				</para>
+			</note>
 		</sect2>
 	</sect1>
 	<sect1 xml:id="flow-inheritance-abstract">