csswg/css3-flexbox Overview.html,1.147,1.148 Overview.src.html,1.145,1.146

Update of /sources/public/csswg/css3-flexbox
In directory hutz:/tmp/cvs-serv18986

Modified Files:
	Overview.html Overview.src.html 
Log Message:
Minor editorial tweak to the flex() grammar to avoid implying omittability twice.

Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.html,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- Overview.html	6 Feb 2012 21:45:16 -0000	1.147
+++ Overview.html	6 Feb 2012 21:47:46 -0000	1.148
@@ -1084,7 +1084,7 @@
    class=css>flex()</code>&rsquo; notation is:
 
   <pre class=prod><dfn
-   id=ltflex>&lt;flex></dfn> = flex( [ &lt;pos-flex> &lt;neg-flex>? ]? || &lt;preferred-size>? )</pre>
+   id=ltflex>&lt;flex></dfn> = flex( [ &lt;pos-flex> &lt;neg-flex>? ]? &amp;&amp; &lt;preferred-size>? )</pre>
 
   <p><code>&lt;pos-flex></code> and <code>&lt;neg-flex></code> are
    non-negative <code>&lt;numbers>s</code>, while

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.src.html,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- Overview.src.html	6 Feb 2012 21:45:16 -0000	1.145
+++ Overview.src.html	6 Feb 2012 21:47:47 -0000	1.146
@@ -509,7 +509,7 @@
 
 	<p>The ''flex()'' notation is used to specify the parameters of a <dfn title="flexible length|flexible lengths|flexible length's">flexible length</dfn>: the <dfn id="positive-flexibility" title="positive flexibility">positive</dfn> and <dfn>negative flexibility</dfn>, and the <dfn>preferred size</dfn>.  The syntax of the ''flex()'' notation is:</p>
 
-	<pre class=prod><dfn>&lt;flex></dfn> = flex( [ &lt;pos-flex> &lt;neg-flex>? ]? || &lt;preferred-size>? )</pre>
+	<pre class=prod><dfn>&lt;flex></dfn> = flex( [ &lt;pos-flex> &lt;neg-flex>? ]? &amp;&amp; &lt;preferred-size>? )</pre>
 
 	<p><code>&lt;pos-flex></code> and <code>&lt;neg-flex></code> are non-negative <code>&lt;numbers>s</code>, while <code>&lt;preferred-size></code> is any value (other than another ''&lt;flex>'') that would be valid in the 'width' or 'height' property in which the notation is used.  If the <code>&lt;preferred-size></code> is ''0'', it <strong>must</strong> be specified with a unit (like ''0px'') to avoid ambiguity; unitless zero will either be interpreted as as one of the flexibilities, or is a syntax error.</p>

Received on Monday, 6 February 2012 21:48:01 UTC