[css2] Hakon's edits according to the issues list

bert-github · bert-github · commit 0b413ec12ae3 · 2006-01-31T19:13:32.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402389
diff --git a/css2/cascade.src b/css2/cascade.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: cascade.src,v 2.55 2005-09-13 19:16:22 bbos Exp $ -->
+<!-- $Id: cascade.src,v 2.56 2006-01-31 19:13:32 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
@@ -182,9 +182,10 @@ http://lists.w3.org/Archives/Member/w3c-css-wg/1998JanMar/0054.html
 <P>The <span class="index-def"
 title="@import"><dfn>'@import'</dfn></span> rule allows users to
 import style rules from other style sheets. Any @import rules must
-precede all rule sets in a style sheet. The '@import' keyword must be
-followed by the URI of the style sheet to include. A string is also
-allowed; it will be interpreted as if it had url(...) around it.
+precede all other rules (except the @charset rule, if present). The
+'@import' keyword must be followed by the URI of the style sheet to
+include. A string is also allowed; it will be interpreted as if it had
+url(...) around it.
 
 <div class="example"><P> 
 The following lines are equivalent in meaning and illustrate both
diff --git a/css2/conform.src b/css2/conform.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: conform.src,v 2.70 2006-01-24 06:50:24 bbos Exp $ -->
+<!-- $Id: conform.src,v 2.71 2006-01-31 19:13:32 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Conformance: requirements and recommendations</TITLE>
@@ -401,19 +401,12 @@ support as experimental. A future level of CSS may specify this further.
 
 <h2>Error conditions</h2>
 
-<P>In general, this document does not specify error handling behavior
-for user agents (e.g., how they behave when they cannot find
-a resource designated by a URI).
+<p>In general, this document specifies error handling behavior
+throughout the specification. For example, see the <a
+href="syndata.html#parsing-errors">rules for handling parsing errors</a>. 
 
-<P>However, user agents must observe the <a
-href="syndata.html#parsing-errors">rules for handling parsing errors</a>.
-
-<P>Since user agents may vary in how they handle error conditions,
-authors and users must not rely on specific error recovery behavior.
-
-
-<H2><span class="index-def" title="text/css"><a
-name="text-css">The text/css content type</a></span></H2>
+<h2><span class="index-def" title="text/css"><a
+name="text-css">The text/css content type</a></span></h2>
 
 <p>CSS style sheets that exist in separate files are sent over the
 Internet as a sequence of bytes accompanied by encoding
diff --git a/css2/generate.src b/css2/generate.src
@@ -141,6 +141,12 @@ fragment and style sheet:</p>
 </pre>
 </div>
 
+<div class="note">
+<p><strong>Note.</strong> This specification does not fully define the interaction of :before
+and :after with replaced elements (such as IMG in HTML). This will
+be defined in more detail in a future specification.</p>
+</div>
+
 <h2><a name="content">The</a> <span
 class="propinst-content">'content'</span> property</h2>
 
@@ -208,9 +214,13 @@ for the subject of the selector. The
 string is not parsed by the CSS processor.  If the subject of the selector
 doesn't have an attribute X, an empty string is returned. The
 case-sensitivity of attribute names depends on the document language. 
+</dl>
+
+<div class="note">
 <strong>Note.</strong> In CSS 2.1, it is not possible to refer to
 attribute values for other elements than the subject of the selector.
-</dl>
+</div>
+
 
 <P>The <span class="propinst-display">'display'</span> property
 controls whether the content is placed in a block or inline box.
@@ -551,7 +561,7 @@ of a counter starts at the first element in the document that has a
 <span class="propinst-counter-reset">'counter-reset'</span> for that
 counter and includes the element's descendants and its following
 siblings with their descendants. However, it does not include any
-elements in the scope of a counter created by a 'counter-reset' on a
+elements in the scope of a counter with the same name created by a 'counter-reset' on a
 later sibling of the element or by a later 'counter-reset' on the same
 element.
 
diff --git a/css2/page.src b/css2/page.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: page.src,v 2.44 2005-08-27 09:25:58 ihickson Exp $ -->
+<!-- $Id: page.src,v 2.45 2006-01-31 19:13:32 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Paged media</TITLE>
@@ -48,15 +48,18 @@ box</dfn></span> is a rectangular region that contains two areas:</p>
 <ul>
 
 <li>The <span class="index-def" title="page area"><a
-name="page-area"><dfn>page area</dfn></a></span>. The page
-area includes the boxes laid out on that page.
-The edges of the first page area act as the initial <a
-href="visudet.html#containing-block-details">containing block</a> 
-for layout that occurs between page breaks. 
+name="page-area"><dfn>page area</dfn></a></span>. The page area
+includes the boxes laid out on that page. The edges of the first page
+area establish the rectangle that is the initial <a
+href="visudet.html#containing-block-details">containing block</a> of
+the document.
+
 
 <li>The margin area, which surrounds the page area. 
 </ul>
 
+<p>The size of a page box cannot be specified in CSS 2.1.
+
 <P>Authors can specify the margins of a page box inside an <span
 class="index-def" title="@page">@page</span> rule. An @page rule
 consists of the keyword "@page", followed by an optional page
