Skip to content

Commit 2028255

Browse files
HixieHixie
committed
[css2] Update examples and HTML4 references to HTML4.01
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402340
1 parent 7b5e98d commit 2028255

33 files changed

Lines changed: 124 additions & 129 deletions

‎css2/about.src‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: about.src,v 2.61 2005-08-23 15:21:44 ihickson Exp $ -->
5+
<!-- $Id: about.src,v 2.62 2005-08-27 09:25:58 ihickson Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -112,7 +112,7 @@ href="conform.html#conformance">conformance</a>.
112112

113113
<dd>Appendixes contain information about <a href="aural.html">aural
114114
properties</a> (non-normative), <a href="sample.html">a
115-
sample style sheet for HTML 4.0</a>, <a href="changes.html">changes
115+
sample style sheet for HTML 4</a>, <a href="changes.html">changes
116116
from CSS2</a>, <a href="grammar.html">the grammar of CSS&nbsp;2.1</a>,
117117
a list of normative and informative <a href="refs.html">references</a>,
118118
and two indexes: one for
@@ -341,8 +341,9 @@ take their initial values.</p>
341341
<P>All examples that illustrate illegal usage are clearly
342342
marked as "ILLEGAL EXAMPLE".
343343

344-
<P>All HTML examples conform to the HTML 4.0 strict DTD (defined in
345-
[[HTML40]]) unless otherwise indicated by a document type declaration.
344+
<P>HTML examples lacking DOCTYPE declarations are SGML Text Entities
345+
conforming to the HTML 4.01 Strict DTD. [[HTML4]] Other HTML examples
346+
conform to the DTDs given in the examples.
346347

347348
<P>All notes are informative only.
348349

‎css2/aural.src‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: aural.src,v 2.46 2003-09-05 14:50:48 bbos Exp $ -->
5+
<!-- $Id: aural.src,v 2.47 2005-08-27 09:25:58 ihickson Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Aural style sheets</TITLE>
@@ -781,8 +781,8 @@ cells.
781781
</dl>
782782

783783
<p>Each document language may have different mechanisms that allow
784-
authors to specify headers. For example, in HTML 4.0 ([[HTML40]]), it
785-
is possible to specify header information with three different
784+
authors to specify headers. For example, in HTML 4 ([[HTML4]]),
785+
it is possible to specify header information with three different
786786
attributes ("headers", "scope", and "axis"), and the specification
787787
gives an algorithm for determining header information when these
788788
attributes have not been specified.</p>
@@ -897,7 +897,7 @@ San Jose, 25-Aug-97, Meals: 37.74
897897

898898
<h2><a name="sample">Sample style sheet for HTML</a></h2>
899899

900-
<p>This style sheet describes a possible rendering of HTML 4.0:
900+
<p>This style sheet describes a possible rendering of HTML 4:
901901

