[css-grid] Add a note about how 'grid' works with its two branches.

Author: tabatkins

css-grid/Overview.bs

@@ -1805,16 +1805,19 @@ Grid Definition Shorthand: the 'grid' property</h2>
 	Computed value: see individual properties
 	</pre>
 
-	<p>
-		The 'grid' property is a shorthand that sets
-		all of the explicit grid properties
-		('grid-template-rows', 'grid-template-columns', and 'grid-template-areas')
-		as well as all the implicit grid properties
-		('grid-auto-rows', 'grid-auto-columns', and 'grid-auto-flow')
-		in a single declaration.
-		If <<'grid-auto-rows'>> value is omitted,
-		it is set to the value specified for 'grid-auto-columns'.
-		Other omitted values are set to their initial values.
+	The 'grid' property is a shorthand that sets
+	all of the explicit grid properties
+	('grid-template-rows', 'grid-template-columns', and 'grid-template-areas')
+	as well as all the implicit grid properties
+	('grid-auto-rows', 'grid-auto-columns', and 'grid-auto-flow')
+	in a single declaration.
+	If <<'grid-auto-rows'>> value is omitted,
+	it is set to the value specified for 'grid-auto-columns'.
+	Other omitted values are set to their initial values.
+
+	Note: Note that you can only specify the explicit <em>or</em> the implicit grid properties in a single 'grid' declaration.
+	The sub-properties you don't specify are set to their initial value,
+	as normal for shorthands.
 
 	<div class='example'>
 		<p>In addition to accepting the 'grid-template' shorthand syntax for setting up the <i>explicit grid</i>,

css-grid/Overview.html

@@ -1845,16 +1845,19 @@ <h2 class="heading settled heading" data-level=7 id=grid-shorthand><span class=s
 Grid Definition Shorthand: the <a class=property data-link-type=propdesc href=#propdef-grid title=grid>grid</a> property</span><a class=self-link href=#grid-shorthand></a></h2>
 
 <table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid>grid<a class=self-link href=#propdef-grid></a></dfn><tr><th>Value:<td class=prod><a class=production data-link-type=propdesc href=#propdef-grid-template title=grid-template>&lt;‘grid-template’&gt;</a> | [ <a class=production data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>&lt;‘grid-auto-flow’&gt;</a> [ <a class=production data-link-type=propdesc href=#propdef-grid-auto-columns title=grid-auto-columns>&lt;‘grid-auto-columns’&gt;</a> [ / <a class=production data-link-type=propdesc href=#propdef-grid-auto-rows title=grid-auto-rows>&lt;‘grid-auto-rows’&gt;</a> ]? ]? ]<tr><th>Initial:<td>see individual properties<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>see individual properties<tr><th>Media:<td>visual<tr><th>Computed value:<td>see individual properties<tr><th>Percentages:<td>see individual properties</table>
-	<p>
-		The <a class=property data-link-type=propdesc href=#propdef-grid title=grid>grid</a> property is a shorthand that sets
-		all of the explicit grid properties
-		(<a class=property data-link-type=propdesc href=#propdef-grid-template-rows title=grid-template-rows>grid-template-rows</a>, <a class=property data-link-type=propdesc href=#propdef-grid-template-columns title=grid-template-columns>grid-template-columns</a>, and <a class=property data-link-type=propdesc href=#propdef-grid-template-areas title=grid-template-areas>grid-template-areas</a>)
-		as well as all the implicit grid properties
-		(<a class=property data-link-type=propdesc href=#propdef-grid-auto-rows title=grid-auto-rows>grid-auto-rows</a>, <a class=property data-link-type=propdesc href=#propdef-grid-auto-columns title=grid-auto-columns>grid-auto-columns</a>, and <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a>)
-		in a single declaration.
-		If <a class=production data-link-type=propdesc href=#propdef-grid-auto-rows title=grid-auto-rows>&lt;‘grid-auto-rows’&gt;</a> value is omitted,
-		it is set to the value specified for <a class=property data-link-type=propdesc href=#propdef-grid-auto-columns title=grid-auto-columns>grid-auto-columns</a>.
-		Other omitted values are set to their initial values.
+<p>	The <a class=property data-link-type=propdesc href=#propdef-grid title=grid>grid</a> property is a shorthand that sets
+	all of the explicit grid properties
+	(<a class=property data-link-type=propdesc href=#propdef-grid-template-rows title=grid-template-rows>grid-template-rows</a>, <a class=property data-link-type=propdesc href=#propdef-grid-template-columns title=grid-template-columns>grid-template-columns</a>, and <a class=property data-link-type=propdesc href=#propdef-grid-template-areas title=grid-template-areas>grid-template-areas</a>)
+	as well as all the implicit grid properties
+	(<a class=property data-link-type=propdesc href=#propdef-grid-auto-rows title=grid-auto-rows>grid-auto-rows</a>, <a class=property data-link-type=propdesc href=#propdef-grid-auto-columns title=grid-auto-columns>grid-auto-columns</a>, and <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a>)
+	in a single declaration.
+	If <a class=production data-link-type=propdesc href=#propdef-grid-auto-rows title=grid-auto-rows>&lt;‘grid-auto-rows’&gt;</a> value is omitted,
+	it is set to the value specified for <a class=property data-link-type=propdesc href=#propdef-grid-auto-columns title=grid-auto-columns>grid-auto-columns</a>.
+	Other omitted values are set to their initial values.
+
+<p class=note>	Note: Note that you can only specify the explicit <em>or</em> the implicit grid properties in a single <a class=property data-link-type=propdesc href=#propdef-grid title=grid>grid</a> declaration.
+	The sub-properties you don’t specify are set to their initial value,
+	as normal for shorthands.
 
 	<div class=example>
 		<p>In addition to accepting the <a class=property data-link-type=propdesc href=#propdef-grid-template title=grid-template>grid-template</a> shorthand syntax for setting up the <a data-link-type=dfn href=#explicit-grid title="explicit grid">explicit grid</a>,