8000 [CSS2] Make the spec refer to "CSS 2" generally · w3c/csswg-drafts@5260911 · GitHub
Skip to content

Commit 5260911

Browse files
gsneddersgsnedders
committed
[CSS2] Make the spec refer to "CSS 2" generally
1 parent 1b62d39 commit 5260911

43 files changed

Lines changed: 298 additions & 298 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎css2/aural.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ <H1><a name="q19.0">Appendix A. Aural style sheets</a></H1>
5656
<!-- /warning -->
5757

5858
<p>This chapter is informative. UAs are not required to implement the
59-
properties of this chapter in order to conform to CSS 2.1.
59+
properties of this chapter in order to conform to CSS&nbsp;2.
6060

6161
<h2>A.1 <a name="aural-media-group">The media types 'aural' and 'speech'</a></h2>
6262

6363
<p>We expect that in a future level of CSS there will be new
6464
properties and values defined for speech output. Therefore
65-
CSS&nbsp;2.1 reserves the 'speech' media type (see <a
65+
CSS&nbsp;2 reserves the 'speech' media type (see <a
6666
href="media.html">chapter 7, "Media types"</a>), but does not yet
6767
define which properties do or do not apply to it.
6868

@@ -78,7 +78,7 @@ <h2>A.1 <a name="aural-media-group">The media types 'aural' and 'speech'</a></h2
7878
}
7979
</pre>
8080

81-
<p>is valid, but that its meaning is not defined by CSS&nbsp;2.1,
81+
<p>is valid, but that its meaning is not defined by CSS&nbsp;2,
8282
while
8383

8484
<pre>

‎css2/aural.src‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<H1>Aural style sheets</H1>
1111

1212
<p>This chapter is informative. UAs are not required to implement the
13-
properties of this chapter in order to conform to CSS 2.1.
13+
properties of this chapter in order to conform to CSS&nbsp;2.
1414

1515
<h2><a name="aural-media-group">The media types 'aural' and 'speech'</a></h2>
1616

1717
<p>We expect that in a future level of CSS there will be new
1818
properties and values defined for speech output. Therefore
19-
CSS&nbsp;2.1 reserves the 'speech' media type (see <a
19+
CSS&nbsp;2 reserves the 'speech' media type (see <a
2020
href="media.html">chapter 7, "Media types"</a>), but does not yet
2121
define which properties do or do not apply to it.
2222

@@ -32,7 +32,7 @@ was introduced in CSS2. The type 'aural' is now deprecated.
3232
}
3333
</pre>
3434

35-
<p>is valid, but that its meaning is not defined by CSS&nbsp;2.1,
35+
<p>is valid, but that its meaning is not defined by CSS&nbsp;2,
3636
while
3737

3838
<pre>

‎css2/box.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ <H2>8.3 <a name="margin-properties">Margin properties</a>:
247247
class="propinst-margin-top">'margin-top'</span></a> and <a href="box.html#propdef-margin-bottom" class="noxref"><span
248248
class="propinst-margin-bottom">'margin-bottom'</span></a> as well.</span>
249249
If the containing block's width depends on this element, then the
250-
resulting layout is undefined in CSS&nbsp;2.1.
250+
resulting layout is undefined in CSS&nbsp;2.
251251
<dt><strong>auto</strong>
252252
<dd>See the section on <a
253253
href="visudet.html#Computing_widths_and_margins">calculating widths and
@@ -527,7 +527,7 @@ <H2>8.4 <a name="padding-properties">Padding properties</a>:
527527
<a href="box.html#propdef-padding-top" class="noxref"><span class="propinst-padding-top">'padding-top'</span></a> and <a href="box.html#propdef-padding-bottom" class="noxref"><span
528528
class="propinst-padding-bottom">'padding-bottom'</span></a>.
529529
If the containing block's width depends on this element, then the
530-
resulting layout is undefined in CSS&nbsp;2.1.
530+
resulting layout is undefined in CSS&nbsp;2.
531531
</dl>
532532

