- From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 12 Sep 2012 19:44:10 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv27085
Modified Files:
acknowledgements.html association-of-controls-and-forms.html
attributes-common-to-form-controls.html
attributes-common-to-ins-and-del-elements.html
attributes-common-to-td-and-th-elements.html browsers.html
commands.html common-dom-interfaces.html
common-input-element-apis.html
common-input-element-attributes.html common-microsyntaxes.html
constraints.html content-models.html dimension-attributes.html
dnd.html dom.html dynamic-markup-insertion.html
editing-apis.html editing.html edits-and-lists.html
edits-and-paragraphs.html edits.html element-definitions.html
elements.html examples.html form-submission.html forms.html
global-attributes.html grouping-content.html
headings-and-sections.html history.html iana.html
image-maps.html index.html infrastructure.html
interactions-with-xpath-and-xslt.html
interactive-elements.html introduction.html links.html
mathml.html media-elements.html
named-character-references.html namespaces.html obsolete.html
offline.html parsing.html references.html rendering.html
requirements-relating-to-bidirectional-algorithm-formatting-characters.html
scripting-1.html sections.html semantics.html single-page.html
spec.html states-of-the-type-attribute.html styling.html
syntax.html system-state-and-capabilities.html
tabular-data.html text-level-semantics.html
textFieldSelection.html the-a-element.html
the-abbr-element.html the-address-element.html
the-area-element.html the-article-element.html
the-aside-element.html the-audio-element.html
the-b-element.html the-base-element.html the-bdi-element.html
the-bdo-element.html the-blockquote-element.html
the-body-element.html the-br-element.html
the-button-element.html the-canvas-element.html
the-caption-element.html the-cite-element.html
the-code-element.html the-col-element.html
the-colgroup-element.html the-command-element.html
the-datalist-element.html the-dd-element.html
the-del-element.html the-details-element.html
the-dfn-element.html the-div-element.html the-dl-element.html
the-dt-element.html the-em-element.html the-embed-element.html
the-end.html the-fieldset-element.html
the-figcaption-element.html the-figure-element.html
the-footer-element.html the-form-element.html
the-head-element.html the-header-element.html
the-hgroup-element.html the-hr-element.html
the-html-element.html the-i-element.html
the-iframe-element.html the-img-element.html
the-input-element.html the-ins-element.html
the-kbd-element.html the-keygen-element.html
the-label-element.html the-legend-element.html
the-li-element.html the-link-element.html the-map-element.html
the-mark-element.html the-menu-element.html
the-meta-element.html the-meter-element.html
the-nav-element.html the-noscript-element.html
the-object-element.html the-ol-element.html
the-optgroup-element.html the-option-element.html
the-output-element.html the-p-element.html
the-param-element.html the-pre-element.html
the-progress-element.html the-q-element.html
the-rp-element.html the-rt-element.html the-ruby-element.html
the-s-element.html the-samp-element.html
the-script-element.html the-section-element.html
the-select-element.html the-small-element.html
the-source-element.html the-span-element.html
the-strong-element.html the-style-element.html
the-sub-and-sup-elements.html the-summary-element.html
the-table-element.html the-tbody-element.html
the-td-element.html the-textarea-element.html
the-tfoot-element.html the-th-element.html
the-thead-element.html the-time-element.html
the-title-element.html the-tr-element.html
the-track-element.html the-u-element.html the-ul-element.html
the-var-element.html the-video-element.html
the-wbr-element.html the-xhtml-syntax.html timers.html
tokenization.html urls.html usage-summary.html
user-prompts.html wai-aria.html webappapis.html
Log Message:
commit 9f51fffa1e103e7d380798cabfd7c90fa9e8bfee
Author: Jay Munro <jaymunro@microsoft.com>
Date: Wed Sep 12 12:30:46 2012 -0700
revert changes - fixed conflicts
Fixed conflicts of reverted changes.
Index: the-a-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-a-element.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- the-a-element.html 12 Sep 2012 18:44:23 -0000 1.174
+++ the-a-element.html 12 Sep 2012 19:44:02 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="text-level-semantics.html">← 4.6 Text-level semantics</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-em-element.html">4.6.2 The em element →</a>
Index: the-img-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-img-element.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- the-img-element.html 12 Sep 2012 18:44:26 -0000 1.174
+++ the-img-element.html 12 Sep 2012 19:44:04 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="edits-and-lists.html">← 4.7.5 Edits and lists</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-iframe-element.html">4.8.2 The iframe element →</a>
Index: the-del-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-del-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-del-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-del-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-ins-element.html">← 4.7.1 The ins element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="attributes-common-to-ins-and-del-elements.html">4.7.3 Attributes common to ins and del elements →</a>
Index: the-option-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-option-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-option-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-option-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-optgroup-element.html">← 4.10.11 The optgroup element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-textarea-element.html">4.10.13 The textarea element →</a>
Index: the-figcaption-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-figcaption-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-figcaption-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-figcaption-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-figure-element.html">← 4.5.11 The figure element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-div-element.html">4.5.13 The div element →</a>
Index: the-hr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-hr-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-hr-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-hr-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-p-element.html">← 4.5.1 The p element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-pre-element.html">4.5.3 The pre element →</a>
Index: the-summary-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-summary-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-summary-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-summary-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-details-element.html">← 4.11.1 The details element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-command-element.html">4.11.3 The command element →</a>
Index: the-small-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-small-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-small-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-small-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-strong-element.html">← 4.6.3 The strong element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-s-element.html">4.6.5 The s element →</a>
Index: the-kbd-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-kbd-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-kbd-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-kbd-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-samp-element.html">← 4.6.13 The samp element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-sub-and-sup-elements.html">4.6.15 The sub and sup elements →</a>
Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- single-page.html 12 Sep 2012 18:44:22 -0000 1.109
+++ single-page.html 12 Sep 2012 19:44:01 -0000 1.110
@@ -364,7 +364,7 @@
and <a href=http://www.w3.org/Consortium/Legal/copyright-documents>document
use</a> rules apply.</p>
-
+</div>
=======
<!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<p class=alt>The bulk of the text of this specification is also
@@ -372,8 +372,7 @@
reuse of the specification text.</p>
<!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
- </div>
->>>>>>> parent of 04cee20... Boilerplate file updates
+
<hr class=top><h2 class="no-num no-toc" id=abstract>Abstract</h2>
@@ -513,11 +512,9 @@
<dd>Commit-Watchers mailing list (complete source diffs): <a href=http://lists.whatwg.org/listinfo.cgi/commit-watchers-whatwg.org>http://lists.whatwg.org/listinfo.cgi/commit-watchers-whatwg.org</a></dd>
<dt>Browsable version-control record of all changes:</dt>
<dd>CVSWeb interface with side-by-side diffs: <a href=http://dev.w3.org/cvsweb/html5/spec/>http://dev.w3.org/cvsweb/html5/spec/</a></dd>
-Github repository <a href=https://github.com/w3c/html/commits/master>https://github.com/w3c/html/commits/master</a>
-=======
+ <dd>Github repository <a href=https://github.com/w3c/html/commits/master>https://github.com/w3c/html/commits/master</a></dd>
<dd>Annotated summary with unified diffs: <a href=http://html5.org/tools/web-apps-tracker>http://html5.org/tools/web-apps-tracker</a></dd>
<dd>Raw Subversion interface: <code>svn checkout http://svn.whatwg.org/webapps/</code></dd>
->>>>>>> parent of 2009255... Removed and edited comments and text.
</dl><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING LIST TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- status of document, group responsible (required) --><p>The W3C <a href=http://www.w3.org/html/wg/>HTML Working
Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation
@@ -64387,15 +64384,54 @@
</div>
- <p>User Agents are encouraged to expose the full semantics of <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> elements to Assistive Technology
- when such elements are referenced from WAI-ARIA attributes such as
- <code title=attr-aria-describedby>aria-describedby</code>. However,
- because historically some User Agents have flattened hidden content
- when exposing such content to Assistive Technology, authors SHOULD NOT
- reference hidden content which would lose essential meaning when
- flattened.</p>
+ <p>Accessibility APIs are encouraged to allow a way to expose
+ structured content while marking it as hidden in the default view.
+ Such content should not be perceivable to users in the normal document
+ flow in any modality, whether using Assistive Technology or mainstream
+ User Agents.</p>
+
+ <p>When such features are available, User Agents may thus expose the
+ full semantics of <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> elements to
+ Assistive Technology when appropriate, if such content is referenced
+ indirectly by a <a href=#concept-id title=concept-id>unique identifier (ID)
+ reference</a> or <a href=#valid-hash-name-reference>valid hash-name reference</a>. This
+ allows Assistive Technologies to access the content structure upon
+ user request, while keeping the content hidden in all presentations of
+ the normal document flow. Some examples of where it would be
+ appropriate for the structure of <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> elements to be exposed to users of
+ AT with such an API include:</p>
+
+ <ul><li>a <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> <code><a href=#the-map-element>map</a></code>
+ element referenced from an <code><a href=#the-img-element>img</a></code> element's <code title=attr-hyperlink-usemap><a href=#attr-hyperlink-usemap>usemap</a></code> attribute</li>
+
+ <li><code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> table headers referenced
+ with the <code title=attr-tdth-headers><a href=#attr-tdth-headers>headers</a></code>
+ attribute</li>
+ </ul><p>Cases where it would be inappropriate for the structure of <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> elements to be exposed to users of
+ AT with such an API include:</p>
+
+ <ul><li>a <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> element referenced by
+ an <code title=attr-hyperlink-href><a href=#attr-hyperlink-href>href</a></code> attribute within the
+ same document</li>
+ <li>a <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> form element referenced
+ by a <code><a href=#the-label-element>label</a></code> element's <code title=attr-label-for><a href=#attr-label-for>for</a></code> attribute</li>
+
+ </ul><p class=note>The sorts of elements referenced from a
+ <code><a href=#the-label-element>label</a></code> element's <code title=attr-label-for><a href=#attr-label-for>for</a></code>
+ attribute cannot be flattened without losing essential meaning (see
+ below).</p>
+
+ <p>Other specifications which define elements and attributes which may
+ be included in valid HTML documents (such as SVG, MathML, and
+ WAI-ARIA) may define how or whether this applies to their elements and
+ attributes. <a href=#refsARIA>[ARIA]</a> <a href=#refsMATHML>[MATHML]</a> <a href=#refsSVG>[SVG]</a></p>
+
+ <p>Because historically some User Agents have flattened hidden content
+ when exposing such content to Assistive Technology, authors should not
+ reference <code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code> content which would
+ lose essential meaning when flattened.</p>
<h3 id=inert-subtrees><span class=secno>7.2 </span>Inert subtrees</h3>
Index: the-end.html
===================================================================
RCS file: /sources/public/html5/spec/the-end.html,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- the-end.html 12 Sep 2012 18:44:25 -0000 1.169
+++ the-end.html 12 Sep 2012 19:44:04 -0000 1.170
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="tokenization.html">← 8.2.4 Tokenization</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="named-character-references.html">8.5 Named character references →</a>
Index: parsing.html
===================================================================
RCS file: /sources/public/html5/spec/parsing.html,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- parsing.html 12 Sep 2012 18:44:21 -0000 1.179
+++ parsing.html 12 Sep 2012 19:44:00 -0000 1.180
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="syntax.html">← 8 The HTML syntax</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="tokenization.html">8.2.4 Tokenization →</a>
Index: the-span-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-span-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-span-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-span-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-bdo-element.html">← 4.6.24 The bdo element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-br-element.html">4.6.26 The br element →</a>
Index: the-fieldset-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-fieldset-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-fieldset-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-fieldset-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-form-element.html">← 4.10.3 The form element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-legend-element.html">4.10.5 The legend element →</a>
Index: the-figure-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-figure-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-figure-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-figure-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-dd-element.html">← 4.5.10 The dd element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-figcaption-element.html">4.5.12 The figcaption element →</a>
Index: the-script-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-script-element.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- the-script-element.html 12 Sep 2012 18:44:28 -0000 1.174
+++ the-script-element.html 12 Sep 2012 19:44:06 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="scripting-1.html">← 4.3 Scripting</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-noscript-element.html">4.3.2 The noscript element →</a>
Index: the-input-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-input-element.html,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- the-input-element.html 12 Sep 2012 18:44:26 -0000 1.235
+++ the-input-element.html 12 Sep 2012 19:44:04 -0000 1.236
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-label-element.html">← 4.10.6 The label element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="states-of-the-type-attribute.html">4.10.7.1 States of the type attribute →</a>
Index: constraints.html
===================================================================
RCS file: /sources/public/html5/spec/constraints.html,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- constraints.html 12 Sep 2012 18:44:18 -0000 1.175
+++ constraints.html 12 Sep 2012 19:43:58 -0000 1.176
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="textFieldSelection.html">← 4.10.20 APIs for the text field selections</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="interactive-elements.html">4.11 Interactive elements →</a>
Index: the-p-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-p-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-p-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-p-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="grouping-content.html">← 4.5 Grouping content</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-hr-element.html">4.5.2 The hr element →</a>
Index: examples.html
===================================================================
RCS file: /sources/public/html5/spec/examples.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- examples.html 12 Sep 2012 18:44:19 -0000 1.173
+++ examples.html 12 Sep 2012 19:43:59 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="attributes-common-to-td-and-th-elements.html">← 4.9.11 Attributes common to td and th elements</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="forms.html">4.10 Forms →</a>
Index: the-map-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-map-element.html,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- the-map-element.html 12 Sep 2012 18:44:26 -0000 1.234
+++ the-map-element.html 12 Sep 2012 19:44:05 -0000 1.235
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-canvas-element.html">← 4.8.11 The canvas element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-area-element.html">4.8.13 The area element →</a>
Index: the-head-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-head-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-head-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-head-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-html-element.html">← 4.1.1 The html element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-title-element.html">4.2.2 The title element →</a>
Index: the-s-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-s-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-s-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-s-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-small-element.html">← 4.6.4 The small element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-cite-element.html">4.6.6 The cite element →</a>
Index: the-section-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-section-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-section-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-section-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-body-element.html">← 4.4.1 The body element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-nav-element.html">4.4.3 The nav element →</a>
Index: the-article-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-article-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-article-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-article-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-nav-element.html">← 4.4.3 The nav element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-aside-element.html">4.4.5 The aside element →</a>
Index: the-blockquote-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-blockquote-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-blockquote-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-blockquote-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-pre-element.html">← 4.5.3 The pre element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-ol-element.html">4.5.5 The ol element →</a>
Index: the-rp-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-rp-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-rp-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-rp-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-rt-element.html">← 4.6.21 The rt element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-bdi-element.html">4.6.23 The bdi element →</a>
Index: the-details-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-details-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-details-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-details-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="interactive-elements.html">← 4.11 Interactive elements</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-summary-element.html">4.11.2 The summary element →</a>
Index: the-aside-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-aside-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-aside-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-aside-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-article-element.html">← 4.4.4 The article element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-hgroup-element.html">4.4.7 The hgroup element →</a>
Index: the-title-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-title-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-title-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-title-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-head-element.html">← 4.2.1 The head element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-base-element.html">4.2.3 The base element →</a>
Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -d -r1.1230 -r1.1231
--- offline.html 12 Sep 2012 18:44:21 -0000 1.1230
+++ offline.html 12 Sep 2012 19:44:00 -0000 1.1231
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="history.html">← 5.5 Session history and navigation</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="webappapis.html">6 Web application APIs →</a>
Index: textFieldSelection.html
===================================================================
RCS file: /sources/public/html5/spec/textFieldSelection.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- textFieldSelection.html 12 Sep 2012 18:44:23 -0000 1.173
+++ textFieldSelection.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="form-submission.html">← 4.10.19.6 Form submission</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="constraints.html">4.10.21 Constraints →</a>
Index: global-attributes.html
===================================================================
RCS file: /sources/public/html5/spec/global-attributes.html,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- global-attributes.html 12 Sep 2012 18:44:19 -0000 1.175
+++ global-attributes.html 12 Sep 2012 19:43:59 -0000 1.176
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="elements.html">← 3.2 Elements</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="element-definitions.html">3.2.4 Element definitions →</a>
Index: the-bdi-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-bdi-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-bdi-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-bdi-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-rp-element.html">← 4.6.22 The rp element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-bdo-element.html">4.6.24 The bdo element →</a>
Index: the-legend-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-legend-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-legend-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-legend-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-fieldset-element.html">← 4.10.4 The fieldset element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-label-element.html">4.10.6 The label element →</a>
Index: the-dt-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dt-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-dt-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-dt-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-dl-element.html">← 4.5.8 The dl element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-dd-element.html">4.5.10 The dd element →</a>
Index: history.html
===================================================================
RCS file: /sources/public/html5/spec/history.html,v
retrieving revision 1.1267
retrieving revision 1.1268
diff -u -d -r1.1267 -r1.1268
--- history.html 12 Sep 2012 18:44:19 -0000 1.1267
+++ history.html 12 Sep 2012 19:43:59 -0000 1.1268
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="browsers.html">← 5 Loading Web pages</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="offline.html">5.7 Offline Web applications →</a>
Index: the-source-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-source-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-source-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-source-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-audio-element.html">← 4.8.7 The audio element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-track-element.html">4.8.9 The track element →</a>
Index: the-embed-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-embed-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-embed-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-embed-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-iframe-element.html">← 4.8.2 The iframe element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-object-element.html">4.8.4 The object element →</a>
Index: the-ins-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ins-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-ins-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-ins-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="edits.html">← 4.7 Edits</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-del-element.html">4.7.2 The del element →</a>
Index: the-col-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-col-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-col-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-col-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-colgroup-element.html">← 4.9.3 The colgroup element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-tbody-element.html">4.9.5 The tbody element →</a>
Index: the-em-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-em-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-em-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-em-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-a-element.html">← 4.6.1 The a element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-strong-element.html">4.6.3 The strong element →</a>
Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec/semantics.html,v
retrieving revision 1.1254
retrieving revision 1.1255
diff -u -d -r1.1254 -r1.1255
--- semantics.html 12 Sep 2012 18:44:22 -0000 1.1254
+++ semantics.html 12 Sep 2012 19:44:01 -0000 1.1255
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="dynamic-markup-insertion.html">← 3.4 Dynamic markup insertion</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-html-element.html">4.1.1 The html element →</a>
Index: the-q-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-q-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-q-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-q-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-cite-element.html">← 4.6.6 The cite element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-dfn-element.html">4.6.8 The dfn element →</a>
Index: the-style-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-style-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-style-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-style-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-meta-element.html">← 4.2.5 The meta element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="styling.html">4.2.7 Styling →</a>
Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec/syntax.html,v
retrieving revision 1.1225
retrieving revision 1.1226
diff -u -d -r1.1225 -r1.1226
--- syntax.html 12 Sep 2012 18:44:22 -0000 1.1225
+++ syntax.html 12 Sep 2012 19:44:02 -0000 1.1226
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="dnd.html">← 7.7 Drag and drop</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="parsing.html">8.2 Parsing HTML documents →</a>
Index: webappapis.html
===================================================================
RCS file: /sources/public/html5/spec/webappapis.html,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -d -r1.380 -r1.381
--- webappapis.html 12 Sep 2012 18:44:30 -0000 1.380
+++ webappapis.html 12 Sep 2012 19:44:07 -0000 1.381
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="offline.html">← 5.7 Offline Web applications</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="timers.html">6.3 Timers →</a>
Index: attributes-common-to-form-controls.html
===================================================================
RCS file: /sources/public/html5/spec/attributes-common-to-form-controls.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- attributes-common-to-form-controls.html 12 Sep 2012 18:44:17 -0000 1.173
+++ attributes-common-to-form-controls.html 12 Sep 2012 19:43:57 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="association-of-controls-and-forms.html">← 4.10.18 Association of controls and forms</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="form-submission.html">4.10.19.6 Form submission →</a>
Index: scripting-1.html
===================================================================
RCS file: /sources/public/html5/spec/scripting-1.html,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- scripting-1.html 12 Sep 2012 18:44:21 -0000 1.249
+++ scripting-1.html 12 Sep 2012 19:44:01 -0000 1.250
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="styling.html">← 4.2.7 Styling</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-script-element.html">4.3.1 The script element →</a>
Index: the-abbr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-abbr-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-abbr-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-abbr-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-dfn-element.html">← 4.6.8 The dfn element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-time-element.html">4.6.10 The time element →</a>
Index: the-caption-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-caption-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-caption-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-caption-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-table-element.html">← 4.9.1 The table element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-colgroup-element.html">4.9.3 The colgroup element →</a>
Index: edits-and-paragraphs.html
===================================================================
RCS file: /sources/public/html5/spec/edits-and-paragraphs.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- edits-and-paragraphs.html 12 Sep 2012 18:44:19 -0000 1.173
+++ edits-and-paragraphs.html 12 Sep 2012 19:43:59 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="attributes-common-to-ins-and-del-elements.html">← 4.7.3 Attributes common to ins and del elements</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="edits-and-lists.html">4.7.5 Edits and lists →</a>
Index: the-tbody-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-tbody-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-tbody-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-tbody-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-col-element.html">← 4.9.4 The col element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-thead-element.html">4.9.6 The thead element →</a>
Index: the-td-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-td-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-td-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-td-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-tr-element.html">← 4.9.8 The tr element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-th-element.html">4.9.10 The th element →</a>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -d -r1.1980 -r1.1981
--- spec.html 12 Sep 2012 18:44:22 -0000 1.1980
+++ spec.html 12 Sep 2012 19:44:01 -0000 1.1981
@@ -364,7 +364,7 @@
and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document
use</a> rules apply.</p>
-
+</div>
=======
<!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<p class="alt">The bulk of the text of this specification is also
@@ -372,8 +372,7 @@
reuse of the specification text.</p>
<!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
- </div>
->>>>>>> parent of 04cee20... Boilerplate file updates
+
<hr class="top"><h2 class="no-num no-toc" id="abstract">Abstract</h2>
@@ -513,11 +512,9 @@
<dd>Commit-Watchers mailing list (complete source diffs): <a href="http://lists.whatwg.org/listinfo.cgi/commit-watchers-whatwg.org">http://lists.whatwg.org/listinfo.cgi/commit-watchers-whatwg.org</a></dd>
<dt>Browsable version-control record of all changes:</dt>
<dd>CVSWeb interface with side-by-side diffs: <a href="http://dev.w3.org/cvsweb/html5/spec/">http://dev.w3.org/cvsweb/html5/spec/</a></dd>
-Github repository <a href="https://github.com/w3c/html/commits/master">https://github.com/w3c/html/commits/master</a>
-=======
+ <dd>Github repository <a href="https://github.com/w3c/html/commits/master">https://github.com/w3c/html/commits/master</a></dd>
<dd>Annotated summary with unified diffs: <a href="http://html5.org/tools/web-apps-tracker">http://html5.org/tools/web-apps-tracker</a></dd>
<dd>Raw Subversion interface: <code>svn checkout http://svn.whatwg.org/webapps/</code></dd>
->>>>>>> parent of 2009255... Removed and edited comments and text.
</dl><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING LIST TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- status of document, group responsible (required) --><p>The W3C <a href="http://www.w3.org/html/wg/">HTML Working
Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation
Index: system-state-and-capabilities.html
===================================================================
RCS file: /sources/public/html5/spec/system-state-and-capabilities.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- system-state-and-capabilities.html 12 Sep 2012 18:44:23 -0000 1.174
+++ system-state-and-capabilities.html 12 Sep 2012 19:44:02 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="user-prompts.html">← 6.4 User prompts</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="editing.html">7 User interaction →</a>
Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec/browsers.html,v
retrieving revision 1.1262
retrieving revision 1.1263
diff -u -d -r1.1262 -r1.1263
--- browsers.html 12 Sep 2012 18:44:17 -0000 1.1262
+++ browsers.html 12 Sep 2012 19:43:57 -0000 1.1263
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="links.html">← 4.12 Links</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="history.html">5.5 Session history and navigation →</a>
Index: media-elements.html
===================================================================
RCS file: /sources/public/html5/spec/media-elements.html,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- media-elements.html 12 Sep 2012 18:44:20 -0000 1.175
+++ media-elements.html 12 Sep 2012 19:44:00 -0000 1.176
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-track-element.html">← 4.8.9 The track element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-canvas-element.html">4.8.11 The canvas element →</a>
Index: the-base-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-base-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-base-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-base-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-title-element.html">← 4.2.2 The title element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-link-element.html">4.2.4 The link element →</a>
Index: the-menu-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-menu-element.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- the-menu-element.html 12 Sep 2012 18:44:26 -0000 1.174
+++ the-menu-element.html 12 Sep 2012 19:44:05 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-command-element.html">← 4.11.3 The command element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="commands.html">4.11.5 Commands →</a>
Index: styling.html
===================================================================
RCS file: /sources/public/html5/spec/styling.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- styling.html 12 Sep 2012 18:44:22 -0000 1.173
+++ styling.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-style-element.html">← 4.2.6 The style element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="scripting-1.html">4.3 Scripting →</a>
Index: the-noscript-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-noscript-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-noscript-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-noscript-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-script-element.html">← 4.3.1 The script element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="sections.html">4.4 Sections →</a>
Index: the-code-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-code-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-code-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-code-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-time-element.html">← 4.6.10 The time element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-var-element.html">4.6.12 The var element →</a>
Index: the-command-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-command-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-command-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-command-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-summary-element.html">← 4.11.2 The summary element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-menu-element.html">4.11.4 The menu element →</a>
Index: urls.html
===================================================================
RCS file: /sources/public/html5/spec/urls.html,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- urls.html 12 Sep 2012 18:44:29 -0000 1.236
+++ urls.html 12 Sep 2012 19:44:07 -0000 1.237
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="common-microsyntaxes.html">← 2.5 Common microsyntaxes</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="common-dom-interfaces.html">2.8 Common DOM interfaces →</a>
Index: the-textarea-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-textarea-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-textarea-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-textarea-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-option-element.html">← 4.10.12 The option element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-keygen-element.html">4.10.14 The keygen element →</a>
Index: the-div-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-div-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-div-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-div-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-figcaption-element.html">← 4.5.12 The figcaption element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="text-level-semantics.html">4.6 Text-level semantics →</a>
Index: the-output-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-output-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-output-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-output-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-keygen-element.html">← 4.10.14 The keygen element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-progress-element.html">4.10.16 The progress element →</a>
Index: the-label-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-label-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-label-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-label-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-legend-element.html">← 4.10.5 The legend element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-input-element.html">4.10.7 The input element →</a>
Index: dnd.html
===================================================================
RCS file: /sources/public/html5/spec/dnd.html,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- dnd.html 12 Sep 2012 18:44:18 -0000 1.264
+++ dnd.html 12 Sep 2012 19:43:58 -0000 1.265
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="editing-apis.html">← 7.6.4 Editing APIs</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="syntax.html">8 The HTML syntax →</a>
Index: the-dl-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dl-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-dl-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-dl-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-li-element.html">← 4.5.7 The li element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-dt-element.html">4.5.9 The dt element →</a>
Index: the-select-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-select-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-select-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-select-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-button-element.html">← 4.10.8 The button element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-datalist-element.html">4.10.10 The datalist element →</a>
Index: editing-apis.html
===================================================================
RCS file: /sources/public/html5/spec/editing-apis.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- editing-apis.html 12 Sep 2012 18:44:19 -0000 1.174
+++ editing-apis.html 12 Sep 2012 19:43:58 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="editing.html">← 7 User interaction</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="dnd.html">7.7 Drag and drop →</a>
Index: dom.html
===================================================================
RCS file: /sources/public/html5/spec/dom.html,v
retrieving revision 1.1254
retrieving revision 1.1255
diff -u -d -r1.1254 -r1.1255
--- dom.html 12 Sep 2012 18:44:18 -0000 1.1254
+++ dom.html 12 Sep 2012 19:43:58 -0000 1.1255
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="namespaces.html">← 2.9 Namespaces</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="elements.html">3.2 Elements →</a>
Index: the-xhtml-syntax.html
===================================================================
RCS file: /sources/public/html5/spec/the-xhtml-syntax.html,v
retrieving revision 1.1219
retrieving revision 1.1220
diff -u -d -r1.1219 -r1.1220
--- the-xhtml-syntax.html 12 Sep 2012 18:44:29 -0000 1.1219
+++ the-xhtml-syntax.html 12 Sep 2012 19:44:07 -0000 1.1220
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="named-character-references.html">← 8.5 Named character references</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="rendering.html">10 Rendering →</a>
Index: the-colgroup-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-colgroup-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-colgroup-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-colgroup-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-caption-element.html">← 4.9.2 The caption element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-col-element.html">4.9.4 The col element →</a>
Index: attributes-common-to-ins-and-del-elements.html
===================================================================
RCS file: /sources/public/html5/spec/attributes-common-to-ins-and-del-elements.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- attributes-common-to-ins-and-del-elements.html 12 Sep 2012 18:44:17 -0000 1.173
+++ attributes-common-to-ins-and-del-elements.html 12 Sep 2012 19:43:57 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-del-element.html">← 4.7.2 The del element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="edits-and-paragraphs.html">4.7.4 Edits and paragraphs →</a>
Index: the-video-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-video-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-video-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-video-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-param-element.html">← 4.8.5 The param element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-audio-element.html">4.8.7 The audio element →</a>
Index: the-table-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-table-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-table-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-table-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="tabular-data.html">← 4.9 Tabular data</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-caption-element.html">4.9.2 The caption element →</a>
Index: the-audio-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-audio-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-audio-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-audio-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-video-element.html">← 4.8.6 The video element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-source-element.html">4.8.8 The source element →</a>
Index: edits-and-lists.html
===================================================================
RCS file: /sources/public/html5/spec/edits-and-lists.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- edits-and-lists.html 12 Sep 2012 18:44:19 -0000 1.173
+++ edits-and-lists.html 12 Sep 2012 19:43:59 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="edits-and-paragraphs.html">← 4.7.4 Edits and paragraphs</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-img-element.html">4.8.1 The img element →</a>
Index: the-pre-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-pre-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-pre-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-pre-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-hr-element.html">← 4.5.2 The hr element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-blockquote-element.html">4.5.4 The blockquote element →</a>
Index: dynamic-markup-insertion.html
===================================================================
RCS file: /sources/public/html5/spec/dynamic-markup-insertion.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- dynamic-markup-insertion.html 12 Sep 2012 18:44:19 -0000 1.174
+++ dynamic-markup-insertion.html 12 Sep 2012 19:43:58 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="interactions-with-xpath-and-xslt.html">← 3.3 Interactions with XPath and XSLT</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="semantics.html">4 The elements of HTML →</a>
Index: the-tfoot-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-tfoot-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-tfoot-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-tfoot-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-thead-element.html">← 4.9.6 The thead element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-tr-element.html">4.9.8 The tr element →</a>
Index: the-thead-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-thead-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-thead-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-thead-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-tbody-element.html">← 4.9.5 The tbody element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-tfoot-element.html">4.9.7 The tfoot element →</a>
Index: image-maps.html
===================================================================
RCS file: /sources/public/html5/spec/image-maps.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- image-maps.html 12 Sep 2012 18:44:20 -0000 1.173
+++ image-maps.html 12 Sep 2012 19:43:59 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-area-element.html">← 4.8.13 The area element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="mathml.html">4.8.15 MathML →</a>
Index: the-br-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-br-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-br-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-br-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-span-element.html">← 4.6.25 The span element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-wbr-element.html">4.6.27 The wbr element →</a>
Index: the-meta-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-meta-element.html,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- the-meta-element.html 12 Sep 2012 18:44:26 -0000 1.177
+++ the-meta-element.html 12 Sep 2012 19:44:05 -0000 1.178
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-link-element.html">← 4.2.4 The link element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-style-element.html">4.2.6 The style element →</a>
Index: the-wbr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-wbr-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-wbr-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-wbr-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-br-element.html">← 4.6.26 The br element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="usage-summary.html">4.6.28 Usage summary →</a>
Index: introduction.html
===================================================================
RCS file: /sources/public/html5/spec/introduction.html,v
retrieving revision 1.1233
retrieving revision 1.1234
diff -u -d -r1.1233 -r1.1234
--- introduction.html 12 Sep 2012 18:44:20 -0000 1.1233
+++ introduction.html 12 Sep 2012 19:44:00 -0000 1.1234
@@ -325,9 +325,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="spec.html#contents">Table of contents</a> –
<a href="infrastructure.html">2 Common infrastructure →</a>
<ol class="toc"><li><a href="introduction.html#introduction"><span class="secno">1 </span>Introduction</a>
Index: editing.html
===================================================================
RCS file: /sources/public/html5/spec/editing.html,v
retrieving revision 1.1239
retrieving revision 1.1240
diff -u -d -r1.1239 -r1.1240
--- editing.html 12 Sep 2012 18:44:19 -0000 1.1239
+++ editing.html 12 Sep 2012 19:43:58 -0000 1.1240
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="system-state-and-capabilities.html">← 6.5 System state and capabilities</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="editing-apis.html">7.6.4 Editing APIs →</a>
@@ -433,15 +432,54 @@
</div>
- <p>User Agents are encouraged to expose the full semantics of <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> elements to Assistive Technology
- when such elements are referenced from WAI-ARIA attributes such as
- <code title="attr-aria-describedby">aria-describedby</code>. However,
- because historically some User Agents have flattened hidden content
- when exposing such content to Assistive Technology, authors SHOULD NOT
- reference hidden content which would lose essential meaning when
- flattened.</p>
+ <p>Accessibility APIs are encouraged to allow a way to expose
+ structured content while marking it as hidden in the default view.
+ Such content should not be perceivable to users in the normal document
+ flow in any modality, whether using Assistive Technology or mainstream
+ User Agents.</p>
+
+ <p>When such features are available, User Agents may thus expose the
+ full semantics of <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> elements to
+ Assistive Technology when appropriate, if such content is referenced
+ indirectly by a <a href="infrastructure.html#concept-id" title="concept-id">unique identifier (ID)
+ reference</a> or <a href="common-microsyntaxes.html#valid-hash-name-reference">valid hash-name reference</a>. This
+ allows Assistive Technologies to access the content structure upon
+ user request, while keeping the content hidden in all presentations of
+ the normal document flow. Some examples of where it would be
+ appropriate for the structure of <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> elements to be exposed to users of
+ AT with such an API include:</p>
+
+ <ul><li>a <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> <code><a href="the-map-element.html#the-map-element">map</a></code>
+ element referenced from an <code><a href="the-img-element.html#the-img-element">img</a></code> element's <code title="attr-hyperlink-usemap"><a href="image-maps.html#attr-hyperlink-usemap">usemap</a></code> attribute</li>
+
+ <li><code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> table headers referenced
+ with the <code title="attr-tdth-headers"><a href="attributes-common-to-td-and-th-elements.html#attr-tdth-headers">headers</a></code>
+ attribute</li>
+ </ul><p>Cases where it would be inappropriate for the structure of <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> elements to be exposed to users of
+ AT with such an API include:</p>
+
+ <ul><li>a <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> element referenced by
+ an <code title="attr-hyperlink-href"><a href="links.html#attr-hyperlink-href">href</a></code> attribute within the
+ same document</li>
+
+ <li>a <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> form element referenced
+ by a <code><a href="the-label-element.html#the-label-element">label</a></code> element's <code title="attr-label-for"><a href="the-label-element.html#attr-label-for">for</a></code> attribute</li>
+ </ul><p class="note">The sorts of elements referenced from a
+ <code><a href="the-label-element.html#the-label-element">label</a></code> element's <code title="attr-label-for"><a href="the-label-element.html#attr-label-for">for</a></code>
+ attribute cannot be flattened without losing essential meaning (see
+ below).</p>
+
+ <p>Other specifications which define elements and attributes which may
+ be included in valid HTML documents (such as SVG, MathML, and
+ WAI-ARIA) may define how or whether this applies to their elements and
+ attributes. <a href="references.html#refsARIA">[ARIA]</a> <a href="references.html#refsMATHML">[MATHML]</a> <a href="references.html#refsSVG">[SVG]</a></p>
+
+ <p>Because historically some User Agents have flattened hidden content
+ when exposing such content to Assistive Technology, authors should not
+ reference <code title="attr-hidden"><a href="#the-hidden-attribute">hidden</a></code> content which would
+ lose essential meaning when flattened.</p>
<h3 id="inert-subtrees"><span class="secno">7.2 </span>Inert subtrees</h3>
Index: common-microsyntaxes.html
===================================================================
RCS file: /sources/public/html5/spec/common-microsyntaxes.html,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- common-microsyntaxes.html 12 Sep 2012 18:44:18 -0000 1.241
+++ common-microsyntaxes.html 12 Sep 2012 19:43:58 -0000 1.242
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="infrastructure.html">← 2 Common infrastructure</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="urls.html">2.6 URLs →</a>
Index: rendering.html
===================================================================
RCS file: /sources/public/html5/spec/rendering.html,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- rendering.html 12 Sep 2012 18:44:21 -0000 1.241
+++ rendering.html 12 Sep 2012 19:44:00 -0000 1.242
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-xhtml-syntax.html">← 9 The XHTML syntax</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="obsolete.html">11 Obsolete features →</a>
Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec/text-level-semantics.html,v
retrieving revision 1.1241
retrieving revision 1.1242
diff -u -d -r1.1241 -r1.1242
--- text-level-semantics.html 12 Sep 2012 18:44:23 -0000 1.1241
+++ text-level-semantics.html 12 Sep 2012 19:44:02 -0000 1.1242
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-div-element.html">← 4.5.13 The div element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-a-element.html">4.6.1 The a element →</a>
Index: element-definitions.html
===================================================================
RCS file: /sources/public/html5/spec/element-definitions.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- element-definitions.html 12 Sep 2012 18:44:19 -0000 1.173
+++ element-definitions.html 12 Sep 2012 19:43:59 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="global-attributes.html">← 3.2.3 Global attributes</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="content-models.html">3.2.5 Content models →</a>
Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec/infrastructure.html,v
retrieving revision 1.1300
retrieving revision 1.1301
diff -u -d -r1.1300 -r1.1301
--- infrastructure.html 12 Sep 2012 18:44:20 -0000 1.1300
+++ infrastructure.html 12 Sep 2012 19:43:59 -0000 1.1301
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="introduction.html">← 1 Introduction</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="common-microsyntaxes.html">2.5 Common microsyntaxes →</a>
Index: form-submission.html
===================================================================
RCS file: /sources/public/html5/spec/form-submission.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- form-submission.html 12 Sep 2012 18:44:19 -0000 1.173
+++ form-submission.html 12 Sep 2012 19:43:59 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="attributes-common-to-form-controls.html">← 4.10.19 Attributes common to form controls</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="textFieldSelection.html">4.10.20 APIs for the text field selections →</a>
Index: user-prompts.html
===================================================================
RCS file: /sources/public/html5/spec/user-prompts.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- user-prompts.html 12 Sep 2012 18:44:29 -0000 1.173
+++ user-prompts.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="timers.html">← 6.3 Timers</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="system-state-and-capabilities.html">6.5 System state and capabilities →</a>
Index: tabular-data.html
===================================================================
RCS file: /sources/public/html5/spec/tabular-data.html,v
retrieving revision 1.1221
retrieving revision 1.1222
diff -u -d -r1.1221 -r1.1222
--- tabular-data.html 12 Sep 2012 18:44:23 -0000 1.1221
+++ tabular-data.html 12 Sep 2012 19:44:02 -0000 1.1222
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="dimension-attributes.html">← 4.8.17 Dimension attributes</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-table-element.html">4.9.1 The table element →</a>
Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-iframe-element.html,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- the-iframe-element.html 12 Sep 2012 18:44:26 -0000 1.319
+++ the-iframe-element.html 12 Sep 2012 19:44:04 -0000 1.320
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-img-element.html">← 4.8.1 The img element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-embed-element.html">4.8.3 The embed element →</a>
Index: dimension-attributes.html
===================================================================
RCS file: /sources/public/html5/spec/dimension-attributes.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- dimension-attributes.html 12 Sep 2012 18:44:18 -0000 1.173
+++ dimension-attributes.html 12 Sep 2012 19:43:58 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="mathml.html">← 4.8.15 MathML</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="tabular-data.html">4.9 Tabular data →</a>
Index: association-of-controls-and-forms.html
===================================================================
RCS file: /sources/public/html5/spec/association-of-controls-and-forms.html,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- association-of-controls-and-forms.html 12 Sep 2012 18:44:17 -0000 1.284
+++ association-of-controls-and-forms.html 12 Sep 2012 19:43:57 -0000 1.285
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-meter-element.html">← 4.10.17 The meter element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="attributes-common-to-form-controls.html">4.10.19 Attributes common to form controls →</a>
Index: common-dom-interfaces.html
===================================================================
RCS file: /sources/public/html5/spec/common-dom-interfaces.html,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- common-dom-interfaces.html 12 Sep 2012 18:44:18 -0000 1.257
+++ common-dom-interfaces.html 12 Sep 2012 19:43:57 -0000 1.258
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="urls.html">← 2.6 URLs</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="namespaces.html">2.9 Namespaces →</a>
Index: the-strong-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-strong-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-strong-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-strong-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-em-element.html">← 4.6.2 The em element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-small-element.html">4.6.4 The small element →</a>
Index: the-form-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-form-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-form-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-form-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="forms.html">← 4.10 Forms</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-fieldset-element.html">4.10.4 The fieldset element →</a>
Index: the-li-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-li-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-li-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-li-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-ul-element.html">← 4.5.6 The ul element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-dl-element.html">4.5.8 The dl element →</a>
Index: the-keygen-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-keygen-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-keygen-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-keygen-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-textarea-element.html">← 4.10.13 The textarea element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-output-element.html">4.10.15 The output element →</a>
Index: the-link-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-link-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-link-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-link-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-base-element.html">← 4.2.3 The base element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-meta-element.html">4.2.5 The meta element →</a>
Index: the-optgroup-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-optgroup-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-optgroup-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-optgroup-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-datalist-element.html">← 4.10.10 The datalist element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-option-element.html">4.10.12 The option element →</a>
Index: the-param-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-param-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-param-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-param-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-object-element.html">← 4.8.4 The object element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-video-element.html">4.8.6 The video element →</a>
Index: the-time-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-time-element.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- the-time-element.html 12 Sep 2012 18:44:29 -0000 1.174
+++ the-time-element.html 12 Sep 2012 19:44:07 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-abbr-element.html">← 4.6.9 The abbr element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-code-element.html">4.6.11 The code element →</a>
Index: mathml.html
===================================================================
RCS file: /sources/public/html5/spec/mathml.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- mathml.html 12 Sep 2012 18:44:20 -0000 1.173
+++ mathml.html 12 Sep 2012 19:44:00 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="image-maps.html">← 4.8.14 Image maps</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="dimension-attributes.html">4.8.17 Dimension attributes →</a>
Index: the-var-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-var-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-var-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-var-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-code-element.html">← 4.6.11 The code element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-samp-element.html">4.6.13 The samp element →</a>
Index: the-th-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-th-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-th-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-th-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-td-element.html">← 4.9.9 The td element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="attributes-common-to-td-and-th-elements.html">4.9.11 Attributes common to td and th elements →</a>
Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/spec/tokenization.html,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- tokenization.html 12 Sep 2012 18:44:29 -0000 1.184
+++ tokenization.html 12 Sep 2012 19:44:07 -0000 1.185
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="parsing.html">← 8.2 Parsing HTML documents</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-end.html">8.2.6 The end →</a>
Index: requirements-relating-to-bidirectional-algorithm-formatting-characters.html
===================================================================
RCS file: /sources/public/html5/spec/requirements-relating-to-bidirectional-algorithm-formatting-characters.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- requirements-relating-to-bidirectional-algorithm-formatting-characters.html 12 Sep 2012 18:44:21 -0000 1.173
+++ requirements-relating-to-bidirectional-algorithm-formatting-characters.html 12 Sep 2012 19:44:01 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="content-models.html">← 3.2.5 Content models</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="wai-aria.html">3.2.7 WAI-ARIA →</a>
Index: the-body-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-body-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-body-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-body-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="sections.html">← 4.4 Sections</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-section-element.html">4.4.2 The section element →</a>
Index: common-input-element-attributes.html
===================================================================
RCS file: /sources/public/html5/spec/common-input-element-attributes.html,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- common-input-element-attributes.html 12 Sep 2012 18:44:18 -0000 1.239
+++ common-input-element-attributes.html 12 Sep 2012 19:43:58 -0000 1.240
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="states-of-the-type-attribute.html">← 4.10.7.1 States of the type attribute</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="common-input-element-apis.html">4.10.7.4 Common input element APIs →</a>
Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/spec/interactive-elements.html,v
retrieving revision 1.1226
retrieving revision 1.1227
diff -u -d -r1.1226 -r1.1227
--- interactive-elements.html 12 Sep 2012 18:44:20 -0000 1.1226
+++ interactive-elements.html 12 Sep 2012 19:44:00 -0000 1.1227
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="constraints.html">← 4.10.21 Constraints</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-details-element.html">4.11.1 The details element →</a>
Index: the-address-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-address-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-address-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-address-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-footer-element.html">← 4.4.9 The footer element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="headings-and-sections.html">4.4.11 Headings and sections →</a>
Index: iana.html
===================================================================
RCS file: /sources/public/html5/spec/iana.html,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -d -r1.544 -r1.545
--- iana.html 12 Sep 2012 18:44:19 -0000 1.544
+++ iana.html 12 Sep 2012 19:43:59 -0000 1.545
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="obsolete.html">← 11 Obsolete features</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="index.html">Index →</a>
Index: the-b-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-b-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-b-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-b-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-i-element.html">← 4.6.16 The i element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-u-element.html">4.6.18 The u element →</a>
Index: states-of-the-type-attribute.html
===================================================================
RCS file: /sources/public/html5/spec/states-of-the-type-attribute.html,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- states-of-the-type-attribute.html 12 Sep 2012 18:44:22 -0000 1.234
+++ states-of-the-type-attribute.html 12 Sep 2012 19:44:02 -0000 1.235
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-input-element.html">← 4.10.7 The input element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="common-input-element-attributes.html">4.10.7.3 Common input element attributes →</a>
Index: the-nav-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-nav-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-nav-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-nav-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-section-element.html">← 4.4.2 The section element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-article-element.html">4.4.4 The article element →</a>
Index: references.html
===================================================================
RCS file: /sources/public/html5/spec/references.html,v
retrieving revision 1.1249
retrieving revision 1.1250
diff -u -d -r1.1249 -r1.1250
--- references.html 12 Sep 2012 18:44:21 -0000 1.1249
+++ references.html 12 Sep 2012 19:44:00 -0000 1.1250
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="index.html">← Index</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="acknowledgements.html">Acknowledgements →</a>
Index: the-meter-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-meter-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-meter-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-meter-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-progress-element.html">← 4.10.16 The progress element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="association-of-controls-and-forms.html">4.10.18 Association of controls and forms →</a>
Index: the-ul-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ul-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-ul-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-ul-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-ol-element.html">← 4.5.5 The ol element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-li-element.html">4.5.7 The li element →</a>
Index: the-html-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-html-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-html-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-html-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="semantics.html">← 4 The elements of HTML</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-head-element.html">4.2.1 The head element →</a>
Index: index.html
===================================================================
RCS file: /sources/public/html5/spec/index.html,v
retrieving revision 1.1292
retrieving revision 1.1293
diff -u -d -r1.1292 -r1.1293
--- index.html 12 Sep 2012 18:44:20 -0000 1.1292
+++ index.html 12 Sep 2012 19:43:59 -0000 1.1293
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="iana.html">← 12 IANA considerations</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="references.html">References →</a>
Index: attributes-common-to-td-and-th-elements.html
===================================================================
RCS file: /sources/public/html5/spec/attributes-common-to-td-and-th-elements.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- attributes-common-to-td-and-th-elements.html 12 Sep 2012 18:44:17 -0000 1.173
+++ attributes-common-to-td-and-th-elements.html 12 Sep 2012 19:43:57 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-th-element.html">← 4.9.10 The th element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="examples.html">4.9.13 Examples →</a>
Index: wai-aria.html
===================================================================
RCS file: /sources/public/html5/spec/wai-aria.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- wai-aria.html 12 Sep 2012 18:44:30 -0000 1.174
+++ wai-aria.html 12 Sep 2012 19:44:07 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="requirements-relating-to-bidirectional-algorithm-formatting-characters.html">← 3.2.6 Requirements relating to bidirectional-algorithm formatting characters</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="interactions-with-xpath-and-xslt.html">3.3 Interactions with XPath and XSLT →</a>
Index: the-ruby-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ruby-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-ruby-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-ruby-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-mark-element.html">← 4.6.19 The mark element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-rt-element.html">4.6.21 The rt element →</a>
Index: the-track-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-track-element.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- the-track-element.html 12 Sep 2012 18:44:29 -0000 1.174
+++ the-track-element.html 12 Sep 2012 19:44:07 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-source-element.html">← 4.8.8 The source element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="media-elements.html">4.8.10 Media elements →</a>
Index: usage-summary.html
===================================================================
RCS file: /sources/public/html5/spec/usage-summary.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- usage-summary.html 12 Sep 2012 18:44:29 -0000 1.173
+++ usage-summary.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-wbr-element.html">← 4.6.27 The wbr element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="edits.html">4.7 Edits →</a>
Index: sections.html
===================================================================
RCS file: /sources/public/html5/spec/sections.html,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- sections.html 12 Sep 2012 18:44:22 -0000 1.239
+++ sections.html 12 Sep 2012 19:44:01 -0000 1.240
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-noscript-element.html">← 4.3.2 The noscript element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-body-element.html">4.4.1 The body element →</a>
Index: content-models.html
===================================================================
RCS file: /sources/public/html5/spec/content-models.html,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- content-models.html 12 Sep 2012 18:44:18 -0000 1.283
+++ content-models.html 12 Sep 2012 19:43:58 -0000 1.284
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="element-definitions.html">← 3.2.4 Element definitions</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="requirements-relating-to-bidirectional-algorithm-formatting-characters.html">3.2.6 Requirements relating to bidirectional-algorithm formatting characters →</a>
Index: the-progress-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-progress-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-progress-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-progress-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-output-element.html">← 4.10.15 The output element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-meter-element.html">4.10.17 The meter element →</a>
Index: the-footer-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-footer-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-footer-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-footer-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-header-element.html">← 4.4.8 The header element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-address-element.html">4.4.10 The address element →</a>
Index: interactions-with-xpath-and-xslt.html
===================================================================
RCS file: /sources/public/html5/spec/interactions-with-xpath-and-xslt.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- interactions-with-xpath-and-xslt.html 12 Sep 2012 18:44:20 -0000 1.97
+++ interactions-with-xpath-and-xslt.html 12 Sep 2012 19:43:59 -0000 1.98
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="wai-aria.html">← 3.2.7 WAI-ARIA</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="dynamic-markup-insertion.html">3.4 Dynamic markup insertion →</a>
Index: the-dd-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dd-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-dd-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-dd-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-dt-element.html">← 4.5.9 The dt element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-figure-element.html">4.5.11 The figure element →</a>
Index: the-bdo-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-bdo-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-bdo-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-bdo-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-bdi-element.html">← 4.6.23 The bdi element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-span-element.html">4.6.25 The span element →</a>
Index: the-object-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-object-element.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- the-object-element.html 12 Sep 2012 18:44:27 -0000 1.174
+++ the-object-element.html 12 Sep 2012 19:44:05 -0000 1.175
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-embed-element.html">← 4.8.3 The embed element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-param-element.html">4.8.5 The param element →</a>
Index: the-ol-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ol-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-ol-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-ol-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-blockquote-element.html">← 4.5.4 The blockquote element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-ul-element.html">4.5.6 The ul element →</a>
Index: the-area-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-area-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-area-element.html 12 Sep 2012 18:44:23 -0000 1.173
+++ the-area-element.html 12 Sep 2012 19:44:02 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-map-element.html">← 4.8.12 The map element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="image-maps.html">4.8.14 Image maps →</a>
Index: the-datalist-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-datalist-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-datalist-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-datalist-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-select-element.html">← 4.10.9 The select element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-optgroup-element.html">4.10.11 The optgroup element →</a>
Index: grouping-content.html
===================================================================
RCS file: /sources/public/html5/spec/grouping-content.html,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- grouping-content.html 12 Sep 2012 18:44:19 -0000 1.233
+++ grouping-content.html 12 Sep 2012 19:43:59 -0000 1.234
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="headings-and-sections.html">← 4.4.11 Headings and sections</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-p-element.html">4.5.1 The p element →</a>
Index: the-mark-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-mark-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-mark-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-mark-element.html 12 Sep 2012 19:44:05 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-u-element.html">← 4.6.18 The u element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-ruby-element.html">4.6.20 The ruby element →</a>
Index: the-dfn-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dfn-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-dfn-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-dfn-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-q-element.html">← 4.6.7 The q element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-abbr-element.html">4.6.9 The abbr element →</a>
Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/spec/acknowledgements.html,v
retrieving revision 1.1279
retrieving revision 1.1280
diff -u -d -r1.1279 -r1.1280
--- acknowledgements.html 12 Sep 2012 18:44:17 -0000 1.1279
+++ acknowledgements.html 12 Sep 2012 19:43:57 -0000 1.1280
@@ -325,9 +325,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="references.html">← References</a> –
<a href="spec.html#contents">Table of contents</a>
</div>
Index: the-header-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-header-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-header-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-header-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-hgroup-element.html">← 4.4.7 The hgroup element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-footer-element.html">4.4.9 The footer element →</a>
Index: elements.html
===================================================================
RCS file: /sources/public/html5/spec/elements.html,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- elements.html 12 Sep 2012 18:44:19 -0000 1.249
+++ elements.html 12 Sep 2012 19:43:59 -0000 1.250
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="dom.html">← 3 Semantics, structure, and APIs of HTML documents</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="global-attributes.html">3.2.3 Global attributes →</a>
Index: the-sub-and-sup-elements.html
===================================================================
RCS file: /sources/public/html5/spec/the-sub-and-sup-elements.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-sub-and-sup-elements.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-sub-and-sup-elements.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-kbd-element.html">← 4.6.14 The kbd element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-i-element.html">4.6.16 The i element →</a>
Index: the-i-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-i-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-i-element.html 12 Sep 2012 18:44:26 -0000 1.173
+++ the-i-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-sub-and-sup-elements.html">← 4.6.15 The sub and sup elements</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-b-element.html">4.6.17 The b element →</a>
Index: forms.html
===================================================================
RCS file: /sources/public/html5/spec/forms.html,v
retrieving revision 1.1227
retrieving revision 1.1228
diff -u -d -r1.1227 -r1.1228
--- forms.html 12 Sep 2012 18:44:19 -0000 1.1227
+++ forms.html 12 Sep 2012 19:43:59 -0000 1.1228
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="examples.html">← 4.9.13 Examples</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-form-element.html">4.10.3 The form element →</a>
Index: edits.html
===================================================================
RCS file: /sources/public/html5/spec/edits.html,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- edits.html 12 Sep 2012 18:44:19 -0000 1.218
+++ edits.html 12 Sep 2012 19:43:59 -0000 1.219
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="usage-summary.html">← 4.6.28 Usage summary</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-ins-element.html">4.7.1 The ins element →</a>
Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-canvas-element.html,v
retrieving revision 1.1098
retrieving revision 1.1099
diff -u -d -r1.1098 -r1.1099
--- the-canvas-element.html 12 Sep 2012 18:44:24 -0000 1.1098
+++ the-canvas-element.html 12 Sep 2012 19:44:03 -0000 1.1099
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="media-elements.html">← 4.8.10 Media elements</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-map-element.html">4.8.12 The map element →</a>
Index: commands.html
===================================================================
RCS file: /sources/public/html5/spec/commands.html,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- commands.html 12 Sep 2012 18:44:17 -0000 1.226
+++ commands.html 12 Sep 2012 19:43:57 -0000 1.227
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-menu-element.html">← 4.11.4 The menu element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="links.html">4.12 Links →</a>
Index: the-samp-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-samp-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-samp-element.html 12 Sep 2012 18:44:28 -0000 1.173
+++ the-samp-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-var-element.html">← 4.6.12 The var element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-kbd-element.html">4.6.14 The kbd element →</a>
Index: the-u-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-u-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-u-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-u-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-b-element.html">← 4.6.17 The b element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-mark-element.html">4.6.19 The mark element →</a>
Index: headings-and-sections.html
===================================================================
RCS file: /sources/public/html5/spec/headings-and-sections.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- headings-and-sections.html 12 Sep 2012 18:44:19 -0000 1.173
+++ headings-and-sections.html 12 Sep 2012 19:43:59 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-address-element.html">← 4.4.10 The address element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="grouping-content.html">4.5 Grouping content →</a>
Index: obsolete.html
===================================================================
RCS file: /sources/public/html5/spec/obsolete.html,v
retrieving revision 1.1234
retrieving revision 1.1235
diff -u -d -r1.1234 -r1.1235
--- obsolete.html 12 Sep 2012 18:44:21 -0000 1.1234
+++ obsolete.html 12 Sep 2012 19:44:00 -0000 1.1235
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="rendering.html">← 10 Rendering</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="iana.html">12 IANA considerations →</a>
Index: named-character-references.html
===================================================================
RCS file: /sources/public/html5/spec/named-character-references.html,v
retrieving revision 1.1192
retrieving revision 1.1193
diff -u -d -r1.1192 -r1.1193
--- named-character-references.html 12 Sep 2012 18:44:20 -0000 1.1192
+++ named-character-references.html 12 Sep 2012 19:44:00 -0000 1.1193
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-end.html">← 8.2.6 The end</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-xhtml-syntax.html">9 The XHTML syntax →</a>
Index: the-button-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-button-element.html,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- the-button-element.html 12 Sep 2012 18:44:24 -0000 1.276
+++ the-button-element.html 12 Sep 2012 19:44:03 -0000 1.277
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="common-input-element-apis.html">← 4.10.7.4 Common input element APIs</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-select-element.html">4.10.9 The select element →</a>
Index: links.html
===================================================================
RCS file: /sources/public/html5/spec/links.html,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- links.html 12 Sep 2012 18:44:20 -0000 1.278
+++ links.html 12 Sep 2012 19:44:00 -0000 1.279
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="commands.html">← 4.11.5 Commands</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="browsers.html">5 Loading Web pages →</a>
Index: the-cite-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-cite-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-cite-element.html 12 Sep 2012 18:44:24 -0000 1.173
+++ the-cite-element.html 12 Sep 2012 19:44:03 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-s-element.html">← 4.6.5 The s element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-q-element.html">4.6.7 The q element →</a>
Index: the-hgroup-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-hgroup-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-hgroup-element.html 12 Sep 2012 18:44:25 -0000 1.173
+++ the-hgroup-element.html 12 Sep 2012 19:44:04 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-aside-element.html">← 4.4.5 The aside element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-header-element.html">4.4.8 The header element →</a>
Index: common-input-element-apis.html
===================================================================
RCS file: /sources/public/html5/spec/common-input-element-apis.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- common-input-element-apis.html 12 Sep 2012 18:44:18 -0000 1.173
+++ common-input-element-apis.html 12 Sep 2012 19:43:58 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="common-input-element-attributes.html">← 4.10.7.3 Common input element attributes</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-button-element.html">4.10.8 The button element →</a>
Index: the-tr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-tr-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-tr-element.html 12 Sep 2012 18:44:29 -0000 1.173
+++ the-tr-element.html 12 Sep 2012 19:44:07 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-tfoot-element.html">← 4.9.7 The tfoot element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-td-element.html">4.9.9 The td element →</a>
Index: timers.html
===================================================================
RCS file: /sources/public/html5/spec/timers.html,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- timers.html 12 Sep 2012 18:44:29 -0000 1.244
+++ timers.html 12 Sep 2012 19:44:07 -0000 1.245
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="webappapis.html">← 6 Web application APIs</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="user-prompts.html">6.4 User prompts →</a>
Index: namespaces.html
===================================================================
RCS file: /sources/public/html5/spec/namespaces.html,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- namespaces.html 12 Sep 2012 18:44:21 -0000 1.214
+++ namespaces.html 12 Sep 2012 19:44:00 -0000 1.215
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="common-dom-interfaces.html">← 2.8 Common DOM interfaces</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="dom.html">3 Semantics, structure, and APIs of HTML documents →</a>
Index: the-rt-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-rt-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-rt-element.html 12 Sep 2012 18:44:27 -0000 1.173
+++ the-rt-element.html 12 Sep 2012 19:44:06 -0000 1.174
@@ -326,9 +326,8 @@
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
<h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
</div>
->>>>>>> parent of 04cee20... Boilerplate file updates
-
- <div class="prev_next">
+=======
+ <div class="prev_next">
<a href="the-ruby-element.html">← 4.6.20 The ruby element</a> –
<a href="spec.html#contents">Table of contents</a> –
<a href="the-rp-element.html">4.6.22 The rp element →</a>
Received on Wednesday, 12 September 2012 19:44:18 UTC