(Merge)

Author: bert-github

.htaccess

@@ -169,6 +169,7 @@ RewriteRule ^css-transitions-1/(.*)$ css-transitions/$1
 RewriteRule ^css-ui-3/(.*)$ css-ui/$1
 RewriteRule ^css-values-3/(.*)$ css-values/$1
 RewriteRule ^css-variables-1/(.*)$ css-variables/$1
+RewriteRule ^css-will-change-1/(.*)$ css-will-change/$1
 RewriteRule ^css-writing-modes-3/(.*)$ css-writing-modes/$1
 
 RewriteRule ^cssom-1/(.*)$ cssom/$1

css-conditional/Overview.html

@@ -12,7 +12,7 @@
    rel=dcterms.rights>
   <meta content="CSS Conditional Rules Module Level 3" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-11-09 name=dcterms.date>
+  <meta content=2014-05-02 name=dcterms.date>
   <meta content="L. David Baron" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
   <meta content="http://dev.w3.org/csswg/css3-conditional/"
@@ -33,13 +33,13 @@
    <h1 class=p-name>CSS Conditional Rules Module Level 3</h1>
 
    <h2 class="no-num no-toc">Editor's Draft <span class=dt-updated><span
-    class=value-title title=20131109> 9 November 2013</span></span></h2>
+    class=value-title title=20140502> 2 May 2014</span></span></h2>
 
    <dl>
     <dt>This version:
 
     <dd><a class=u-url href="http://dev.w3.org/csswg/css3-conditional/">
-     http://www.w3.org/TR/2013/ED-css3-conditional-20131109/</a>
+     http://www.w3.org/TR/2014/ED-css3-conditional-20140502/</a>
 
     <dt>Latest version:
 
@@ -88,7 +88,7 @@ <h2 class="no-num no-toc">Editor's Draft <span class=dt-updated><span
    <!--begin-copyright-->
    <p class=copyright><a
     href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
-    rel=license>Copyright</a> © 2013 <a href="http://www.w3.org/"><abbr
+    rel=license>Copyright</a> © 2014 <a href="http://www.w3.org/"><abbr
     title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a
     href="http://www.csail.mit.edu/"><abbr
     title="Massachusetts Institute of Technology">MIT</abbr></a>, <a
@@ -787,32 +787,32 @@ <h2 id=at-supports><span class=secno>6. </span>Feature queries: the ‘<a
   <div class=example>
    <p>For example, the following rule
 
