[css-grid] Move subgrid 'display' definition into the 'display' section of this spec. Delete more issues

Author: fantasai

css-grid/Overview.bs

@@ -716,11 +716,11 @@ Reordering and Accessibility</h2>
 Grid Containers</h2>
 
 <h3 id='grid-containers'>
-Establishing Grid Containers: the ''display/grid'' and ''inline-grid'' 'display' values</h3>
+Establishing Grid Containers: the ''display/grid'', ''inline-grid'', and ''subgrid'' 'display' values</h3>
 
 	<pre class="propdef">
 	Name: display
-	New values: grid | inline-grid
+	New values: grid | inline-grid | subgrid
 	</pre>
 
 	<dl dfn-for="display" dfn-type=value>
@@ -731,6 +731,20 @@ Establishing Grid Containers: the ''display/grid'' and ''inline-grid'' 'display'
 		<dt><dfn>inline-grid</dfn>
 		<dd>
 			This value causes an element to generate an inline-level <a>grid container</a> box.
+
+		<dt><dfn>subgrid</dfn>
+		<dd>
+			If the element is a <a>grid item</a>
+			(i.e. it is in-flow and its parent is a <a>grid container</a>),
+			this value makes the element a <a>subgrid</a>
+			(which is a special type of <a>grid container</a> box, see [[#subgrids]]).
+
+			Otherwise,
+			it behaves as ''grid''.
+
+			Issue: Should we make this contingent on whether grid-template-* have their initial values,
+			in case we want to expand this behavior in the future?
+			(Since grid-template-* is ignored by subgrids right now.)
 	</dl>
 
 	A <dfn export>grid container</dfn> establishes a new <dfn export>grid formatting context</dfn> for its contents.
@@ -784,7 +798,6 @@ Sizing Grid Containers</h3>
 	it is sized as an atomic inline-level box (such as an inline-block).
 	In both inline and block formatting contexts,
 	the <a>grid container</a>’s ''auto'' block size is its max-content size.
-	<span class="issue">The block layout spec should define this?</span>
 
 	The <a>max-content size</a> of a <a>grid container</a> is
 	the sum of the <a>grid container’s</a> track sizes in the appropriate axis,
@@ -2187,9 +2200,6 @@ Grid Definition Shorthand: the 'grid' property</h3>
 <h2 id="subgrids">
 Subgrids</h2>
 
-	Issue: This section is under discussion and has not been finalized.
-	The current text reflects <a href="https://lists.w3.org/Archives/Public/www-style/2016Apr/0254.html">this proposal</a> in preparation for WG discussion.
-
 	A <a>grid item</a> can itself be a <a>grid container</a> by giving it ''display: grid'';
 	in this case the layout of its contents will be independent of the layout of the grid it participates in.
 
@@ -2202,31 +2212,9 @@ Subgrids</h2>
 	participate in sizing the <a>grid</a> of the parent <a>grid container</a>,
 	allowing the contents of both grids to align.
 
-<h3 id='subgrid-items'>
-Establishing Subgrids: the ''subgrid'' 'display' value</h3>
-
-	<pre class="propdef">
-	Name: display
-	New values: subgrid
-	</pre>
-
-	<dl dfn-for="display" dfn-type=value>
-		<dt><dfn>subgrid</dfn>
-		<dd>
-			If the element is a <a>grid item</a>
-			(i.e. it is in-flow and its parent is a <a>grid container</a>),
-			this value makes the element a <a>subgrid</a>.
-
-			Otherwise,
-			it behaves as ''grid''.
-
-			Issue: Should we make this contingent on whether grid-template-* have their initial values,
-			in case we want to expand this behavior in the future?
-			(Since grid-template-* is ignored by subgrids right now.)
-	</dl>
-
 	<div class="example">
-			For example, suppose we have a form consisting of a list of inputs with labels:
+		For example, suppose we have a form consisting of a list of inputs with labels:
+
 		<pre class="lang-html">
 			&lt;ul>
 				&lt;li>&lt;label>Name:&lt;/label> &lt;input name=fn>