533533
<P>Unlike margin properties, values for padding values cannot be

‎css2/box.src‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ with respect to the <em>width</em> of the generated box's
206206
class="propinst-margin-top">'margin-top'</span> and <span
207207
class="propinst-margin-bottom">'margin-bottom'</span> as well.</span>
208208
If the containing block's width depends on this element, then the
209-
resulting layout is undefined in CSS&nbsp;2.1.
209+
resulting layout is undefined in CSS&nbsp;2.
210210
<dt><strong>auto</strong>
211211
<dd>See the section on <a
212212
href="visudet.html#Computing_widths_and_margins">calculating widths and
@@ -438,7 +438,7 @@ href="visuren.html#containing-block">containing block</a>, even for
438438
<span class="propinst-padding-top">'padding-top'</span> and <span
439439
class="propinst-padding-bottom">'padding-bottom'</span>.
440440
If the containing block's width depends on this element, then the
441-
resulting layout is undefined in CSS&nbsp;2.1.
441+
resulting layout is undefined in CSS&nbsp;2.
442442
</dl>
443443

444444
<P>Unlike margin properties, values for padding values cannot be

‎css2/cascade.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ <H2>6.3 <a name="at-import">The @import rule</a></h2>
228228

229229
<P>The <a name="x7"><span class="index-def"
230230
title="@import"><dfn>'@import'</dfn></span></a> rule allows users to
231-
import style rules from other style sheets. In CSS&nbsp;2.1, any
231+
import style rules from other style sheets. In CSS&nbsp;2, any
232232
@import rules must precede all other rules (except the @charset rule,
233233
if present). See the <a href="syndata.html#at-rules">section on
234234
parsing</a> for when user agents must ignore @import rules. The

‎css2/cascade.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ http://lists.w3.org/Archives/Member/w3c-css-wg/1998JanMar/0054.html
186186

187187
<P>The <span class="index-def"
188188
title="@import"><dfn>'@import'</dfn></span> rule allows users to
189-
import style rules from other style sheets. In CSS&nbsp;2.1, any
189+
import style rules from other style sheets. In CSS&nbsp;2, any
190190
@import rules must precede all other rules (except the @charset rule,
191191
if present). See the <a href="syndata.html#at-rules">section on
192192
parsing</a> for when user agents must ignore @import rules. The

‎css2/colors.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
451451
otherwise given, or '50%' for the vertical position if it is.
452452
</dl>
453453

454-
<p>However, the position is undefined in CSS&nbsp;2.1 if the image has
454+
<p>However, the position is undefined in CSS&nbsp;2 if the image has
455455
an intrinsic ratio, but no intrinsic size.
456456

457457
<div class="example"><P style="display:none">Example(s):</P>

‎css2/colors.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ position. Is that clear from the above? -->
329329
otherwise given, or '50%' for the vertical position if it is.
330330
</dl>
331331

332-
<p>However, the position is undefined in CSS&nbsp;2.1 if the image has
332+
<p>However, the position is undefined in CSS&nbsp;2 if the image has
333333
an intrinsic ratio, but no intrinsic size.
334334

335335
<div class="example">

‎css2/conform.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
106106
sheet</a></span></strong>
107107

108108
<dd>The validity of a style sheet depends on the level of CSS
109-
used for the style sheet. All valid CSS1 style sheets are valid CSS&nbsp;2.1
109+
used for the style sheet. All valid CSS1 style sheets are valid CSS&nbsp;2
110110
style sheets, but some changes from CSS1 mean that
111111
a few CSS1 style sheets will have slightly different semantics in
112-
CSS&nbsp;2.1. Some features in CSS2 are not part of CSS&nbsp;2.1, so not all CSS2
113-
style sheets are valid CSS&nbsp;2.1 style sheets.
112+
CSS&nbsp;2. Some features in CSS2 are not part of CSS&nbsp;2, so not all CSS2
113+
style sheets are valid CSS&nbsp;2 style sheets.
114114

