8000 [CSS2] Clarify "CSS2" to mean the 1998 REC · w3c/csswg-drafts@5a78df7 · GitHub
Skip to content

Commit 5a78df7

Browse files
gsneddersgsnedders
committed
[CSS2] Clarify "CSS2" to mean the 1998 REC
1 parent 5260911 commit 5a78df7

30 files changed

Lines changed: 82 additions & 72 deletions

‎css2/about.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ <h2>1.1 <a name="css2.2-v-css2">CSS&nbsp;2.2 vs CSS&nbsp;2</a></h2>
5959

6060
<p>The CSS community has gained significant experience with the CSS2
6161
specification since it became a recommendation in 1998. Errors in the
62-
CSS2 specification have subsequently been corrected in the first
63-
revised edition [[-CSS21]] in 2011, but new errata were necessary.
62+
CSS2 specification <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="informref">[CSS20]</span></a> have subsequently been corrected in the first
63+
revised edition <a href="refs.html#ref-CSS21" rel="biblioentry" class="noxref"><span class="informref">[CSS21]</span></a> in 2011, but new errata were necessary.
6464

6565
<p>While many of the issues will be addressed by the upcoming CSS3
6666
specifications, the current state of affairs hinders the
@@ -144,15 +144,15 @@ <h2>1.3 <a name="organization">How the specification is organized</a></h2>
144144

145145
<dl>
146146

147-
<dt><Strong>Section 2: An introduction to CSS&nbsp;2.2</strong>
147+
<dt><Strong>Section 2: An introduction to CSS&nbsp;2</strong>
148148

149-
<dd>The introduction includes a brief tutorial on CSS&nbsp;2.2 and
150-
a discussion of design principles behind CSS&nbsp;2.2.
149+
<dd>The introduction includes a brief tutorial on CSS&nbsp;2 and
150+
a discussion of design principles behind CSS&nbsp;2.
151151

152-
<dt><strong>Sections 3 - 18: CSS&nbsp;2.2 reference manual.</strong>
152+
<dt><strong>Sections 3 - 18: CSS&nbsp;2 reference manual.</strong>
153153

154-
<dd>The bulk of the reference manual consists of the CSS&nbsp;2.2 language
155-
reference. This reference defines what may go into a CSS&nbsp;2.2 style sheet
154+
<dd>The bulk of the reference manual consists of the CSS&nbsp;2 language
155+
reference. This reference defines what may go into a CSS&nbsp;2 style sheet
156156
(syntax, properties, property values) and how user agents must
157157
interpret these style sheets in order to claim <a
158158
href="conform.html#conformance">conformance</a>.
@@ -163,7 +163,7 @@ <h2>1.3 <a name="organization">How the specification is organized</a></h2>
163163
<dd>Appendixes contain information about <a href="aural.html">aural
164164
properties</a> (non-normative), <a href="sample.html">a
165165
sample style sheet for HTML 4</a>, <a href="changes.html">changes
166-
from CSS&nbsp;2.1</a>, <a href="grammar.html">the grammar of CSS&nbsp;2.2</a>,
166+
from CSS&nbsp;2.1</a>, <a href="grammar.html">the grammar of CSS&nbsp;2</a>,
167167
a list of normative and informative <a href="refs.html">references</a>,
168168
and two indexes: one for
169169
<a href="propidx.html">properties</a> and one
@@ -431,7 +431,7 @@ <H2>1.5 <a name="acknowledgements">Acknowledgments</a></H2>
431431

432432
<p>This section is non-normative.
433433

434-
<p>CSS 2.2 is based on CSS2 and CSS&nbsp;2.1. See the <a
434+
<p>CSS&nbsp;2.2 is based on CSS2&nbsp;(1998) and CSS&nbsp;2.1. See the <a
435435
href="http://www.w3.org/TR/2008/REC-CSS2-20080411/about.html#q15"
436436
>acknowledgments section of CSS2</a> and the <a
437437
href="http://www.w3.org/TR/2011/REC-CSS2-20110607/about.html#acknowledgements"

