[css-*] Replace s/rule ?set/style rule/, except in grammars.

Having three names for the same concept is silly.
"Rule set" is confusing as it implies multiple rules,
while it in fact refers to a single rule.
CSS OM and other specs already use "style rule".

This changes "rule set" and "ruleset" to "style rule",
except when used in a grammar.
(The normative definiton of the Core Grammar is in 2.1
which is harder to change.)

This is missing a few changes in css-fonts,
since its source is not version-controlled in this repository.

Author: SimonSapin

css-cascade/Overview.html

@@ -9,7 +9,7 @@
    rel=dcterms.rights>
   <meta content="CSS Cascading and Inheritance Level 3" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-05-01 name=dcterms.date>
+  <meta content=2013-06-08 name=dcterms.date>
   <meta content="Håkon Wium Lie" name=dcterms.creator>
   <meta content="Elika J. Etemad" name=dcterms.creator>
   <meta content="Tab Atkins Jr." name=dcterms.creator>
@@ -28,11 +28,11 @@
 
    <h1>CSS Cascading and Inheritance Level 3</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 May 2013</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 June 2013</h2>
 
    <dl><!--
 		<dt>This version:
-		<dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130501/</a>
+		<dd><a href="http://dev.w3.org/csswg/css3-cascade/">http://www.w3.org/TR/2013/WD-css3-cascade-20130608/</a>
 -->
 
     <dt>Latest version:
@@ -260,24 +260,21 @@ <h2 id=introduction><span class=secno>1. </span>Introduction</h2>
    rel=biblioentry>[CSS3PAGE]<!--{{CSS3PAGE}}--></a>.
 
   <h2 id=at-import><span class=secno>2. </span> Importing style sheets: the
-   ‘<a href="#lsquoatimportrsquo"><code class=css>@import</code></a>’
-   rule</h2>
-
-  <p> The <dfn id=lsquoatimportrsquo>‘<code
-   class=css>@import</code>’</dfn> rule allows users to import style rules
-   from other style sheets. Any ‘<a href="#lsquoatimportrsquo"><code
-   class=css>@import</code></a>’ rules must follow all ‘<code
-   class=css>@charset</code>’ rules and precede all other at-rules and rule
-   sets in a style sheet. The ‘<a href="#lsquoatimportrsquo"><code
-   class=css>@import</code></a>’ keyword must be followed by the URI of the
-   style sheet to include. A string is also allowed; it will be interpreted
-   as if it had url(…) around it.
+   ‘<a href="#atimport"><code class=css>@import</code></a>’ rule</h2>
+
+  <p> The <dfn id=atimport>‘<code class=css>@import</code>’</dfn> rule
+   allows users to import style rules from other style sheets. Any ‘<a
+   href="#atimport"><code class=css>@import</code></a>’ rules must follow
+   all ‘<code class=css>@charset</code>’ rules and precede all other
+   at-rules and style rules in a style sheet. The ‘<a
+   href="#atimport"><code class=css>@import</code></a>’ keyword must be
+   followed by the URI of the style sheet to include. A string is also
+   allowed; it will be interpreted as if it had url(…) around it.
 
   <div class=example>
    <p> The following lines are equivalent in meaning and illustrate both
-    ‘<a href="#lsquoatimportrsquo"><code class=css>@import</code></a>’
-    syntaxes (one with ‘<code class=css>url()</code>’ and one with a bare
-    string):
+    ‘<a href="#atimport"><code class=css>@import</code></a>’ syntaxes
+    (one with ‘<code class=css>url()</code>’ and one with a bare string):
 
    <pre><!--
 		-->@import "mystyle.css";
@@ -287,18 +284,17 @@ <h2 id=at-import><span class=secno>2. </span> Importing style sheets: the
 
   <p> So that user agents can avoid retrieving resources for unsupported
    media types, authors may specify media-dependent ‘<a
-   href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ rules.
-   Such media-dependent imports include a comma-separated list of “media
+   href="#atimport"><code class=css>@import</code></a>’ rules. Such
+   media-dependent imports include a comma-separated list of “media
    queries” after the URI. In the absence of any media query, the import is
    unconditional. (Specifying ‘<a href="#all"><code
    class=css>all</code></a>’ for the medium has the same effect.) The UA
    must import the style sheet if (and only if) the media condition evaluates
    to true.
 
   <div class=example>
