[css2] Issues 65, 66, and two small errors

bert-github · bert-github · commit 5cefe43d6ba1 · 2004-02-16T18:33:43.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402209
diff --git a/css2/Makefile b/css2/Makefile
@@ -1,19 +1,19 @@
 # Makefile to generate the CSS2 document based on its "source files"
 # Arnaud Le Hors - lehors@w3.org
-# $Id: Makefile,v 2.82 2004-02-02 14:52:02 bbos Exp $
+# $Id: Makefile,v 2.83 2004-02-16 18:33:43 bbos Exp $
 
 # what needs to be set for every new release:
 # Note use of full year (1998) in identifier.
-THE_YEAR = 2003
-THE_MONTH = 09
-THE_MONTHNAME = September
-THE_DAY = 15
-THE_STATUS = WD
-THE_STATUSNAME = Working Draft
+THE_YEAR = 2004
+THE_MONTH = 02
+THE_MONTHNAME = February
+THE_DAY = 23
+THE_STATUS = CR
+THE_STATUSNAME = Candidate Recommendation
 
 PREV_YEAR = 2003
-PREV_MONTH = 01
-PREV_DAY = 28
+PREV_MONTH = 09
+PREV_DAY = 15
 PREV_STATUS = WD
 
 PERMANENT_NAME = CSS21
diff --git a/css2/box.src b/css2/box.src
@@ -2,7 +2,7 @@
   'http://www.w3.org/TR/html4/strict.dtd'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.54 2004-02-09 21:47:46 bbos Exp $ -->
+<!-- $Id: box.src,v 1.55 2004-02-16 18:33:43 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Box model</TITLE>
@@ -147,7 +147,7 @@ and padding relate."></p>
 calculated top-down; the <a href="visuren.html#containing-block">containing
 block</a> for each LI box is established by the UL element.
 
-<li>The height of each LI box is given by its <a
+<li>The margin edge height of each LI box depends on its <a
 href="#content-height">content height</a>, plus top and bottom
 padding, borders, and margins. Note that vertical margins between the
 LI boxes <a href="#collapsing-margins">collapse.</a>
@@ -177,8 +177,7 @@ class="propinst-margin">'margin'</span> shorthand property sets the
 margin for all four sides while the other margin properties only set
 their respective side.  These properties apply to all elements, but
 vertical margins will not have any effect on non-replaced inline
-elements. <a href="conform.html#conformance">Conforming HTML user
-agents</a> may ignore the margin properties on the HTML element.
+elements.
 
 <P>The properties defined in this section refer to the <span
 class="index-def" title="&lt;margin-width&gt;::definition of"><a
@@ -465,9 +464,7 @@ font in use.
 
 <P>The border properties specify the width, color, and style of the <a
 href="#box-border-area">border area</a> of a box. These properties
-apply to all elements.  <a href="conform.html#conformance">Conforming
-HTML user agents</a> may ignore the border properties on the HTML
-element.
+apply to all elements.
 
 
 <div class="note"><P>
@@ -681,8 +678,8 @@ will be visible unless the border style is set.
 
 <H3><A name="border-shorthand-properties">Border shorthand properties</a>:
 <span class="propinst-border-top">'border-top'</span>,
-<span class="propinst-border-bottom">'border-bottom'</span>,
 <span class="propinst-border-right">'border-right'</span>,
+<span class="propinst-border-bottom">'border-bottom'</span>,
 <span class="propinst-border-left">'border-left'</span>, and
 <span class="propinst-border">'border'</span></h3>
 
diff --git a/css2/colors.src b/css2/colors.src
@@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: colors.src,v 2.38 2004-02-09 17:24:09 bbos Exp $ -->
+<!-- $Id: colors.src,v 2.39 2004-02-16 18:33:43 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Colors and backgrounds</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
-<!-- Changed by: Tantek Celik, 2004-02-05 -->
+<!-- Changed by: Tantek Celik, 2004-02-13 -->
 <style type="text/css">
 .current,.proposed,span.delcurrent { background:#feb }
 ins.proposed,span.insproposed,p.insproposed { background:#bfb }
@@ -202,7 +202,7 @@ move with the element, and a 'scroll' background doesn't move with
 the scrolling mechanism.</p>
 
 <p>Even if the image is fixed, it is still only visible when it is in
-the background, padding or border area of the element. Thus, unless
+the content, padding or border area of the element. Thus, unless
 the image is tiled ('background-repeat: repeat'), it may be invisible.
 </p>
 <div class="example"><p>This example creates an infinite vertical band
diff --git a/css2/properties/properties.db b/css2/properties/properties.db
@@ -571,7 +571,7 @@ table-cell | table-caption | none | inherit;;
 /* text-align;;
   left | right | center | justify | inherit;;
   'left' if 'direction' is 'ltr'; 'right' if 'direction' is 'rtl';;
-  block-level elements and table cells;;
+  block-level elements, table cells and inline blocks;;
   yes;;
   N/A;;
   visual;;