‎css2/about.src‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<p>The CSS community has gained significant experience with the CSS2
1515
specification since it became a recommendation in 1998. Errors in the
16-
CSS2 specification have subsequently been corrected in the first
16+
CSS2 specification [[-CSS20]] have subsequently been corrected in the first
1717
revised edition [[-CSS21]] in 2011, but new errata were necessary.
1818

1919
<p>While many of the issues will be addressed by the upcoming CSS3
@@ -98,15 +98,15 @@ version of the document.
9898

9999
<dl>
100100

101-
<dt><Strong>Section 2: An introduction to CSS&nbsp;2.2</strong>
101+
<dt><Strong>Section 2: An introduction to CSS&nbsp;2</strong>
102102

103-
<dd>The introduction includes a brief tutorial on CSS&nbsp;2.2 and
104-
a discussion of design principles behind CSS&nbsp;2.2.
103+
<dd>The introduction includes a brief tutorial on CSS&nbsp;2 and
104+
a discussion of design principles behind CSS&nbsp;2.
105105

106-
<dt><strong>Sections 3 - 18: CSS&nbsp;2.2 reference manual.</strong>
106+
<dt><strong>Sections 3 - 18: CSS&nbsp;2 reference manual.</strong>
107107

108-
<dd>The bulk of the reference manual consists of the CSS&nbsp;2.2 language
109-
reference. This reference defines what may go into a CSS&nbsp;2.2 style sheet
108+
<dd>The bulk of the reference manual consists of the CSS&nbsp;2 language
109+
reference. This reference defines what may go into a CSS&nbsp;2 style sheet
110110
(syntax, properties, property values) and how user agents must
111111
interpret these style sheets in order to claim <a
112112
href="conform.html#conformance">conformance</a>.
@@ -117,7 +117,7 @@ href="conform.html#conformance">conformance</a>.
117117
<dd>Appendixes contain information about <a href="aural.html">aural
118118
properties</a> (non-normative), <a href="sample.html">a
119119
sample style sheet for HTML 4</a>, <a href="changes.html">changes
120-
from CSS&nbsp;2.1</a>, <a href="grammar.html">the grammar of CSS&nbsp;2.2</a>,
120+
from CSS&nbsp;2.1</a>, <a href="grammar.html">the grammar of CSS&nbsp;2</a>,
121121
a list of normative and informative <a href="refs.html">references</a>,
122122
and two indexes: one for
123123
<a href="propidx.html">properties</a> and one
67F6
@@ -370,7 +370,7 @@ the long description is denoted by a "[D]" after the image.
370370

371371
<p>This section is non-normative.
372372

373-
<p>CSS 2.2 is based on CSS2 and CSS&nbsp;2.1. See the <a
373+
<p>CSS&nbsp;2.2 is based on CSS2&nbsp;(1998) and CSS&nbsp;2.1. See the <a
374374
href="http://www.w3.org/TR/2008/REC-CSS2-20080411/about.html#q15"
375375
>acknowledgments section of CSS2</a> and the <a
376376
href="http://www.w3.org/TR/2011/REC-CSS2-20110607/about.html#acknowledgements"

‎css2/aural.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h2>A.1 <a name="aural-media-group">The media types 'aural' and 'speech'</a></h2
6767
define which properties do or do not apply to it.
6868

6969
< A3CA span class=pl-kos><p>The properties in this appendix apply to a media type 'aural', that
70-
was introduced in CSS2. The type 'aural' is now deprecated.
70+
was introduced in CSS2&nbsp;(1998) <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="informref">[CSS20]</span></a>. The type 'aural' is now deprecated.
7171

7272
<div class=note>
7373
<p>This means that a style sheet such as

‎css2/aural.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ href="media.html">chapter 7, "Media types"</a>), but does not yet
2121
define which properties do or do not apply to it.
2222

2323
<p>The properties in this appendix apply to a media type 'aural', that
24-
was introduced in CSS2. The type 'aural' is now deprecated.
24+
was introduced in CSS2&nbsp;(1998) [[-CSS20]]. The type 'aural' is now deprecated.
2525

2626
<div class=note>
2727
<p>This means that a style sheet such as