-   <pre>@supports ( display: flexbox ) {
-  body, #navigation, #content { display: flexbox; }
+   <pre>@supports ( display: flex ) {
+  body, #navigation, #content { display: flex; }
   #navigation { background: blue; color: white; }
   #article { background: white; color: black; }
 }</pre>
 
    <p>applies the rules inside the ‘<a href="#at-ruledef-supports"><code
     class=css>@supports</code></a>’ rule only when ‘<code
-    class=css>display: flexbox</code>’ is supported.
+    class=css>display: flex</code>’ is supported.
   </div>
 
   <div class=example>
    <p>The following example shows an additional ‘<a
     href="#at-ruledef-supports"><code class=css>@supports</code></a>’ rule
     that can be used to provide an alternative for when ‘<code
-    class=css>display: flexbox</code>’ is not supported:
+    class=css>display: flex</code>’ is not supported:
 
-   <pre>@supports not ( display: flexbox ) {
+   <pre>@supports not ( display: flex ) {
   body { width: 100%; height: 100%; background: white; color: black; }
   #navigation { width: 25%; }
   #article { width: 75%; }
 }</pre>
 
    <p>Note that the ‘<code class=property>width</code>’ declarations may
-    be harmful to the flexbox-based layout, so it is important that they be
-    present only in the non-flexbox styles.
+    be harmful to the flex-based layout, so it is important that they be
+    present only in the non-flex styles.
   </div>
 
   <div class=example>
@@ -891,13 +891,13 @@ <h2 id=at-supports><span class=secno>6. </span>Feature queries: the ‘<a
   <div class=example>
    <p>For example, the following rule is not valid:
 
-   <pre class=illegal>@supports display: flexbox {
+   <pre class=illegal>@supports display: flex {
   // ...
 }</pre>
 
    <p>Instead, authors must write:
 
-   <pre>@supports (display: flexbox) {
+   <pre>@supports (display: flex) {
   // ...
 }</pre>
   </div>
@@ -909,7 +909,7 @@ <h2 id=at-supports><span class=secno>6. </span>Feature queries: the ‘<a
   <div class=example>
    <p>For example, authors may write:
 
-   <pre>@supports ((display: flexbox)) {
+   <pre>@supports ((display: flex)) {
   // ...
 }</pre>
   </div>
@@ -921,7 +921,7 @@ <h2 id=at-supports><span class=secno>6. </span>Feature queries: the ‘<a
   <div class=example>
    <p>For example, the following rule is valid:
 
-   <pre>@supports (display: flexbox !important) {
+   <pre>@supports (display: flex !important) {
   // ...
 }</pre>
   </div>
@@ -1637,8 +1637,8 @@ <h3 class=no-num id=normative-references>Normative references</h3>
    <dt id=ref-RFC2119>[RFC2119]
 
    <dd>S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key
-    words for use in RFCs to Indicate Requirement Levels.</cite></a> Internet
-    RFC 2119. URL: <a
+    words for use in RFCs to Indicate Requirement Levels.</cite></a> RFC
+    2119. URL: <a
     href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>
    </dd>
    <!---->
@@ -1666,10 +1666,10 @@ <h3 class=no-num id=other-references>Other references</h3>
    <dt id=ref-CSS3-TRANSITIONS>[CSS3-TRANSITIONS]
 
    <dd>Dean Jackson; et al. <a
-    href="http://www.w3.org/TR/2013/WD-css3-transitions-20130212/"><cite>CSS
-    Transitions.</cite></a> 12 February 2013. W3C Working Draft. (Work in
+    href="http://www.w3.org/TR/2013/WD-css3-transitions-20131119/"><cite>CSS
+    Transitions.</cite></a> 19 November 2013. W3C Working Draft. (Work in
     progress.) URL: <a
-    href="http://www.w3.org/TR/2013/WD-css3-transitions-20130212/">http://www.w3.org/TR/2013/WD-css3-transitions-20130212/</a>
+    href="http://www.w3.org/TR/2013/WD-css3-transitions-20131119/">http://www.w3.org/TR/2013/WD-css3-transitions-20131119/</a>
    </dd>
    <!---->
   </dl>

css-conditional/Overview.src.html

@@ -525,27 +525,27 @@ <h2 id="at-supports">Feature queries: the '@supports' rule</h2>
 
 <div class="example">
 <p>For example, the following rule</p>
-<pre>@supports ( display: flexbox ) {
-  body, #navigation, #content { display: flexbox; }
+<pre>@supports ( display: flex ) {
+  body, #navigation, #content { display: flex; }
   #navigation { background: blue; color: white; }
   #article { background: white; color: black; }
 }</pre>
 <p>applies the rules inside the '@supports' rule only when
-''display: flexbox'' is supported.</p>
+''display: flex'' is supported.</p>
 </div>
 
 <div class="example">
 <p>The following example shows an additional '@supports' rule that can
-be used to provide an alternative for when ''display: flexbox'' is not
+be used to provide an alternative for when ''display: flex'' is not
 supported:</p>
-<pre>@supports not ( display: flexbox ) {
+<pre>@supports not ( display: flex ) {
   body { width: 100%; height: 100%; background: white; color: black; }
   #navigation { width: 25%; }
   #article { width: 75%; }
 }</pre>
 <p>Note that the 'width' declarations may be harmful to the
-flexbox-based layout, so it is important that they be present only in
-the non-flexbox styles.</p>
+flex-based layout, so it is important that they be present only in
+the non-flex styles.</p>
 </div>
 
 <div class="example">
@@ -607,11 +607,11 @@ <h2 id="at-supports">Feature queries: the '@supports' rule</h2>
 
 <div class="example">
 <p>For example, the following rule is not valid:
-<pre class="illegal">@supports display: flexbox {
+<pre class="illegal">@supports display: flex {
   // ...
 }</pre>
 <p>Instead, authors must write:</p>
-<pre>@supports (display: flexbox) {
+<pre>@supports (display: flex) {
   // ...
 }</pre>
 </div>
@@ -623,7 +623,7 @@ <h2 id="at-supports">Feature queries: the '@supports' rule</h2>
 
 <div class="example">
 <p>For example, authors may write:</p>
-<pre>@supports ((display: flexbox)) {
+<pre>@supports ((display: flex)) {
   // ...
 }</pre>
 </div>
@@ -633,7 +633,7 @@ <h2 id="at-supports">Feature queries: the '@supports' rule</h2>
 
 <div class="example">
 <p>For example, the following rule is valid:
-<pre>@supports (display: flexbox !important) {
+<pre>@supports (display: flex !important) {
   // ...
 }</pre>
 </div>