Skip to content

Commit f22c6c9

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402387
1 parent 9638b37 commit f22c6c9

11 files changed

Lines changed: 43 additions & 22 deletions

File tree

css2/about.html

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,16 @@ <h2><a name="q1">1.1 CSS&nbsp;2.1 vs CSS&nbsp;2</a></h2>
101101
<p>CSS&nbsp;2.1 is derived from and is intended to replace CSS2. Some
102102
parts of CSS2 are unchanged in CSS&nbsp;2.1, some parts have been
103103
altered, and some parts removed. The removed portions may be used in a
104-
future CSS3 specification. Implementations may refer to CSS2 for the
105-
definitions of features that have been removed, but for other features
106-
CSS&nbsp;2.1 is the normative reference.
104+
future CSS3 specification. Future specs should refer to CSS&nbsp;2.1
105+
(unless they need features from CSS2 which have been dropped in
106+
CSS&nbsp;2.1, and then they should only reference CSS2 for those
107+
features, or preferably reference such feature(s) in the respective
108+
CSS3 Module that includes those feature(s)).
107109

108110
<h2><a name="q2">1.2 Reading the specification</a></h2>
109111

112+
<p>This section is non-normative.
113+
110114
<P>This specification has been written with two types of readers in
111115
mind: CSS authors and CSS implementors. We hope the specification will
112116
provide authors with the tools they need to write efficient,
@@ -132,6 +136,8 @@ <h2><a name="q2">1.2 Reading the specification</a></h2>
132136

133137
<h2><a name="q3">1.3 How the specification is organized</a></h2>
134138

139+
<p>This section is non-normative.
140+
135141
<P>The specification is organized into the following sections:
136142

137143
<dl>
@@ -418,6 +424,8 @@ <h3><a name="q16">1.4.5 Images and long descriptions</a></h3>
418424

419425
<H2><a name="q17">1.5 Acknowledgments</a></H2>
420426

427+
<p>This section is non-normative.
428+
421429
<p>CSS 2.1 is based on CSS2. See the <a
422430
href="http://www.w3.org/TR/REC-CSS2/about.html#q15">acknowledgments
423431
section of CSS2</a> for the people that contributed to CSS2.

css2/box.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,12 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
433433
top border, no top padding, and the child has no <a
434434
href="visuren.html#clearance">clearance.</a></p>
435435

436-
The bottom margin of an in-flow block-level element with
437-
a <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> of 'auto'
438-
and <a href="visudet.html#propdef-min-height" class="noxref"><span class="propinst-min-height">'min-height'</span></a> less than
439-
the element's used height
440-
and <a href="visudet.html#propdef-max-height" class="noxref"><span class="propinst-max-height">'max-height'</span></a> greater than
441-
the element's used height is adjoining to its last in-flow block-level
436+
<p>The bottom margin of an in-flow block-level element with a <a href="visudet.html#propdef-height" class="noxref"><span
437+
class="propinst-height">'height'</span></a> of 'auto' and <a href="visudet.html#propdef-min-height" class="noxref"><span
438+
class="propinst-min-height">'min-height'</span></a> less than the
439+
element's used height and <a href="visudet.html#propdef-max-height" class="noxref"><span
440+
class="propinst-max-height">'max-height'</span></a> greater than the
441+
element's used height is adjoining to its last in-flow block-level
442442
child's bottom margin if the element has no bottom padding or border.
443443

444444
<p>An element's own margins are adjoining if the <a href="visudet.html#propdef-min-height" class="noxref"><span

css2/changes.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,9 @@ <h3 id="s-9-2-4"><a name="q3">C.1.2 </a><a href="visuren.html#propdef-display">S
156156
<h3 id="s-12-2a"><a name="q4">C.1.3 </a><a href="generate.html#content">Section 12.2 The
157157
'content' property</a></h3>
158158

159-
<p>New 'content' value 'normal'. (Because ':before {content: ""}'
160-
generates a box, while ':before {content: normal}' does not. It is
161-
called 'normal' and not 'none', because 'content: normal' will mean
162-
other things for other kinds of elements in CSS3.)
159+
<p>New 'content' values 'none' and 'normal'. (The values 'none' and
160+
'normal' are equivalent in CSS&nbsp;2.1, but may have different
161+
functions in CSS3.)
163162

164163
<h3 id="s-18-1"><a name="q5">C.1.4 </a><a href="ui.html#propdef-cursor">Section 18.1 Cursors:
165164
the 'cursor' property</a></h3>

css2/conform.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
6666
UAs do not need to support it; the system colors are normative, so UAs
6767
must support them.)
6868

69+
<p>All sections of this specification, including appendices, are
70+
normative unless otherwise noted.
71+
6972
<p><a href="about.html#notes-and-examples">Examples and notes</a>
7073
are not normative.
7174