‎css2/changes.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ <H1><a name="q21.0">Appendix C. Changes</a></H1>
2929
<!-- /warning -->
3030
<P><em>This appendix is informative, not normative.</em></P>
3131

32-
<P>CSS&nbsp;2.2 is an updated revision of CSS2. The changes between
33-
the CSS 2.1 specification (see <a href="refs.html#ref-CSS2" rel="biblioentry" class="noxref"><span class="informref">[CSS2]</span></a>) and this specification fall into
32+
<P>CSS&nbsp;2.2 is an updated revision of CSS&nbsp;2. The changes between
33+
the CSS&nbsp;2.1 specification (see <a href="refs.html#ref-CSS21" rel="biblioentry" class="noxref"><span class="informref">[CSS21]</span></a>) and this specification fall into
3434
five groups: <a href="#known-errors">known errors,</a> typographical
3535
errors, <a href="#clarifications">clarifications,</a> <a
3636
href="#changes">changes</a> and <a href="#new">additions.</a>

‎css2/changes.src‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<H1>Changes</H1>
1010
<P><em>This appendix is informative, not normative.</em></P>
1111

12-
<P>CSS&nbsp;2.2 is an updated revision of CSS2. The changes between
13-
the CSS 2.1 specification (see [[CSS2]]) and this specification fall into
12+
<P>CSS&nbsp;2.2 is an updated revision of CSS&nbsp;2. The changes between
13+
the CSS&nbsp;2.1 specification (see [[CSS21]]) and this specification fall into
1414
five groups: <a href="#known-errors">known errors,</a> typographical
1515
errors, <a href="#clarifications">clarifications,</a> <a
1616
href="#changes">changes</a> and <a href="#new">additions.</a>
@@ -41,7 +41,7 @@ Colors</a></h3>
4141

4242
<h3 id="c1.1"><a href="about.html#css2.1-v-css2">Section 1.1 CSS 2.1 vs CSS 2</a></h3>
4343

44-
<p>This new section is added to explain the motivation for CSS2.1
44+
<p>This new section is added to explain the motivation for CSS&nbsp;2.1
4545
and its relation to CSS2.</p>
4646
-->
4747

‎css2/conform.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ <H2>3.1 <a name="defs">Definitions</a></H2>
109109
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. Some features in CSS2 are not part of CSS&nbsp;2, so not all CSS2
112+
CSS&nbsp;2. Some features in CSS2&nbsp;(1998) are not part of CSS&nbsp;2, so not all CSS2&nbsp;(1998)
113113
style sheets are valid CSS&nbsp;2 style sheets.
114114

115115
<P>A valid CSS&nbsp;2 style sheet must be written according to the <a

‎css2/conform.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ sheet</a></span></strong>
8080
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. Some features in CSS2 are not part of CSS&nbsp;2, so not all CSS2
83+
CSS&nbsp;2. Some features in CSS2&nbsp;(1998) are not part of CSS&nbsp;2, so not all CSS2&nbsp;(1998)
8484
style sheets are valid CSS&nbsp;2 style sheets.
8585

8686
<P>A valid CSS&nbsp;2 style sheet must be written according to the <a

‎css2/cover.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
src="http://www.w3.org/Icons/w3c_home" width="72"></a>
2727

2828
<h1 id="title">Cascading Style Sheets Level 2 Revision 2 (CSS&nbsp;2.2) Specification</h1>
29-
<h2 id="W3C-doctype">W3C Editors Draft 25 April 2018</h2>
29+
<h2 id="W3C-doctype">W3C Editors Draft 27 April 2018</h2>
3030

3131
<dl>
3232
<dt>This version:
33-
<dd><a href="http://www.w3.org/TR/2018/ED-CSS2-20180425">
34-
http://www.w3.org/TR/2018/ED-CSS2-20180425</a>
33+
<dd><a href="http://www.w3.org/TR/2018/ED-CSS2-20180427">
34+
http://www.w3.org/TR/2018/ED-CSS2-20180427</a>
3535
<dt>Latest version:
3636
<dd><a href="http://www.w3.org/TR/CSS2">
3737
http://www.w3.org/TR/CSS2</a>
@@ -68,7 +68,7 @@ <h2 id="W3C-doctype">W3C Editors Draft 25 April 2018</h2>
6868