-   <p> The following rules illustrate how ‘<a
-    href="#lsquoatimportrsquo"><code class=css>@import</code></a>’ rules
-    can be made media-dependent:
+   <p> The following rules illustrate how ‘<a href="#atimport"><code
+    class=css>@import</code></a>’ rules can be made media-dependent:
 
    <pre><!--
 		-->@import url("fineprint.css") print;
@@ -485,7 +481,7 @@ <h3 id=filter-declarations><span class=secno>4.1. </span> Filtering
     rel=biblioentry>[CSS3-CONDITIONAL]<!--{{!CSS3-CONDITIONAL}}--></a> with a
     false condition.
 
-   <li> It belongs to a ruleset whose selector matches the element. <a
+   <li> It belongs to a style rule whose selector matches the element. <a
     href="#SELECT" rel=biblioentry>[SELECT]<!--{{!SELECT}}--></a> (Taking <a
     href="http://www.w3.org/TR/selectors4/#scoping">scoping</a> into account,
     if necessary.)
@@ -590,22 +586,22 @@ <h3 id=cascade><span class=secno>4.2. </span> Cascading Declarations</h3>
    <dd> The <a href="http://www.w3.org/TR/selectors/#specificity">Selectors
     module</a> <a href="#SELECT"
     rel=biblioentry>[SELECT]<!--{{!SELECT}}--></a> describes how to compute
-    the specificity of a selector. For the purpose of this step, a ruleset
+    the specificity of a selector. For the purpose of this step, a style rule
     without a selector (such as the <a
     href="http://www.w3.org/TR/css-style-attr/#interpret">contents of a style
     attribute</a>) is considered to have a specificity higher than any
-    selector. The declaration belonging to a ruleset whose selector has the
-    highest specificity wins.
+    selector. The declaration belonging to a style rule whose selector has
+    the highest specificity wins.
 
    <dt id=cascade-order>Order of appearance.
 
    <dd> Rules from imported style sheets are treated as if their stylesheets
-    were substituted in place of the ‘<a href="#lsquoatimportrsquo"><code
+    were substituted in place of the ‘<a href="#atimport"><code
     class=css>@import</code></a>’ rule. Stylesheets independently linked by
     the originating document are treated as if they were concatenated in
     linking order, as determined by the host document language. Style
-    attributes are treated as if their rulesets were concatenated in document
-    order, after any stylesheets. The last declaration wins.
+    attributes are treated as if their style rules were concatenated in
+    document order, after any stylesheets. The last declaration wins.
   </dl>
 
   <p> The <dfn id=output-of-the-cascade>output of the cascade</dfn> is a
@@ -1202,10 +1198,10 @@ <h3 class=no-num id=normative-references>Normative references</h3>
    <dt id=CSS3-CONDITIONAL>[CSS3-CONDITIONAL]
 
    <dd>L. David Baron. <a
-    href="http://www.w3.org/TR/2012/WD-css3-conditional-20121213/"><cite>CSS
-    Conditional Rules Module Level 3.</cite></a> 13 December 2012. W3C
-    Working Draft. (Work in progress.) URL: <a
-    href="http://www.w3.org/TR/2012/WD-css3-conditional-20121213/">http://www.w3.org/TR/2012/WD-css3-conditional-20121213/</a>
+    href="http://www.w3.org/TR/2013/CR-css3-conditional-20130404/"><cite>CSS
+    Conditional Rules Module Level 3.</cite></a> 4 April 2013. W3C Candidate
+    Recommendation. (Work in progress.) URL: <a
+    href="http://www.w3.org/TR/2013/CR-css3-conditional-20130404/">http://www.w3.org/TR/2013/CR-css3-conditional-20130404/</a>
    </dd>
    <!---->
 
@@ -1327,7 +1323,7 @@ <h2 class=no-num id=index>Index</h2>
    <li>‘<code class=css>default</code>’, <a href="#default-keyword"
     title="section 4.3.3."><strong>4.3.3.</strong></a>
 
-   <li>‘<code class=css>@import</code>’, <a href="#lsquoatimportrsquo"
+   <li>‘<code class=css>@import</code>’, <a href="#atimport"
     title="section 2."><strong>2.</strong></a>
 
    <li>‘<code class=css>inherit</code>’, <a href="#inherit-keyword"

css-cascade/Overview.src.html