css2/cover.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,11 @@ <h2 id=abstract>Abstract</h2>
111111
<p>CSS&nbsp;2.1 is derived from and is intended to replace CSS2. Some
112112
parts of CSS2 are unchanged in CSS&nbsp;2.1, some parts have been
113113
altered, and some parts removed. The removed portions may be used in a
114-
future CSS3 specification. Implementations may refer to CSS2 for the
115-
definitions of features that have been removed, but for other features
116-
CSS&nbsp;2.1 is the normative reference.
114+
future CSS3 specification. Future specs should refer to CSS&nbsp;2.1
115+
(unless they need features from CSS2 which have been dropped in
116+
CSS&nbsp;2.1, and then they should only reference CSS2 for those
117+
features, or preferably reference such feature(s) in the respective
118+
CSS3 Module that includes those feature(s)).
117119

118120
<h2 id=status>Status of this document</h2>
119121

css2/grammar.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ <H1><a name="q0">Appendix G. Grammar of CSS&nbsp;2.1</a></H1>
3232
<li class="tocline2"><a href="grammar.html#tokenizer-diffs" class="tocxref">G.3 Comparison of tokenization in CSS&nbsp;2.1 and CSS1</a>
3333
</ul>
3434
</div>
35-
<P><em>This appendix is normative.</em>
3635

3736
<P>The grammar below defines the syntax of CSS&nbsp;2.1. It is in some sense,
3837
however, a superset of CSS&nbsp;2.1 as this specification imposes additional

css2/indexlist.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<hr class="navbar">
2323

2424
<H1><a name="q0">Appendix I. Index</a></H1>
25+
<p>This section is non-normative.
26+
2527
<DIV class=NOPRINT>
2628
<P>
2729
<A HREF="#index-a">A</A>

css2/intro.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ <H1><a name="q0">2 Introduction to CSS&nbsp;2.1</a></H1>
4040

4141
<H2><a name="q1">2.1 A brief CSS&nbsp;2.1 tutorial for HTML</a></H2>
4242

43+
<p>This section is non-normative.
44+
4345
<P> In this tutorial, we show how easy it can be to design simple
4446
style sheets. For this tutorial, you will need to know a little HTML
4547
(see <a href="refs.html#ref-HTML4" rel="biblioentry" class="noxref"><span class="informref">[HTML4]</span></a>) and some basic desktop publishing terminology.
@@ -205,6 +207,8 @@ <H2><a name="q1">2.1 A brief CSS&nbsp;2.1 tutorial for HTML</a></H2>
205207

206208
<H2><a name="q2">2.2 A brief CSS&nbsp;2.1 tutorial for XML</a></H2>
207209

210+
<p>This section is non-normative.
211+
208212
<P>CSS can be used with any structured document format, for example
209213
with applications of the eXtensible Markup Language <a href="refs.html#ref-XML10" rel="biblioentry" class="noxref"><span class="informref">[XML10]</span></a>. In
210214
fact, XML depends more on style sheets than HTML, since authors can
@@ -397,6 +401,8 @@ <h3><a name="q5">2.3.2 CSS&nbsp;2.1 addressing model</a></h3>
397401

398402
<H2><a name="q6">2.4 CSS design principles</a></H2>
399403

404+
<p>This section is non-normative.
405+
400406
<P>CSS&nbsp;2.1, as CSS2 and CSS1 before it, is based on a set of design principles:</p>
401407

402408
<UL>

css2/refs.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@ <H2><a name="q1">B.1 Normative references</a></H2>
162162
Available at <a href="http://www.unicode.org/versions/Unicode4.0.0/">
163163
http://www.unicode.org/versions/Unicode4.0.0/</a>
164164

165-
<DT><STRONG><A name="ref-URI" class="normref">[URI]</A></STRONG></DT>
166-
167165
<dt><strong><a name="ref-XML10" class="normref">[XML10]</a></strong>
168166
<dd>"Extensible Markup Language (XML) 1.0 (third edition)"
169167
T. Bray, J. Paoli, C.M. Sperberg-McQueen, Eve Maler, François Yergeau, editors, 4 February 2004.<BR>

css2/syndata.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ <h3>4.3.4 <a name="uri">URL + URN = URI</a></h3>
10481048
</p>
10491049
<p>Depending on the type of URI, it might also be possible to write
10501050
the above characters as URI-escapes (where "(" = %28, ")" = %29, etc.)
1051-
as described in <a href="refs.html#ref-URI" rel="biblioentry" class="noxref"><span class="normref">[URI]</span></a>.
1051+
as described in <a href="refs.html#ref-RFC3986" rel="biblioentry" class="noxref"><span class="normref">[RFC3986]</span></a>.
10521052
</p>
10531053
<p> In order to create modular style sheets that are not dependent on
10541054
the absolute location of a resource, authors may use relative URIs.

0 commit comments

Comments
 (0)