csswg/css3-flexbox Overview.html,1.39,1.40 Overview.src.html,1.38,1.39

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

Modified Files:
	Overview.html Overview.src.html 
Log Message:
Rewording the Box Model chapter.


Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Overview.html	23 Aug 2011 01:00:22 -0000	1.39
+++ Overview.html	23 Aug 2011 01:14:07 -0000	1.40
@@ -321,8 +321,7 @@
 
   <p>Similar to other layout modes such as table layout, a flexbox acts like
    a block when placed into elements using other layout modes. Inline
-   flexboxes act like inline-blocks. <span class=issue>Figure out the right
-   terms to use here.</span>
+   flexboxes act like inline-blocks.
 
   <div class=example>
    <p>For example, the following HTML snippet declares a flexbox with a few
@@ -377,7 +376,14 @@
    &lsquo;<a href="#flexbox"><code class=property>flexbox</code></a>&rsquo;
    or &lsquo;<code class=property>inline-flexbox</code>&rsquo;.
 
-  <p>Flexbox establishes a new block formatting context for its content.
+  <p>The &lsquo;<a href="#flexbox"><code class=css>flexbox</code></a>&rsquo;
+   value makes the flexbox act like a block in other layout modes. The
+   &lsquo;<code class=css>inline-flexbox</code>&rsquo; value makes the
+   flexbox act like an inline-block in other layout modes.
+
+  <p>A flexbox establishes a new block formatting context for its content.
+
+  <p class=issue>Figure out the right terms to use here.
 
   <h3 id=flex-items><span class=secno>2.2. </span> Flexbox Items</h3>
 
@@ -424,7 +430,7 @@
     &lt;/span>
 
     &lt;!-- flexbox item: block-level replaced element -->
-    &lt;img id="item7">
+    &lt;iframe id="item7">
 
     &lt;!-- flexbox item: inline-level replaced element -->
     &lt;img id="item7" style="display:inline">

Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.src.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Overview.src.html	23 Aug 2011 01:00:22 -0000	1.38
+++ Overview.src.html	23 Aug 2011 01:14:07 -0000	1.39
@@ -73,7 +73,7 @@
 
 	<p>In the <i>cross axis</i>, <i>flexbox items</i> can either "flex" to fill the available space or be aligned within the space with the 'flex-align' property.  If a flexbox is <i>multi-line</i>, new lines are added in the <i>cross-end</i> direction, and can similarly be aligned, centered, or distributed within the flexbox with the 'flex-line-pack' property.</p>
 
-	<p>Similar to other layout modes such as table layout, a flexbox acts like a block when placed into elements using other layout modes.  Inline flexboxes act like inline-blocks. <span class=issue>Figure out the right terms to use here.</span></p>
+	<p>Similar to other layout modes such as table layout, a flexbox acts like a block when placed into elements using other layout modes.  Inline flexboxes act like inline-blocks.</p>
 
 	<div class="example">
 		<p>For example, the following HTML snippet declares a flexbox with a few children.  The flexbox is horizontal, and the children's widths don't fill the flexbox's width, so the additional space is distributed between the children.  The flexbox's height isn't explicitly specified, so it shrinks to the height of its tallest child and centers the other children within it:</p>
@@ -108,8 +108,12 @@
 	</table>
 
 	<p>You can declare that an element is a flexbox, and thus should use flexbox layout, by setting the 'display' property on the element to the value 'flexbox' or 'inline-flexbox'.</p>
+
+	<p>The ''flexbox'' value makes the flexbox act like a block in other layout modes.  The ''inline-flexbox'' value makes the flexbox act like an inline-block in other layout modes.</p>
 	
-	<p>Flexbox establishes a new block formatting context for its content.</p>
+	<p>A flexbox establishes a new block formatting context for its content.</p>
+
+	<p class='issue'>Figure out the right terms to use here.</p>
 
 
 
@@ -155,7 +159,7 @@
     &lt;/span>
 
     &lt;!-- flexbox item: block-level replaced element -->
-    &lt;img id="item7">
+    &lt;iframe id="item7"></iframe>
 
     &lt;!-- flexbox item: inline-level replaced element -->
     &lt;img id="item7" style="display:inline">

Received on Tuesday, 23 August 2011 01:14:30 UTC