6969
<!--
7070
<p>Please refer to the <a
71-
href="http://www.w3.org/Style/css2-updates/ED-CSS2-20180425-errata.html"><strong>
71+
href="http://www.w3.org/Style/css2-updates/ED-CSS2-20180427-errata.html"><strong>
7272
errata</strong></a> for this document.
7373
-->
7474

@@ -120,14 +120,14 @@ <h2 id=abstract>Abstract</h2>
120120
and some properties related to user interface.
121121

122122
<p>CSS&nbsp;2.2 is derived from and is intended to replace the
123-
CSS&nbsp;2.1 and original CSS2
123+
CSS&nbsp;2.1 and CSS2&nbsp;(1998)
124124
specifications. See <a href="changes.html">appendix C of this
125125
document</a> for changes from CSS&nbsp;2.1,
126126
and <a href="/TR/2011/REC-CSS21-2011-06-07/changes.html">appendix C of
127-
CSS&nbsp;2.1 for changes from CSS2</a> (noting that certain CSS2 features
128-
were removed from CSS level 2 in CSS&nbsp2.1). All future
127+
CSS&nbsp;2.1 for changes from CSS2&nbsp;(1998)</a> (noting that certain CSS2&nbsp;(1998) features
128+
were removed from CSS&nbsp;2 in CSS&nbsp2.1). All future
129129
specifications should refer to CSS&nbsp;2.2 when referring to CSS
130-
level 2; if they wish to reference features from CSS2 dropped in later
130+
level 2; if they wish to reference features from CSS2&nbsp;(1998) dropped in later
131131
revisions they should reference the latest applicable CSS module.
132132

133133
<h2 id=status>Status of this document</h2>
@@ -670,7 +670,7 @@ <h2><a name="toc">Full Table of Contents</a></h2>
670670
<ul class="toc">
671671
<li class="tocline2"><a href="grammar.html#grammar" class="tocxref">G.1 Grammar</a>
672672
<li class="tocline2"><a href="grammar.html#scanner" class="tocxref">G.2 Lexical scanner</a>
673-
<li class="tocline2"><a href="grammar.html#tokenizer-diffs" class="tocxref">G.3 Comparison of tokenization in CSS&nbsp;2 and CSS1</a>
673+
<li class="tocline2"><a href="grammar.html#tokenizer-diffs" class="tocxref">G.3 Comparison of tokenization in CSS2&nbsp;(1998) and CSS1</a>
674674
<li class="tocline2"><a href="grammar.html#q25.4" class="tocxref">G.4 Implementation note</a>
675675
</ul>
676676
<li class="tocline1"><a href="indexlist.html#q27.0" class="tocxref">Appendix I. Index</a>

‎css2/cover.src‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ content positioning, table layout, features for internationalization
105105
and some properties related to user interface.
106106

107107
<p>CSS&nbsp;2.2 is derived from and is intended to replace the
108-
CSS&nbsp;2.1 and original CSS2
108+
CSS&nbsp;2.1 and CSS2&nbsp;(1998)
109109
specifications. See <a href="changes.html">appendix C of this
110110
document</a> for changes from CSS&nbsp;2.1,
111111
and <a href="/TR/2011/REC-CSS21-2011-06-07/changes.html">appendix C of
112-
CSS&nbsp;2.1 for changes from CSS2</a> (noting that certain CSS2 features
113-
were removed from CSS level 2 in CSS&nbsp2.1). All future
112+
CSS&nbsp;2.1 for changes from CSS2&nbsp;(1998)</a> (noting that certain CSS2&nbsp;(1998) features
113+
were removed from CSS&nbsp;2 in CSS&nbsp2.1). All future
114114
specifications should refer to CSS&nbsp;2.2 when referring to CSS
115-
level 2; if they wish to reference features from CSS2 dropped in later
115+
level 2; if they wish to reference features from CSS2&nbsp;(1998) dropped in later
116116
revisions they should reference the latest applicable CSS module.
117117

118118
<h2 id=status>Status of this document</h2>

0 commit comments

Comments
 (0)