@@ -96,7 +96,7 @@ <h2 id="at-import">
 	<p>
 		The <dfn>''@import''</dfn> rule allows users to import style rules from other style sheets.	
 		Any ''@import'' rules must follow all ''@charset'' rules 
-		and precede all other at-rules and rule sets in a style sheet.	
+		and precede all other at-rules and style rules in a style sheet.	
 		The ''@import'' keyword must be followed by the URI of the style sheet to include. 
 		A string is also allowed; 
 		it will be interpreted as if it had url(&hellip;) around it.
@@ -288,7 +288,7 @@ <h3 id='filter-declarations'>
 			It is not qualified by a conditional rule [[!CSS3-CONDITIONAL]] with a false condition.
 
 		<li>
-			It belongs to a ruleset whose selector matches the element. [[!SELECT]]
+			It belongs to a style rule whose selector matches the element. [[!SELECT]]
 			(Taking <a href="http://www.w3.org/TR/selectors4/#scoping">scoping</a> into account, if necessary.)
 	</ul>
 
@@ -378,18 +378,18 @@ <h3 id='cascade'>
 		<dd>
 			The <a href="http://www.w3.org/TR/selectors/#specificity">Selectors module</a> [[!SELECT]] describes how to compute the specificity of a selector.
 			For the purpose of this step, 
-			a ruleset without a selector
+			a style rule without a selector
 			(such as the <a href="http://www.w3.org/TR/css-style-attr/#interpret">contents of a style attribute</a>)
 			is considered to have a specificity higher than any selector.
-			The declaration belonging to a ruleset whose selector has the highest specificity wins.
+			The declaration belonging to a style rule whose selector has the highest specificity wins.
 
 
 		<dt id='cascade-order'>Order of appearance.
 		<dd>
 			Rules from imported style sheets are treated as if their stylesheets were substituted in place of the ''@import'' rule.
 			Stylesheets independently linked by the originating document are treated as if they were concatenated in linking order,
 			as determined by the host document language.
-			Style attributes are treated as if their rulesets were concatenated in document order, after any stylesheets.
+			Style attributes are treated as if their style rules were concatenated in document order, after any stylesheets.
 			The last declaration wins. 
 	</dl>
 

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-06-03 name=dcterms.date>
+  <meta content=2013-06-08 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,14 +33,14 @@
    <h1 class=p-name>CSS Conditional Rules Module Level 3</h1>
 
    <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft <span
-    class=dt-updated><span class=value-title title=20130603>3 June
+    class=dt-updated><span class=value-title title=20130608> 8 June
     2013</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-20130603/</a>
+     http://www.w3.org/TR/2013/ED-css3-conditional-20130608/</a>
 
     <dt>Latest version:
 
@@ -300,7 +300,7 @@ <h3 id=context><span class=secno>1.1. </span>Background</h3>
 
   <p><a href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> defines
    one type of conditional group rule, the ‘<code