902902
<pre>
903903
@media aural {

‎css2/box.src‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: box.src,v 1.59 2004-04-26 15:23:23 bbos Exp $ -->
5+
<!-- $Id: box.src,v 1.60 2005-08-27 09:25:58 ihickson Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Box model</TITLE>
@@ -92,7 +92,7 @@ generating element. Margin backgrounds are always transparent.
9292
interact. The example HTML document:
9393

9494
<pre class="html-example">
95-
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"&gt;
95+
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"&gt;
9696
&lt;HTML&gt;
9797
&lt;HEAD&gt;
9898
&lt;TITLE&gt;Examples of margins, padding, and borders&lt;/TITLE&gt;

‎css2/cascade.src‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: cascade.src,v 2.53 2005-08-23 15:29:04 ihickson Exp $ -->
3+
<!-- $Id: cascade.src,v 2.54 2005-08-27 09:25:58 ihickson Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
@@ -394,7 +394,7 @@ Some examples:
394394
</PRE>
395395
</div>
396396

397-
<div class="html-example"><P>
397+
<div class="html-example">
398398

399399
<pre>
400400
&lt;HEAD&gt;

‎css2/changes.src‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: changes.src,v 2.46 2005-05-26 16:27:26 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.47 2005-08-27 09:25:58 ihickson Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Changes</TITLE>
@@ -671,15 +671,15 @@ and 'unicode-bidi' properties in author and user style sheets.
671671
</blockquote>
672672

673673
<p>the word "ignore" meant that if a 'unicode-bidi' or 'direction'
674-
value conflicts with the HTML 4.0 "dir" attribute value, then user
674+
value conflicts with the HTML 4 "dir" attribute value, then user
675675
agents may choose to use the "dir" value rather than the CSS
676676
properties.
677677

678678
<p>User agents are not required to support the <span
679679
class="propinst-direction">'direction'</span> and <span
680680
class="propinst-unicode-bidi">'unicode-bidi'</span> properties to
681681
conform to CSS2 unless they support bi-directional text rendering
682-
(except for the case of HTML 4.0 as noted above).
682+
(except for the case of HTML 4 as noted above).
683683

684684
<p>The sentence has been rewritten to be clearer.
685685

‎css2/colors.src‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 2.40 2005-04-12 14:02:15 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.41 2005-08-27 09:25:58 ihickson Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Colors and backgrounds</title>
@@ -82,7 +82,7 @@ According to these rules, the canvas underlying the following
8282
HTML document will have a "marble" background:
8383
</p>
8484
<pre>
85-
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"&gt;
85+
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"&gt;
8686
&lt;TITLE&gt;Setting the canvas background&lt;/TITLE&gt;
8787
&lt;STYLE type="text/css"&gt;
8888
BODY { background: url("http://example.com/marble.png") }

‎css2/conform.src‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: conform.src,v 2.64 2005-05-26 16:11:47 bbos Exp $ -->
3+
<!-- $Id: conform.src,v 2.65 2005-08-27 09:25:58 ihickson Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -260,7 +260,7 @@ specification.
260260
<p>Here is an example of a source document written in HTML:
261261

262262
<PRE>
263-
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"&gt;
263+
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"&gt;
264264
&lt;HTML&gt;
265265
&lt;TITLE&gt;My home page&lt;/TITLE&gt;
266266
&lt;BODY&gt;
@@ -282,7 +282,7 @@ specification.
282282
<P><IMG src="images/doctree.png" alt="Sample document tree"></p>
283283
</div>
284284

285-
<P>According to the definition of HTML 4.0, HEAD elements will be
285+
<P>According to the definition of HTML 4, HEAD elements will be
286286
inferred during parsing and become part of the document tree even if
287287
the "head" tags are not in the document source. Similarly, the parser
288288
knows where the P and LI elements end, even though there are no
@@ -341,7 +341,7 @@ property's definition and the rules of <a
341341
href="cascade.html">cascading and inheritance</a>.
342342

343343
<li>If the source document comes with alternate style sheet sets (such as
344-
with the "alternate" keyword in HTML 4.0 [[-HTML40]]), the UA must
344+
with the "alternate" keyword in HTML 4 [[-HTML4]]), the UA must
345345
allow the user to select which style sheet set the UA should apply.
346346

347347
<li>The UA must allow the user to turn off the influence of author style sheets.

‎css2/descidx.src‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: descidx.src,v 2.0 1998-02-02 18:44:44 bbos Exp $ -->
3+
<!-- $Id: descidx.src,v 2.1 2005-08-27 09:25:58 ihickson Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Descriptor index</TITLE>

‎css2/errata-issues.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
33
<HEAD>
44
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

‎css2/errata.src‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -25,7 +25,7 @@ hspace="0"></a><br clear="all"></p>
2525
<dd><a href="_THE_UPDATE_DIR_/_THE_ID_-errata.html">
2626
_THE_UPDATE_DIR_/_THE_ID_-errata.html</a>
2727
<dt>Last revised:
28-
<dd>$Date: 2002-07-05 22:19:35 $
28+
<dd>$Date: 2005-08-27 09:25:58 $
2929
</dl>
3030

3131
<dl>

0 commit comments

Comments
 (0)