html5/spec-author-view Overview.html,1.605,1.606 elements.html,1.12,1.13 spec.html,1.610,1.611

Update of /sources/public/html5/spec-author-view
In directory hutz:/tmp/cvs-serv16504

Modified Files:
	Overview.html elements.html spec.html 
Log Message:
Use 'and' instead of 'or' here. (whatwg r4526)

[updated by splitter]


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/Overview.html,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -d -r1.605 -r1.606
--- Overview.html	6 Jan 2010 11:58:31 -0000	1.605
+++ Overview.html	6 Jan 2010 12:07:27 -0000	1.606
@@ -281,7 +281,7 @@
    </dl><p>This specification is available in the following formats: 
     <a href="spec.html">single page HTML</a>,
     <a href="Overview.html">multipage HTML</a>.
-This is revision 1.3622.
+This is revision 1.3623.
    </p>
    <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2009 <a href="http://www.w3.org/"><abbr title="World Wide

Index: elements.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/elements.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- elements.html	6 Jan 2010 11:07:18 -0000	1.12
+++ elements.html	6 Jan 2010 12:07:27 -0000	1.13
@@ -276,9 +276,9 @@
   (by this specification) to have certain meanings (semantics). For
   example, the <code><a href="grouping-content.html#the-ol-element">ol</a></code> element represents an ordered list, and
   the <code title="attr-lang"><a href="#attr-lang">lang</a></code> attribute represents the
-  language of the content.</p><p>Authors must not use elements, attributes, and attribute values
+  language of the content.</p><p>Authors must not use elements, attributes, or attribute values
   for purposes other than their appropriate intended semantic
-  purpose. Authors must not use elements, attributes, and attribute
+  purpose. Authors must not use elements, attributes, or attribute
   values that are not permitted by this specification or <a href="#other-applicable-specifications">other
   applicable specifications</a>.</p><div class="example">
    <p>For example, the following document is non-conforming, despite

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/spec.html,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -d -r1.610 -r1.611
--- spec.html	6 Jan 2010 11:58:31 -0000	1.610
+++ spec.html	6 Jan 2010 12:07:27 -0000	1.611
@@ -279,7 +279,7 @@
    </dl><p>This specification is available in the following formats: 
     <a href=spec.html>single page HTML</a>,
     <a href=Overview.html>multipage HTML</a>.
-This is revision 1.3622.
+This is revision 1.3623.
    </p>
    <p class=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a>
    © 2009 <a href=http://www.w3.org/><abbr title="World Wide
@@ -2620,9 +2620,9 @@
   (by this specification) to have certain meanings (semantics). For
   example, the <code><a href=#the-ol-element>ol</a></code> element represents an ordered list, and
   the <code title=attr-lang><a href=#attr-lang>lang</a></code> attribute represents the
-  language of the content.</p><p>Authors must not use elements, attributes, and attribute values
+  language of the content.</p><p>Authors must not use elements, attributes, or attribute values
   for purposes other than their appropriate intended semantic
-  purpose. Authors must not use elements, attributes, and attribute
+  purpose. Authors must not use elements, attributes, or attribute
   values that are not permitted by this specification or <a href=#other-applicable-specifications>other
   applicable specifications</a>.</p><div class=example>
    <p>For example, the following document is non-conforming, despite

Received on Wednesday, 6 January 2010 12:07:31 UTC