[css-align] Fix bug in justify/align-content grammar.

Author: tabatkins

css-align/Overview.bs

@@ -447,15 +447,16 @@ Overflow Alignment: the ''safe'' and ''true'' keywords</h3>
 <h2 id='content-distribution'>
 Content Distribution: the 'justify-content' and 'align-content' properties</h2>
 
-	The 'justify-content' and 'align-content' properties control alignment of the box's content within the box.
+	The <dfn export>content distribution properties</dfn> 'justify-content' and 'align-content'
+	control alignment of the box's content within the box.
 
 	<div class="figure">
 		<img alt="Diagram showing that the alignment of the content within the element is affected." src="images/content-example.svg" width=212 height=212>
 	</div>
 
 	<pre class="propdef">
 	Name: justify-content, align-content
-	Value: auto | <<baseline-position>> | [ <<item-position>> <<content-position>>? | <<content-position>> ] && <<overflow-position>>?
+	Value: auto | <<baseline-position>> | [ <<content-distribution>> <<content-position>>? | <<content-position>> ] && <<overflow-position>>?
 	Initial: auto
 	Applies to: block containers, flex containers, and grid containers
 	Inherited: no
@@ -472,8 +473,8 @@ Content Distribution: the 'justify-content' and 'align-content' properties</h2>
 
 	Aligns the contents of the box as a whole along the box's inline/row/main axis.
 	Values other than <dfn value for="justify-content, align-content">auto</dfn> are <a href="#alignment-values">defined above</a>.
-	If both a <<item-position>> and <<content-position>> are given,
-	the second value represents an explicit <a>fallback alignment</a>.
+	If both a <<content-distribution>> and <<content-position>> are given,
+	the <<content-position>> provides an explicit <a>fallback alignment</a>.
 
 	<hr>
 

css-align/Overview.html

@@ -61,7 +61,7 @@
 </p>
   <h1 class="p-name no-ref" id=title>CSS Box Alignment Module Level 3</h1>
   <h2 class="no-num no-toc no-ref heading settled" id=subtitle><span class=content>Editor’s Draft,
-    <span class=dt-updated><span class=value-title title=20140819>19 August 2014</span></span></span></h2>
+    <span class=dt-updated><span class=value-title title=20140820>20 August 2014</span></span></span></h2>
   <div data-fill-with=spec-metadata><dl>
 	<dt>This version:
 	<dd><a class=u-url href=http://dev.w3.org/csswg/css-align/>http://dev.w3.org/csswg/css-align/</a>
@@ -587,13 +587,14 @@ <h3 class="heading settled" data-level=3.4 id=overflow-values><span class=secno>
 <h2 class="heading settled" data-level=4 id=content-distribution><span class=secno>4 </span><span class=content>
 Content Distribution: the <a class=property data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content</a> and <a class=property data-link-type=propdesc href=#propdef-align-content title=align-content>align-content</a> properties</span><a class=self-link href=#content-distribution></a></h2>
 
-<p>The <a class=property data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content</a> and <a class=property data-link-type=propdesc href=#propdef-align-content title=align-content>align-content</a> properties control alignment of the box’s content within the box.</p>
+<p>The <dfn data-dfn-type=dfn data-export="" id=content-distribution-properties>content distribution properties<a class=self-link href=#content-distribution-properties></a></dfn> <a class=property data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content</a> and <a class=property data-link-type=propdesc href=#propdef-align-content title=align-content>align-content</a>
+	control alignment of the box’s content within the box.</p>
 
 	<div class=figure>
 		<img alt="Diagram showing that the alignment of the content within the element is affected." height=212 src=images/content-example.svg width=212>
 	</div>
 
