Skip to content

Commit a002f75

Browse files
bert-githubbert-github
committed
[css2] Linked 3.1 and 1.4.4 to each other (about notes and examples).
Removed long copyright message from 1.6. --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402377
1 parent 6b3be76 commit a002f75

2 files changed

Lines changed: 8 additions & 91 deletions

File tree

‎css2/about.src‎

Lines changed: 4 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
22

33
<html lang="en">
4-
<!-- $Id: about.src,v 2.66 2005-10-18 18:42:47 bbos Exp $ -->
4+
<!-- $Id: about.src,v 2.67 2005-10-18 18:52:03 bbos Exp $ -->
55
<HEAD>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -346,8 +346,9 @@ conform to the DTDs given in the examples.
346346

347347
<P>All notes are informative only.
348348

349-
<P>Examples and notes are marked within the source HTML for the
350-
specification and CSS1 user agents will render them specially.
349+
<P>Examples and notes are <a href="conform.html#defs">marked within
350+
the source HTML</a> for the specification and CSS user agents will
351+
render them specially.
351352

352353
<h3>Images and long descriptions</h3>
353354

@@ -382,91 +383,6 @@ Ada Chan, and Boris Zbarsky, who have contributed significant
382383
time to CSS&nbsp;2.1, and to Kimberly Blessing, for help with the
383384
editing.</p>
384385

385-
386-
<H2><a name="copyright">Copyright Notice</a></H2>
387-
388-
<p class="copyright"><a
389-
href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">
390-
Copyright</a> &copy; 1997-2006 <a href="http://www.w3.org/"><abbr
391-
title="World Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
392-
href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of
393-
Technology">MIT</abbr></a>, <acronym title="European Research
394-
Consortium for Informatics and Mathematics"><a
395-
href="http://www.ercim.org/">ERCIM</a></acronym>, <a
396-
href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
397-
href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
398-
<a
399-
href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
400-
<a
401-
href="http://www.w3.org/Consortium/Legal/copyright-documents">document
402-
use</a> and <a
403-
href="http://www.w3.org/Consortium/Legal/copyright-software">software
404-
licensing</a> rules apply.</p>
405-
406-
<p>Documents on the <a href="http://www.w3.org/">W3C</a> site are
407-
provided by the copyright holders under the following license. By
408-
obtaining, using and/or copying this document, or the W3C document
409-
from which this statement is linked, you agree that you have read,
410-
understood, and will comply with the following terms and
411-
conditions:</p>
412-
413-
<p>Public documents on the W3C site are provided by the copyright holders
414-
under the following license. The software or Document Type Definitions (DTDs)
415-
associated with W3C specifications are governed by the <a
416-
href="http://www.w3.org/Consortium/Legal/copyright-software.html"> Software
417-
Notice</a>. By using and/or copying this document, or the W3C document from
418-
which this statement is linked, you (the licensee) agree that you have read,
419-
understood, and will comply with the following terms and conditions:</p>
420-
421-
<p>Permission to use, copy, and distribute the contents of this document, or
422-
the W3C document from which this statement is linked, in any medium for any
423-
purpose and without fee or royalty is hereby granted, provided that you
424-
include the following on <i>ALL</i> copies of the document, or portions
425-
thereof, that you use:</p>
426-
<ol>
427-
<li>A link or URL to the original W3C document.</li>
428-
<li>The pre-existing copyright notice of the original author, or if it
429-
doesn't exist, a notice of the form: "Copyright &copy; [$date-of-document] <a
430-
href="http://www.w3.org/">World Wide Web Consortium</a>, (<a
431-
href="http://www.lcs.mit.edu/">Massachusetts Institute of Technology</a>,
432-
<a href="http://www.inria.fr/"> Institut National de Recherche en
433-
Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio
434-
University</a>). All Rights Reserved.
435-
http://www.w3.org/Consortium/Legal/" (Hypertext is preferred, but a
436-
textual representation is permitted.)</li>
437-
<li><em>If it exists</em>, the STATUS of the W3C document.</li>
438-
</ol>
439-
440-
<p>When space permits, inclusion of the full text of this <b> NOTICE</b>
441-
should be provided. We request that authorship attribution be provided in any
442-
software, documents, or other items or products that you create pursuant to
443-
the implementation of the contents of this document, or any portion
444-
thereof.</p>
445-
446-
<p>No right to create modifications or derivatives of W3C documents is
447-
granted pursuant to this license. However, if additional requirements
448-
(documented in the <a
449-
href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright
450-
FAQ</a>) are satisfied,
451-
the right to create modifications or derivatives is sometimes granted by the
452-
W3C to individuals complying with those requirements.</p>
453-
454-
<p>THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND COPYRIGHT HOLDERS MAKE NO
455-
REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED
456-
TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
457-
NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE
458-
FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT
459-
INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
460-
461-
<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
462-
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE
463-
PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.</p>
464-
465-
<p>The name and trademarks of copyright holders may NOT be used in
466-
advertising or publicity pertaining to this document or its contents without
467-
specific, written prior permission. Title to copyright in this document will
468-
at all times remain with copyright holders.</p>
469-
470386
</BODY>
471387
</HTML>
472388
<!-- Keep this comment at the end of the file

‎css2/conform.src‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: conform.src,v 2.68 2005-10-18 06:52:08 bbos Exp $ -->
3+
<!-- $Id: conform.src,v 2.69 2005-10-18 18:52:03 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -9,7 +9,7 @@
99
<BODY>
1010
<H1>Conformance: Requirements and Recommendations</H1>
1111

12-
<H2>Definitions</H2>
12+
<H2 id=defs>Definitions</H2>
1313

1414
<P>The key words <span class="index-def" title="MUST">"MUST"</span>,
1515
<span class="index-def" title="MUST NOT">"MUST NOT"</span>, <span
@@ -40,7 +40,8 @@ on conformance. (For example, 'aural' is marked as non-normative, so
4040
UAs do not need to support it; the system colors are normative, so UAs
4141
must support them.)
4242

43-
<p>Examples and notes are not normative.
43+
<p><a href="about.html#notes-and-examples">Examples and notes</a>
44+
are not normative.
4445

4546
<div class=example><p>Examples usually have the word "example" near
4647
their start ("Example:", "The following example&hellip;," "For

0 commit comments

Comments
 (0)