- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 30 Jan 2010 05:50:02 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv2431/src
Modified Files:
header.src.html terms.html
Log Message:
checkpointing
Index: header.src.html
===================================================================
RCS file: /sources/public/html5/markup/src/header.src.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- header.src.html 28 Jan 2010 17:38:37 -0000 1.26
+++ header.src.html 30 Jan 2010 05:50:00 -0000 1.27
@@ -43,7 +43,7 @@
<div id="tocjump"/>
<section id="abstract">
<h2>Abstract</h2>
- <p>This specification describes the fifth major version of
+ <p>This specification describes <!--the fifth major version of-->
the HTML language and provides details necessary for
producers of HTML content to create documents that conform
to the language. By design, it does not define related APIs
Index: terms.html
===================================================================
RCS file: /sources/public/html5/markup/src/terms.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- terms.html 29 Jan 2010 01:18:38 -0000 1.16
+++ terms.html 30 Jan 2010 05:50:00 -0000 1.17
@@ -1,12 +1,8 @@
<section id="terminology"
xmlns="http://www.w3.org/1999/xhtml">
<h2>Terminology and symbols</h2>
- <p>This section defines the following:</p>
- <div class="toc"/>
- <section id="terms">
- <h2>Terms used in other parts of the specification</h2>
- <p>The following is a list of terms that are common to various
- other sections in this specification.</p>
+ <p>The following is a list of terms that are used in other
+ sections of this specification.</p>
<dl>
<dt><dfn
id="context"
@@ -105,86 +101,4 @@
Object Model (DOM) Level 2 Views</cite> <a
href="#refsDOM2VIEWS">[DOM2VIEWS]</a>.</dd>
</dl>
- </section>
- <section id="rnc-symbols">
- <h2>Symbols used in content models</h2>
- <p>This section provides explanations for the symbols used in
- the <i>Content model</i> and <i>Attribute model</i>
- subsections of the per-element documentation in the
- <a href="#elements">HTML elements</a>
- section and in the
- <a href="#common-models">Common content models</a>,
- <a href="#common-attributes">Common attributes</a>,
- and
- <a href="#forms-attributes">Forms attributes</a>
- sections.</p>
-
- <p>The explanations use the term
- <dfn
- id="group"
- title="group"
- >group</dfn>
- to mean any combination of names and symbols that are
- delimited by a pair of matching
- "<code>(</code>" and "<code>)</code>"
- (parentheses) symbols, and the term
- <dfn
- id="pattern-name"
- title="pattern-name"
- >pattern name</dfn>
- to mean any hyperlinked name used in a definition that is not
- an element name or an attribute name.</p>
- <dl id="rnc-symbol-list">
- <dt id="optional"><span class="rnc-symbol">?</span> (optional)</dt>
- <dd>The "<code>?</code>" (question mark) symbol after an
- element name, attribute name,
- <a href="#pattern-name">pattern name</a>,
- or
- <a href="#group">group</a>
- indicates that it is optional — meaning that it can either
- not occur at all, or it can occur exactly once.</dd>
- <dt id="zero-or-more"><span class="rnc-symbol">*</span> (zero or more)</dt>
- <dd>The "<code>*</code>" (asterisk) symbol after an element
- name,
- <a href="#pattern-name">pattern name</a>,
- or
- <a href="#group">group</a>
- indicates that it may occur
- any number of times, including not occurring at all.</dd>
- <dt id="one-or-more"><span class="rnc-symbol">+</span> (one or more)</dt>
- <dd>The "<code>+</code>" (plus sign) symbol after an element
- name,
- <a href="#pattern-name">pattern name</a>,
- or
- <a href="#group">group</a>
- indicates that is must occur
- at least once, and can occur more than once.</dd>
- <dt id="choice"><span class="rnc-symbol">|</span> (either/or choice)</dt>
- <dd>The "<code>|</code>" (vertical line) symbol between
- element names, attribute names,
- <a href="#pattern-name">pattern names</a>,
- and
- <a href="#group">groups</a>
- indicates an either/or alternative relationship between
- the two items it separates; that is, it indicates that
- either the item before the "<code>|</code>" symbol can
- occur, or the item after the symbol can occur.</dd>
- <dt id="in-order"><span class="rnc-symbol">,</span> (in the order shown)</dt>
- <dd>The "<code>,</code>" (comma) symbol between element
- names,
- <a href="#pattern-name">pattern names</a>,
- and
- <a href="#group">groups</a>
- indicates that the two
- items it separates can only occur in the order shown.</dd>
- <dt id="interleave"><span class="rnc-symbol">&</span> (interleaved in any order)</dt>
- <dd>The "<code>&</code>" (ampersand) symbol between
- element names, attribute names,
- <a href="#pattern-name">pattern names</a>,
- and
- <a href="#group">groups</a>
- indicates that the two items it separates can occur in any
- order.</dd>
- </dl>
- </section>
</section>
Received on Saturday, 30 January 2010 05:50:03 UTC