[css-display] Slightly rewrite computed value for display-box. Also rename it to display-box.

--HG--
extra : rebase_source : fee84c6dd3d0d979a9b8b96affdb3c28b4a6fd4e

Author: tabatkins

css-display/Overview.html

@@ -54,7 +54,7 @@
 </p>
   <h1 class="p-name no-ref" id=title>CSS Display Module Level 3</h1>
   <h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
-    <span class=dt-updated><span class=value-title title=20140128>28 January 2014</span></span></span></h2>
+    <span class=dt-updated><span class=value-title title=20140129>29 January 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-display>http://dev.w3.org/csswg/css-display</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-display>http://dev.w3.org/csswg/css-display</a>
     <dt>Feedback:</dt>
         <dd><a href="mailto:www-style@w3.org?subject=%5Bcss-display%5D%20feedback">www-style@w3.org</a>
@@ -114,7 +114,7 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
 Interacting with the layout mode: the <span class=property data-link-type=propdesc title=display-outside>display-outside</span> property</a><li><a href=#the-display-extras><span class=secno>2.3</span>
 Additional stuff: the <span class=property data-link-type=propdesc title=display-extras>display-extras</span> property</a><li><a href=#the-display><span class=secno>2.4</span>
 The <span class=property data-link-type=propdesc title=display>display</span> shorthand property</a></ul><li><a href=#the-display-box><span class=secno>3</span>
-Controlling box generation: the <span class=property data-link-type=propdesc title=box>box</span> property</a><li><a href=#acknowledgments><span class=secno></span>
+Controlling box generation: the <span class=property data-link-type=propdesc title=display-box>display-box</span> property</a><li><a href=#acknowledgments><span class=secno></span>
 Acknowledgments</a><li><a href=#conformance><span class=secno></span>
 Conformance</a><ul class=toc><li><a href=#conventions><span class=secno></span>
 Document conventions</a><li><a href=#conformance-classes><span class=secno></span>
@@ -242,8 +242,8 @@ <h3 class="heading settled heading" data-level=2.2 id=the-display-outside><span
 			and does not participate in any formatting context.
 
 <p class=note>			Note: This value exists for legacy reasons,
-			and interacts with the separate <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> property.
-			It is recommended that <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> be used to suppress an element,
+			and interacts with the separate <a class=property data-link-type=propdesc href=#propdef-display-box title=display-box>display-box</a> property.
+			It is recommended that <a class=property data-link-type=propdesc href=#propdef-display-box title=display-box>display-box</a> be used to suppress an element,
 			so that the element’s display type is automatically preserved
 			for when it’s no longer suppressed.
 
@@ -366,15 +366,15 @@ <h3 class="heading settled heading" data-level=2.4 id=the-display><span class=se
 
 
 <h2 class="heading settled heading" data-level=3 id=the-display-box><span class=secno>3 </span><span class=content>
-Controlling box generation: the <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> property</span><a class=self-link href=#the-display-box></a></h2>
+Controlling box generation: the <a class=property data-link-type=propdesc href=#propdef-display-box title=display-box>display-box</a> property</span><a class=self-link href=#the-display-box></a></h2>
 
-<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-box>box<a class=self-link href=#propdef-box></a></dfn><tr><th>Value:<td>normal | none | contents<tr><th>Initial:<td>normal<tr><th>Applies to:<td>all elements<tr><th>Inherited:<td>no<tr><th>Media:<td>all<tr><th>Computed value:<td>see prose<tr><th>Percentages:<td>n/a</table>
-<p>	The <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> property is not part of the <a class=property data-link-type=propdesc href=#propdef-display title=display>display</a> shorthand,
+<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-display-box>display-box<a class=self-link href=#propdef-display-box></a></dfn><tr><th>Value:<td>normal | none | contents<tr><th>Initial:<td>normal<tr><th>Applies to:<td>all elements<tr><th>Inherited:<td>no<tr><th>Media:<td>all<tr><th>Computed value:<td>see prose<tr><th>Percentages:<td>n/a</table>
+<p>	The <a class=property data-link-type=propdesc href=#propdef-display-box title=display-box>display-box</a> property is not part of the <a class=property data-link-type=propdesc href=#propdef-display title=display>display</a> shorthand,
 	so that <a class=property data-link-type=propdesc href=#propdef-display title=display>display</a> can be safely set without accidentally overriding whether an element is being suppressed or not.
 
-<p>	The computed value of <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> is the specified value,
-	unless <a class=property data-link-type=propdesc href=#propdef-display-outside title=display-outside>display-outside</a> has the value <a class=css data-link-for=display-outside data-link-type=maybe href=#valuedef-none0 title=none>none</a>,
-	in which case the computed value of <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> is <a class=css data-link-for=box data-link-type=maybe href=#valuedef-none title=none>none</a> as well.
+<p>	If the computed value of <a class=property data-link-type=propdesc href=#propdef-display-outside title=display-outside>display-outside</a> is <a class=css data-link-for=display-outside data-link-type=maybe href=#valuedef-none0 title=none>none</a>,
+	the computed value of <a class=property data-link-type=propdesc href=#propdef-display-box title=display-box>display-box</a> is <span class=css data-link-for=display-box data-link-type=maybe title=none>none</span>.
+	Otherwise, the computed value is the specified value.
 
 	<dl data-dfn-for=box data-dfn-type=value>
 		<dt><dfn class=css-code data-dfn-for=box data-dfn-type=value data-export="" id=valuedef-normal>normal<a class=self-link href=#valuedef-normal></a></dfn>
