[css3-box] Added 'flex' and 'inline-flex' to the list of values for

'display' and added a reference to [CSS3-FLEXBOX]. Replaced some "&"
by "&" because Prince complained about the "&" (although the way
it was used was valid HTML4).

Author: bert-github

css-box/Overview.src.html

@@ -20,6 +20,8 @@
   .equiv-table tr {vertical-align: baseline}
   .equiv-table img {max-width: 12em; max-width: 100%}
   .minidiagram {height: 5em; vertical-align: middle}
+  dt {display: inline}
+  dt + dt::before {content: ", "}
   /* Undo the max-width in the 2012 style for editor's drafts: */
   body {max-width: none}
 </style>
@@ -53,13 +55,16 @@ <h2 class="no-num no-toc">[LONGSTATUS] [DATE: 26 Sep 2006]</h2>
 
     <dd><a href="http://www.w3.org/TR/2002/WD-css3-box-20021024"
     >http://www.w3.org/TR/2002/WD-css3-box-20021024</a>
+
   <dt>Feedback:</dt>
-    <dd><a href="mailto:www-style@w3.org?subject=%5B[css-box]%5D%20feedback"
-         >www-style@w3.org</a> 
-         with subject line &ldquo;<kbd>[css-box] 
-         <var>&hellip; message topic &hellip;</var></kbd>&rdquo;
-         (<a rel="discussion" href="http://lists.w3.org/Archives/Public/www-style/"
-           >archives</a>)
+
+    <dd><a
+    href="mailto:www-style@w3.org?subject=%5B[css3-box]%5D%20feedback"
+    >www-style@w3.org</a> with subject line &ldquo;[css3-box]
+    <var>&hellip; message topic &hellip;</var>&rdquo; (<a
+    rel="discussion"
+    href="http://lists.w3.org/Archives/Public/www-style/"
+    >archives</a>)
 
   <dt>Editors:
 
@@ -1082,7 +1087,7 @@ <h3 id=display>The display property</h3>
     table-header-group | table-footer-group | table-row |
     table-column-group | table-column | table-cell | table-caption |
     ruby | ruby-base | ruby-text | ruby-base-group | ruby-text-group |
-    container | none
+    container | flex | inline-flex | none
   <tr><th>Initial: <td>inline
   <tr><th>Applies to:<td>all elements
   <tr><th>Inherited: <td>no
@@ -1152,7 +1157,8 @@ <h3 id=display>The display property</h3>
   table-footer-group, table-row, table-column-group, table-column,
   table-cell, table-caption <dd>See the Tables module [[CSS3TBL]].
 
-  <dt>ruby, ruby-base, ruby-text, ruby-base-group, ruby-text-group
+  <dt>ruby<dt>ruby-base<dt>ruby-text<dt>ruby-base-group<dt
+  >ruby-text-group
   <dd>See the Ruby module [[CSS3RUBY]].
 
   <dt>container <span class=issue>or align-box?</span> <dd>Like
@@ -1163,6 +1169,9 @@ <h3 id=display>The display property</h3>
   the <a href="#contain-floats">discussion of how to force an element
   to contain floats.</a>]</span>
 
+  <dt>flex <dt>inline-flex <dd>See the Flexible Box Layout Module
+  [[CSS3-FLEXBOX]].
+
   <dt>none <dd>This value causes an element to not appear in the
   formatting structure (i.e., in visual media, the element generates
   no boxes and has no effect on layout). Descendant elements do not
@@ -1901,7 +1910,7 @@ <h2>The width and height properties</h2>
 
 <table class=propdef>
   <tr><th>Name: <td><dfn>width</dfn>
-  <tr><th>Value: <td>[<var>&lt;length></var> | <var>&lt;percentage></var>] &&
+  <tr><th>Value: <td>[<var>&lt;length></var> | <var>&lt;percentage></var>] &amp;&amp;
     [border-box | content-box]? | available | min-content |
     max-content | fit-content | auto
   <tr><th>Initial: <td>auto 
@@ -1922,7 +1931,7 @@ <h2>The width and height properties</h2>
 
 <table class=propdef>
   <tr><th>Name: <td><dfn>height</dfn>
-  <tr><th>Value: <td>[<var>&lt;length></var> | <var>&lt;percentage></var>] &&
+  <tr><th>Value: <td>[<var>&lt;length></var> | <var>&lt;percentage></var>] &amp;&amp;
     [border-box | content-box]? | available | min-content |
     max-content | fit-content | complex | auto
   <tr><th>Initial: <td>auto 
@@ -2092,7 +2101,7 @@ <h2 id=min-max>The min-width, max-width, min-height and
 <table class=propdef>
   <tr><th>Name: <td><dfn>min-width</dfn>, <dfn>min-height</dfn>
   <tr><th>Value: <td>[ [<var>&lt;length&gt;</var> |
-    <var>&lt;percentage&gt;</var>] && [border-box | content-box]? ] |
+    <var>&lt;percentage&gt;</var>] &amp;&amp; [border-box | content-box]? ] |
     available | min-content | max-content | fit-content
   <tr><th>Initial: <td>0
   <tr><th>Applies to: <td>all elements but non-replaced
@@ -2113,7 +2122,7 @@ <h2 id=min-max>The min-width, max-width, min-height and
 <table class=propdef>
   <tr><th>Name: <td><dfn>max-width</dfn>, <dfn>max-height</dfn>
   <tr><th>Value: <td>[ [<var>&lt;length&gt;</var> |
-    <var>&lt;percentage&gt;</var>] && [border-box | content-box]? ] |
+    <var>&lt;percentage&gt;</var>] &amp;&amp; [border-box | content-box]? ] |
     available | min-content | max-content | fit-content | none
   <tr><th>Initial: <td>none
   <tr><th>Applies to: <td>all elements but non-replaced inline
@@ -2760,7 +2769,7 @@ <h2 id=Calculating>Calculating widths, heights and margins</h2>
 
 <p>Select from the table the resolved height and width values for the
 appropriate constraint violation. Take the <var>max-width</var> and
-<var>max-height</var> as max(min, max) so that <var>min</var> &#8804
+<var>max-height</var> as max(min, max) so that <var>min</var> &#8804;
 <var>max</var> holds true. In this table <var>w</var> and <var>h</var>
 stand for the results of the width and height computations ignoring
 the 'min-width', 'min-height', 'max-width' and 'max-height'
@@ -3482,7 +3491,7 @@ <h2>The float property</h2>
 <table class=propdef>
   <tr><th>Name: <td><dfn>float</dfn>
   <tr><th>Value: <td>[ left | right | top | bottom | start | end | none |
-    <var>&lt;page-floats&gt;</var> ] && contour?
+    <var>&lt;page-floats&gt;</var> ] &amp;&amp; contour?
   <tr><th>Initial: <td>none 
   <tr><th>Applies to: <td>all, but see text
   <tr><th>Inherited: <td>no 
@@ -5640,7 +5649,7 @@ <h2 class=no-num>The ‘float-displace’ property [alternative 3]</h2>
       <td><dfn>float-displace</dfn>
     <tr>
       <td><em>Value:</em>
-      <td>auto | &lt;length> && [ block | block-within-page ]?
+      <td>auto | &lt;length> &amp;&amp; [ block | block-within-page ]?
     <tr>
       <td><em>Initial:</em>
       <td>line