-   class=css>@media</code>’ rule, and allows only rulesets (not other
+   class=css>@media</code>’ rule, and allows only style rules (not other
    @-rules) inside of it. The ‘<code class=css>@media</code>’ rule
    provides the ability to have media-specific style sheets, which is also
    provided by style sheet linking features such as ‘<code
@@ -441,17 +441,20 @@ <h2 id=contents-of><span class=secno>3. </span>Contents of conditional
    rule body</dfn>, which is a block (pair of braces) containing a sequence
    of rules.
 
-  <p>A group rule body is allowed to contain rulesets and any @-rules that
-   are allowed at the top level of a style sheet before and after a ruleset.
-   This means that @-rules that must occur at the beginning of the style
-   sheet (such as ‘<code class=css>@charset</code>’, ‘<code
+  <p>A group rule body is allowed to contain style rules and any @-rules that
+   are allowed at the top level of a style sheet before and after a style
+   rule. This means that @-rules that must occur at the beginning of the
+   style sheet (such as ‘<code class=css>@charset</code>’, ‘<code
    class=css>@import</code>’, and ‘<code class=css>@namespace</code>’
    rules) are not allowed inside of conditional group rules. Conditional
    group rules can be nested.
 
   <p>In terms of the grammar, this specification defines the following
    productions for use in the grammar of conditional group rules:
 
+  <p class=note>Note: Style rules are defined in grammars by the
+   <code>ruleset</code> production.
+
   <pre><dfn id="nested_statement">nested_statement</dfn>
   : ruleset | <a
    href="#media"><i>media</i></a> | page | font_face_rule | keyframes_rule |
@@ -500,7 +503,7 @@ <h2 id=use><span class=secno>4. </span>Placement of conditional group rules</h2>
    <strong>must</strong> process such rules as <a
    href="#processing">described above</a>.
 
-  <p>Any rules that are not allowed after a ruleset (e.g., ‘<code
+  <p>Any rules that are not allowed after a style rule (e.g., ‘<code
    class=css>@charset</code>’, ‘<code class=css>@import</code>’, or
    ‘<code class=css>@namespace</code>’ rules) are also not allowed after
    a conditional group rule. Therefore, style sheets <strong>must
@@ -950,9 +953,9 @@ <h3 id=support-definition><span class=secno>6.1. </span>Definition of
    the ‘<code class=css>@supports</code>’ rule in this specification)
    that works correctly for the features implemented. This applies especially
    to compound values; implementations must implement all parts of the value
-   in order to consider the declaration supported, either inside a ruleset or
-   in the declaration condition of an ‘<code class=css>@supports</code>’
-   rule.</p>
+   in order to consider the declaration supported, either inside a style rule
+   or in the declaration condition of an ‘<code
+   class=css>@supports</code>’ rule.</p>
   <!--
 <h2 id="at-document">Document queries: the '@document' rule</h2>
 

css-conditional/Overview.src.html

@@ -8,7 +8,7 @@
   <link href="../csslogo.ico" rel="shortcut icon" type="image/x-icon">
   <link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-[STATUS].css">
   <script src="http://test.csswg.org/harness/annotate.js#CSS3-CONDITIONAL_DEV" 
-        type="text/javascript" defer></script
+        type="text/javascript" defer></script>
 </head>
 <body class="h-entry">
 
@@ -131,7 +131,7 @@ <h3 id="context">Background</h3>
   <p><em>This section is not normative.</em>
 
   <p>[[!CSS21]] defines one type of conditional group rule, the
-  '@media' rule, and allows only rulesets (not other @-rules)
+  '@media' rule, and allows only style rules (not other @-rules)
   inside of it.  The '@media' rule provides the ability to
   have media-specific style sheets, which is also provided by style
   sheet linking features such as '@import' and
@@ -258,16 +258,19 @@ <h2 id="contents-of">Contents of conditional group rules</h2>
 specific to the type of rule followed by a <dfn>group rule body</dfn>,
 which is a block (pair of braces) containing a sequence of rules.</p>
 
-<p>A group rule body is allowed to contain rulesets and any @-rules that
+<p>A group rule body is allowed to contain style rules and any @-rules that
 are allowed at the top level of a style sheet before and after a
-ruleset.  This means that @-rules that must occur at the beginning of
+style rule.  This means that @-rules that must occur at the beginning of
 the style sheet (such as '@charset', '@import',
 and '@namespace' rules) are not allowed inside of conditional group
 rules.  Conditional group rules can be nested.</p>
 
 <p>In terms of the grammar, this specification defines the following
 productions for use in the grammar of conditional group rules:</p>
 
+<p class=note>Note: Style rules are defined in grammars 
+by the <code>ruleset</code> production.</p>
+
 <pre><dfn>nested_statement</dfn>
   : ruleset | <i>media</i> | page | font_face_rule | keyframes_rule |
     <i>supports_rule</i>
@@ -308,7 +311,7 @@ <h2 id="use">Placement of conditional group rules</h2>
 <strong>must</strong> process such rules as <a
 href="#processing">described above</a>.</p>
 
-<p>Any rules that are not allowed after a ruleset (e.g., ''@charset'',
+<p>Any rules that are not allowed after a style rule (e.g., ''@charset'',
 ''@import'', or ''@namespace'' rules) are also not allowed after a
 conditional group rule.  Therefore, style sheets <strong>must
 not</strong> place such rules after a conditional group rules, and CSS
@@ -676,7 +679,7 @@ <h3 id="support-definition">Definition of support</h3>
 provided by the ''@supports'' rule in this specification) that works
 correctly for the features implemented.  This applies especially to
 compound values; implementations must implement all parts of the value
-in order to consider the declaration supported, either inside a ruleset
+in order to consider the declaration supported, either inside a style rule
 or in the declaration condition of an ''@supports'' rule.</p>
 
 <!--