115-
<P>A valid CSS&nbsp;2.1 style sheet must be written according to the <a
116-
href="grammar.html">grammar of CSS&nbsp;2.1</a>. Furthermore, it must contain
115+
<P>A valid CSS&nbsp;2 style sheet must be written according to the <a
116+
href="grammar.html">grammar of CSS&nbsp;2</a>. Furthermore, it must contain
117117
only at-rules, property names, and property values defined in this
118118
specification.
119119
An <span
@@ -179,7 +179,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
179179

180180
<dd>The width and height as defined by the element itself, not imposed
181181
by the surroundings. CSS does not define how the intrinsic dimensions
182-
are found. In CSS&nbsp;2.1 only replaced elements can come with
182+
are found. In CSS&nbsp;2 only replaced elements can come with
183183
intrinsic dimensions.
184184
For raster images without reliable resolution information, a size of
185185
1&nbsp;px unit per image source pixel must be assumed.
@@ -375,7 +375,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
375375

376376
<P>This section defines <span class="index-def"
377377
title="conformance"><a name="conformance-term">conformance</a></span> with
378-
the CSS&nbsp;2.1
378+
the CSS&nbsp;2
379379
specification only. There may be other levels of CSS in the future
380380
that may require a user agent to implement a different set of features
381381
in order to conform.
@@ -385,7 +385,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
385385

386386
<ol>
387387

388-
<li>It must recognize one or more of the CSS&nbsp;2.1 <a href="media.html">media types</a>.
388+
<li>It must recognize one or more of the CSS&nbsp;2 <a href="media.html">media types</a>.
389389

390390
<li>For each source document, it must attempt to retrieve all
391391
associated style sheets that are appropriate for the recognized media
@@ -395,7 +395,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
395395

396396
<li>It must parse the style sheets according to this specification.
397397
In particular, it must recognize all at-rules, blocks, declarations,
398-
and selectors (see the <a href="grammar.html">grammar of CSS&nbsp;2.1</a>).
398+
and selectors (see the <a href="grammar.html">grammar of CSS&nbsp;2</a>).
399399
If a user agent encounters a property that applies for a supported
400400
media type, the user agent must parse the value according to the property
401401
definition. This means that the user agent must accept all valid
@@ -426,7 +426,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
426426
<ul>
427427

428428
<li>An application that reads style sheets without rendering any
429-
content (e.g., a CSS&nbsp;2.1 validator) must respect points 1-3.
429+
content (e.g., a CSS&nbsp;2 validator) must respect points 1-3.
430430

431431
<li>An authoring tool is only required to output <a
432432
href="#valid-style-sheet">valid style sheets</a>
@@ -450,7 +450,7 @@ <h2>3.2 <a name="conformance">UA Conformance</a></h2>
450450
may offer other means to specify user preferences, for example, through
451451
a GUI.
452452

453-
<p>CSS&nbsp;2.1 does not define which properties apply to form controls and
453+
<p>CSS&nbsp;2 does not define which properties apply to form controls and
454454
frames, or how CSS can be used to style them. User agents may apply CSS
455455
properties to these elements. Authors are recommended to treat such
456456
support as experimental. A future level of CSS may specify this further.

‎css2/conform.src‎

Lines changed: 11 additions & 11 deletions

0 commit comments

Comments
 (0)
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ sheet|validity"><a name="valid-style-sheet">Valid style
7777
sheet</a></span></strong>
7878

