Merge branch 'master' of github.com:w3c/csswg-drafts

Author: frivoal

css-grid/Overview.bs

@@ -1089,7 +1089,7 @@ Track Sizing: the 'grid-template-rows' and 'grid-template-columns' properties</h
 -->
 
 <h4 id='named-lines'>
-Named Grid Lines: the <css>(<<custom-ident>>*)</css> syntax</h4>
+Named Grid Lines: the <css>[<<custom-ident>>*]</css> syntax</h4>
 
 	While <a>grid lines</a> can always be referred to by their numerical index,
 	<dfn export lt="named line">named lines</dfn>

css-shapes-2/Overview.bs

@@ -333,7 +333,10 @@ The 'shape-inside' Property</h4>
 	the exclusion area(s) added
 	by 'shape-inside' and 'shape-padding'
 	(as well as any other exclusion areas
-	in the element's wrapping context).</p>
+	in the element's wrapping context).
+	In other words, 
+	overflow continues outside 
+	the rectangular bounds of the element.</p>
 
 	<div class='figure'>
 		<img alt="Overflow interacting with rounded rect"
@@ -348,6 +351,9 @@ The 'shape-inside' Property</h4>
 		</p>
 	</div>
 
+	Issue: improve the illustration above, 
+	using text to show overflow instead of greeked boxes.
+
 	When a shape-inside has a definite size
 	(no percentages used in the shape's definition)
 	an auto-sized element should use the shape