-<table class="definition propdef"><tr><th>Name:<td><dfn class=css data-dfn-type=property data-export="" id=propdef-justify-content>justify-content<a class=self-link href=#propdef-justify-content></a></dfn>, <dfn class=css data-dfn-type=property data-export="" id=propdef-align-content>align-content<a class=self-link href=#propdef-align-content></a></dfn><tr><th>Value:<td class=prod>auto <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> <a class="production css" data-link-type=type href=#typedef-baseline-position title="<baseline-position>">&lt;baseline-position&gt;</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> [ <a class="production css" data-link-type=type href=#typedef-item-position title="<item-position>">&lt;item-position&gt;</a> <a class="production css" data-link-type=type href=#typedef-content-position title="<content-position>">&lt;content-position&gt;</a><a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#mult-opt title=?>?</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> <a class="production css" data-link-type=type href=#typedef-content-position title="<content-position>">&lt;content-position&gt;</a> ] <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-all title=&amp;&amp;>&amp;&amp;</a> <a class="production css" data-link-type=type href=#typedef-overflow-position title="<overflow-position>">&lt;overflow-position&gt;</a><a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#mult-opt title=?>?</a><tr><th>Initial:<td>auto<tr><th>Applies to:<td>block containers, flex containers, and grid containers<tr><th>Inherited:<td>no<tr><th>Media:<td>visual<tr><th>Computed value:<td>specified value<tr><th>Percentages:<td>n/a<tr><th>Animatable:<td>no</table>
+<table class="definition propdef"><tr><th>Name:<td><dfn class=css data-dfn-type=property data-export="" id=propdef-justify-content>justify-content<a class=self-link href=#propdef-justify-content></a></dfn>, <dfn class=css data-dfn-type=property data-export="" id=propdef-align-content>align-content<a class=self-link href=#propdef-align-content></a></dfn><tr><th>Value:<td class=prod>auto <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> <a class="production css" data-link-type=type href=#typedef-baseline-position title="<baseline-position>">&lt;baseline-position&gt;</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> [ <a class="production css" data-link-type=type href=#typedef-content-distribution title="<content-distribution>">&lt;content-distribution&gt;</a> <a class="production css" data-link-type=type href=#typedef-content-position title="<content-position>">&lt;content-position&gt;</a><a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#mult-opt title=?>?</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> <a class="production css" data-link-type=type href=#typedef-content-position title="<content-position>">&lt;content-position&gt;</a> ] <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-all title=&amp;&amp;>&amp;&amp;</a> <a class="production css" data-link-type=type href=#typedef-overflow-position title="<overflow-position>">&lt;overflow-position&gt;</a><a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#mult-opt title=?>?</a><tr><th>Initial:<td>auto<tr><th>Applies to:<td>block containers, flex containers, and grid containers<tr><th>Inherited:<td>no<tr><th>Media:<td>visual<tr><th>Computed value:<td>specified value<tr><th>Percentages:<td>n/a<tr><th>Animatable:<td>no</table>
 
 <p class=issue id=issue-1e8db24f><a class=self-link href=#issue-1e8db24f></a>This should also affect the initial scroll position.
 	If you align "end", you want to be able to see the "end" stuff when the element first loads,
@@ -602,8 +603,8 @@ <h2 class="heading settled" data-level=4 id=content-distribution><span class=sec
 
 <p>Aligns the contents of the box as a whole along the box’s inline/row/main axis.
 	Values other than <dfn class=css data-dfn-for="justify-content, align-content" data-dfn-type=value data-export="" id=valdef-justify-content-align-content-auto>auto<a class=self-link href=#valdef-justify-content-align-content-auto></a></dfn> are <a href=#alignment-values>defined above</a>.
-	If both a <a class="production css" data-link-type=type href=#typedef-item-position title="<item-position>">&lt;item-position&gt;</a> and <a class="production css" data-link-type=type href=#typedef-content-position title="<content-position>">&lt;content-position&gt;</a> are given,
-	the second value represents an explicit <a data-link-type=dfn href=#fallback-alignment title="fallback alignment">fallback alignment</a>.</p>
+	If both a <a class="production css" data-link-type=type href=#typedef-content-distribution title="<content-distribution>">&lt;content-distribution&gt;</a> and <a class="production css" data-link-type=type href=#typedef-content-position title="<content-position>">&lt;content-position&gt;</a> are given,
+	the <a class="production css" data-link-type=type href=#typedef-content-position title="<content-position>">&lt;content-position&gt;</a> provides an explicit <a data-link-type=dfn href=#fallback-alignment title="fallback alignment">fallback alignment</a>.</p>
 
 	<hr>
 