@@ -403,9 +403,6 @@ <h2 class="heading settled heading" data-level=3 id=the-display-box><span class=
 		Other things that care about the document tree are unaffected, like counter scopes.
 		Is this what we want?
 
-	<p class=issue id=issue-74aff657><a class=self-link href=#issue-74aff657></a>
-		Is <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> a good name?  What about <a class=property data-link-type=propdesc title=show>show</a>?  Other suggestions?
-
 
 
 
@@ -557,9 +554,9 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>block<ul><li>value for display-inside, <a href=#valuedef-block0 title="section 2.1">2.1</a>
 <li>value for display, <a href=#valuedef-block title="section 2.4">2.4</a>
 </ul><li>block-level, <a href=#valuedef-block-level title="section 2.2">2.2</a>
-<li>box, <a href=#propdef-box title="section 3">3</a>
 <li>contents, <a href=#valuedef-contents title="section 3">3</a>
 <li>display, <a href=#propdef-display title="section 2.4">2.4</a>
+<li>display-box, <a href=#propdef-display-box title="section 3">3</a>
 <li>display-extras, <a href=#propdef-display-extras title="section 2.3">2.3</a>
 <li>display-inside, <a href=#propdef-display-inside title="section 2.1">2.1</a>
 <li>display-outside, <a href=#propdef-display-outside title="section 2.2">2.2</a>
@@ -600,7 +597,7 @@ <h2 class="no-num no-ref heading settled heading" id=property-index><span class=
 <tr><th scope=row><a data-property="">display-outside</a><td>block-level | inline-level | none | table-row-group | table-header-group | table-footer-group | table-row | table-cell | table-column-group | table-column | table-caption<td>inline-level<td>all elements<td>no<td>n/a<td>all<td><td>as specified
 <tr><th scope=row><a data-property="">display-extras</a><td>none | list-item<td>none<td>all elements<td>no<td>n/a<td>all<td><td>as specified
 <tr><th scope=row><a data-property="">display</a><td>inline | block | list-item | inline-list-item | inline-block | table | inline-table | table-cell | table-caption | flex | inline-flex | grid | inline-grid | [ &lt;‘display-inside’&gt; || &lt;‘display-outside’&gt; || &lt;‘display-extras’&gt; ]<td>see individual properties<td>see individual properties<td>see individual properties<td><td>see individual properties<td>see individual properties<td>see individual properties
-<tr><th scope=row><a data-property="">box</a><td>normal | none | contents<td>normal<td>all elements<td>no<td>n/a<td>all<td><td>see prose</table></div>
+<tr><th scope=row><a data-property="">display-box</a><td>normal | none | contents<td>normal<td>all elements<td>no<td>n/a<td>all<td><td>see prose</table></div>
 
 
 <h2 class="no-num heading settled" id=issues-index><span class=content>Issues Index</span><a class=self-link href=#issues-index></a></h2><div style="counter-reset: issue"><div class=issue>
@@ -642,10 +639,7 @@ <h2 class="no-num heading settled" id=issues-index><span class=content>Issues In
 		Other things that care about the document tree are unaffected, like counter scopes.
 		Is this what we want?
 
-	<a href=#issue-b8422544> ↵ </a></div><div class=issue>
-		Is <a class=property data-link-type=propdesc href=#propdef-box title=box>box</a> a good name?  What about <a class=property data-link-type=propdesc title=show>show</a>?  Other suggestions?
-
 
 
 
-<a href=#issue-74aff657> ↵ </a></div></div>
+<a href=#issue-b8422544> ↵ </a></div></div>

css-display/Overview.src.html

@@ -142,8 +142,8 @@ <h3 id='the-display-outside'>
 			and does not participate in any formatting context.
 
 			Note: This value exists for legacy reasons,
-			and interacts with the separate 'box' property.
-			It is recommended that 'box' be used to suppress an element,
+			and interacts with the separate 'display-box' property.
+			It is recommended that 'display-box' be used to suppress an element,
 			so that the element's display type is automatically preserved
 			for when it's no longer suppressed.
 
@@ -286,10 +286,10 @@ <h3 id='the-display'>
 
 
 <h2 id='the-display-box'>
-Controlling box generation: the 'box' property</h2>
+Controlling box generation: the 'display-box' property</h2>
 
 	<pre class="propdef">
-	Name: box
+	Name: display-box
 	Value: normal | none | contents
 	Initial: normal
 	Applies to: all elements
@@ -299,12 +299,12 @@ <h2 id='the-display-box'>
 	Media: all
 	</pre>
 
-	The 'box' property is not part of the 'display' shorthand,
+	The 'display-box' property is not part of the 'display' shorthand,
 	so that 'display' can be safely set without accidentally overriding whether an element is being suppressed or not.
 
-	The computed value of 'box' is the specified value,
-	unless 'display-outside' has the value ''display-outside/none'',
-	in which case the computed value of 'box' is ''box/none'' as well.
+	If the computed value of 'display-outside' is ''display-outside/none'',
+	the computed value of 'display-box' is ''display-box/none''.
+	Otherwise, the computed value is the specified value.
 
 	<dl dfn-type="value" dfn-for="box">
 		<dt><dfn>normal</dfn>
@@ -333,9 +333,6 @@ <h2 id='the-display-box'>
 		Other things that care about the document tree are unaffected, like counter scopes.
 		Is this what we want?
 
-	<p class='issue'>
-		Is 'box' a good name?  What about 'show'?  Other suggestions?
-