include all basic shapes in property prose for w3c#9728

Author: astearns

css-shapes-1/Overview.bs

@@ -920,9 +920,7 @@ Float Area Shape: the 'shape-outside' property</h3>
 
 		<dt><dfn><<basic-shape>></dfn></dt>
 		<dd>
-			The shape is computed based on the values of one
-			of ''inset()'', ''circle()'', ''ellipse()''
-			or ''polygon()''. If a <<shape-box>> is also supplied, this defines the <a>reference box</a> for the <<basic-shape>> function. If <<shape-box>> is not supplied, then the <a>reference box</a> defaults to ''margin-box''.
+			The shape is computed based on one of the <<basic-shape>> functions. If a <<shape-box>> is also supplied, this defines the <a>reference box</a> for the <<basic-shape>> function. If <<shape-box>> is not supplied, then the <a>reference box</a> defaults to ''margin-box''.
 		</dd>
 
 		<dt><dfn><<image>></dfn></dt>
@@ -1113,6 +1111,7 @@ Acknowledgments</h2>
 	This specification is made possible by input from
 	Tab Atkins Jr.,
 	Amelia Bellamy-Royds,
+	Oriol Brufau,
 	Andrei Bucur,
 	Alexandru Chiculita,
 	Boris Chiou,
@@ -1126,6 +1125,7 @@ Acknowledgments</h2>
 	Chris Jones,
 	Bem Jones-Bey,
 	Ian Kilpatrick,
+	Guillaume Lebas,
 	Ting-Yu Lin,
 	Eric Meyer,
 	Marcus Mielke,
@@ -1138,6 +1138,7 @@ Acknowledgments</h2>
 	Jen Simmons,
 	Peter Sorotokin,
 	Bear Travis,
+	Lea Verou,
 	Eugene Veselov,
 	Brad Werth,
 	Stephen Zilles
@@ -1151,6 +1152,7 @@ Change Log</h2>
 
 	<ul>
 		<li>Added vertex rounding for polygon() for <a href="https://github.com/w3c/csswg-drafts/issues/9843">issue #9843</a> </li>
+		<li>Updated shape-outside prose to include all <<basic-shape>>s for <a href="https://github.com/w3c/csswg-drafts/issues/9728">issue #9728</a> </li>
 	</ul>
 
 <h3 class="no-num" id="20140320">

css-shapes-2/Overview.bs

@@ -537,7 +537,7 @@ The 'shape-inside' Property</h4>
 		<dd>
 			The shape is computed based
 			on the values of one of
-			''inset()'', ''circle()'', ''ellipse()'' or ''polygon()''.
+			the <<basic-shape>> functions.
 
 		<dt><dfn><<url>></dfn>
 		<dd>