@@ -1275,6 +1276,7 @@ <h2 class="no-num no-ref heading settled" id=index><span class=content>
 <li>baselines of a box, <a href=#baselines-of-a-box title="section 7">7</a>
 <li>center, <a href=#valdef-item-position-content-position-center title="section 3.1">3.1</a>
 <li>&lt;content-distribution&gt;, <a href=#typedef-content-distribution title="section 3.3">3.3</a>
+<li>content distribution properties, <a href=#content-distribution-properties title="section 4">4</a>
 <li>&lt;content-position&gt;, <a href=#typedef-content-position title="section 3.1">3.1</a>
 <li>end, <a href=#valdef-item-position-content-position-end title="section 3.1">3.1</a>
 <li>fallback alignment, <a href=#fallback-alignment title="section 3.3">3.3</a>
@@ -1315,8 +1317,8 @@ <h2 class="no-num no-ref heading settled" id=index><span class=content>
 <h2 class="no-num no-ref heading settled" id=property-index><span class=content>
 Property index</span><a class=self-link href=#property-index></a></h2>
 <div data-fill-with=property-index><table class="proptable data"><thead><tr><th scope=col>Name<th scope=col>Value<th scope=col>Initial<th scope=col>Applies to<th scope=col>Inh.<th scope=col>%ages<th scope=col>Media<th scope=col>Animatable<th scope=col>Computed value<tbody>
-<tr><th scope=row><a class=css data-link-type=property href=#propdef-justify-content title=justify-content>justify-content</a><td>auto | &lt;baseline-position&gt; | [ &lt;item-position&gt; &lt;content-position&gt;? | &lt;content-position&gt; ] &amp;&amp; &lt;overflow-position&gt;?<td>auto<td>block containers, flex containers, and grid containers<td>no<td>n/a<td>visual<td>no<td>specified value
-<tr><th scope=row><a class=css data-link-type=property href=#propdef-align-content title=align-content>align-content</a><td>auto | &lt;baseline-position&gt; | [ &lt;item-position&gt; &lt;content-position&gt;? | &lt;content-position&gt; ] &amp;&amp; &lt;overflow-position&gt;?<td>auto<td>block containers, flex containers, and grid containers<td>no<td>n/a<td>visual<td>no<td>specified value
+<tr><th scope=row><a class=css data-link-type=property href=#propdef-justify-content title=justify-content>justify-content</a><td>auto | &lt;baseline-position&gt; | [ &lt;content-distribution&gt; &lt;content-position&gt;? | &lt;content-position&gt; ] &amp;&amp; &lt;overflow-position&gt;?<td>auto<td>block containers, flex containers, and grid containers<td>no<td>n/a<td>visual<td>no<td>specified value
+<tr><th scope=row><a class=css data-link-type=property href=#propdef-align-content title=align-content>align-content</a><td>auto | &lt;baseline-position&gt; | [ &lt;content-distribution&gt; &lt;content-position&gt;? | &lt;content-position&gt; ] &amp;&amp; &lt;overflow-position&gt;?<td>auto<td>block containers, flex containers, and grid containers<td>no<td>n/a<td>visual<td>no<td>specified value
 <tr><th scope=row><a class=css data-link-type=property href=#propdef-justify-self title=justify-self>justify-self</a><td>auto | stretch | &lt;baseline-position&gt; | [ &lt;item-position&gt; &amp;&amp; &lt;overflow-position&gt;? ]<td>auto<td>block-level boxes, absolutely-positioned boxes, and grid items<td>no<td>n/a<td>visual<td>no<td>specified value
 <tr><th scope=row><a class=css data-link-type=property href=#propdef-align-self title=align-self>align-self</a><td>auto | stretch | &lt;baseline-position&gt; | [ &lt;item-position&gt; &amp;&amp; &lt;overflow-position&gt;? ]<td>auto<td>block-level boxes<td>no<td>n/a<td>visual<td>no<td>specified value
 <tr><th scope=row><a class=css data-link-type=property href=#propdef-justify-items title=justify-items>justify-items</a><td>auto | stretch | &lt;baseline-position&gt; | [ &lt;item-position&gt; &amp;&amp; &lt;overflow-position&gt;? ] | [ legacy &amp;&amp; [ left | right | center ] ]<td>auto<td>block containers, flex containers, and grid containers<td>no<td>n/a<td>visual<td>no<td>specified value