7979
<dd>The validity of a style sheet depends on the level of CSS
80-
used for the style sheet. All valid CSS1 style sheets are valid CSS&nbsp;2.1
80+
used for the style sheet. All valid CSS1 style sheets are valid CSS&nbsp;2
8181
style sheets, but some changes from CSS1 mean that
8282
a few CSS1 style sheets will have slightly different semantics in
83-
CSS&nbsp;2.1. Some features in CSS2 are not part of CSS&nbsp;2.1, so not all CSS2
84-
style sheets are valid CSS&nbsp;2.1 style sheets.
83+
CSS&nbsp;2. Some features in CSS2 are not part of CSS&nbsp;2, so not all CSS2
84+
style sheets are valid CSS&nbsp;2 style sheets.
8585

86-
<P>A valid CSS&nbsp;2.1 style sheet must be written according to the <a
87-
href="grammar.html">grammar of CSS&nbsp;2.1</a>. Furthermore, it must contain
86+
<P>A valid CSS&nbsp;2 style sheet must be written according to the <a
87+
href="grammar.html">grammar of CSS&nbsp;2</a>. Furthermore, it must contain
8888
only at-rules, property names, and property values defined in this
8989
specification.
9090
An <span
@@ -150,7 +150,7 @@ dimensions"><a name="intrinsic">Intrinsic dimensions</a></span></strong>
150150

151151
<dd>The width and height as defined by the element itself, not imposed
152152
by the surroundings. CSS does not define how the intrinsic dimensions
153-
are found. In CSS&nbsp;2.1 only replaced elements can come with
153+
are found. In CSS&nbsp;2 only replaced elements can come with
154154
intrinsic dimensions.
155155
For raster images without reliable resolution information, a size of
156156
1&nbsp;px unit per image source pixel must be assumed.
@@ -346,7 +346,7 @@ end tags.
346346

347347
<P>This section defines <span class="index-def"
348348
title="conformance"><a name="conformance-term">conformance</a></span> with
349-
the CSS&nbsp;2.1
349+
the CSS&nbsp;2
350350
specification only. There may be other levels of CSS in the future
351351
that may require a user agent to implement a different set of features
352352
in order to conform.
@@ -356,7 +356,7 @@ claiming conformance to this specification:</P>
356356

357357
<ol>
358358

359-
<li>It must recognize one or more of the CSS&nbsp;2.1 <a href="media.html">media types</a>.
359+
<li>It must recognize one or more of the CSS&nbsp;2 <a href="media.html">media types</a>.
360360

361361
<li>For each source document, it must attempt to retrieve all
362362
associated style sheets that are appropriate for the recognized media
@@ -366,7 +366,7 @@ it can retrieve.
366366

367367
<li>It must parse the style sheets according to this specification.
368368
In particular, it must recognize all at-rules, blocks, declarations,
369-
and selectors (see the <a href="grammar.html">grammar of CSS&nbsp;2.1</a>).
369+
and selectors (see the <a href="grammar.html">grammar of CSS&nbsp;2</a>).
370370
If a user agent encounters a property that applies for a supported
371371
media type, the user agent must parse the value according to the property
372372
definition. This means that the user agent must accept all valid
@@ -400,7 +400,7 @@ allow the user to select which style sheet set the UA should apply.
400400
<ul>
401401

402402
<li>An application that reads style sheets without rendering any
403-
content (e.g., a CSS&nbsp;2.1 validator) must respect points 1-3.
403+
content (e.g., a CSS&nbsp;2 validator) must respect points 1-3.
404404

405405
<li>An authoring tool is only required to output <a
406406
href="#valid-style-sheet">valid style sheets</a>
@@ -424,7 +424,7 @@ specifying files are exempted from this requirement. Additionally, UAs
424424
may offer other means to specify user preferences, for example, through
425425
a GUI.
426426

427-
<p>CSS&nbsp;2.1 does not define which properties apply to form controls and
427+
<p>CSS&nbsp;2 does not define which properties apply to form controls and
428428
frames, or how CSS can be used to style them. User agents may apply CSS
429429
properties to these elements. Authors are recommended to treat such
430430
support as experimental. A future level of CSS may specify this further.