- From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 12 Sep 2012 18:44:32 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv1033
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 fb7e024d690a1b41c9bebcb19eb1e40e912807ab
Author: Jay Munro <jaymunro@microsoft.com>
Date: Wed Sep 12 11:30:12 2012 -0700
Revert "Removed and edited comments and text."
This reverts commit 2009255f523428910256a3fb78769f68d3c07294.
Conflicts:
boilerplate/middle-w3c-feedback-html
Reverting changes previously made per issue 151
Reverting these changes by mistake until issue 151 can be resolved.
Index: the-a-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-a-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-a-element.html 11 Sep 2012 14:14:28 -0000 1.173
+++ the-a-element.html 12 Sep 2012 18:44:23 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="text-level-semantics.html">← 4.6 Text-level semantics</a> –
Index: the-img-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-img-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-img-element.html 11 Sep 2012 17:44:03 -0000 1.173
+++ the-img-element.html 12 Sep 2012 18:44:26 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="edits-and-lists.html">← 4.7.5 Edits and lists</a> –
Index: the-del-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-del-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-del-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-del-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-ins-element.html">← 4.7.1 The ins element</a> –
Index: the-option-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-option-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-option-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-option-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-optgroup-element.html">← 4.10.11 The optgroup element</a> –
Index: the-figcaption-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-figcaption-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-figcaption-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-figcaption-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-figure-element.html">← 4.5.11 The figure element</a> –
Index: the-hr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-hr-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-hr-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-hr-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-p-element.html">← 4.5.1 The p element</a> –
Index: the-summary-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-summary-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-summary-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-summary-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-details-element.html">← 4.11.1 The details element</a> –
Index: the-small-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-small-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-small-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-small-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-strong-element.html">← 4.6.3 The strong element</a> –
Index: the-kbd-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-kbd-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-kbd-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-kbd-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-samp-element.html">← 4.6.13 The samp element</a> –
Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- single-page.html 11 Sep 2012 17:44:01 -0000 1.108
+++ single-page.html 12 Sep 2012 18:44:22 -0000 1.109
@@ -278,23 +278,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href=data:text/css, id=complete rel=stylesheet title="Complete specification"><link href=data:text/css,.impl%20{%20display:%20none;%20}%0Ahtml%20{%20border:%20solid%20yellow;%20}%20.domintro:before%20{%20display:%20none;%20} id=author rel="alternate stylesheet" title="Author documentation only"><link href=data:text/css,.impl%20{%20background:%20%23FFEEEE;%20}%20.domintro:before%20{%20background:%20%23FFEEEE;%20} id=highlight rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -321,7 +321,7 @@
<h1>HTML5</h1>
<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 11 September 2012</h2>
+ <h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href=http://www.w3.org/TR/html5/>http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -364,7 +364,16 @@
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
+ available in the WHATWG <a href=http://www.whatwg.org/specs/web-apps/current-work/complete.html>Web Applications 1.0</a> specification, under a license that permits
+ 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>
@@ -380,37 +389,91 @@
<!-- intro boilerplate (required) -->
- <p><em>This section describes the status of this document at the time
- of its publication. Other documents may supersede this document. A list
- of current W3C publications and the latest revision of this technical
- report can be found in the <a href=http://www.w3.org/TR/>W3C technical
- reports index</a> at http://www.w3.org/TR/.</em></p>
+ <p><em>This section describes the status of this document at the
+ time of its publication. Other documents may supersede this
+ document. A list of current W3C publications and the
+
+ most recently formally published <!-- DO NOT CHANGE THIS BACK TO THE STANDARD BOILERPLATE, AS IT IS INACCURATE -->
+
+ revision of this technical report can be found in the <a href=http://www.w3.org/TR/>W3C technical reports index</a> at
+ http://www.w3.org/TR/.</em></p>
<!-- where to send feedback (required) -->
<p>If you wish to make comments regarding this document in a manner
that is tracked by the W3C, please submit them via using <a href="http://www.w3.org/Bugs/Public/enter_bug.cgi?product=HTML%20WG">our
- public bug database</a>. </p>
+ public bug database</a>. If you do not have an account then you can
+ enter feedback using this form:</p>
+ <form action=http://www.whatwg.org/specs/web-apps/current-work/file-spam.cgi method=post>
+ <fieldset><legend>Feedback Comments</legend>
+ <input name=id type=hidden value=top><input name=component type=hidden value="HTML5 spec (editor: Ian Hickson)"><input name=response type=hidden value=html><p><label for=feedbackBox>Please enter your feedback, carefully
+ indicating the title of the section for which you are submitting
+ feedback, quoting the text that's wrong today if appropriate. If
+ you're suggesting a new feature, it's really important to say
+ <em>what</em> the problem you're trying to solve is. That's more
+ important than the solution, in fact.</label></p>
+ <p><textarea cols=79 id=feedbackBox name=text rows=10></textarea></p>
+ <p class=note>Please don't use section numbers as these tend to
+ change rapidly and make your feedback harder to understand.</p>
+ <script>
+ function checkFeedbackForm(form) {
+ if (form.elements.text.value.match(/^ *</)) {
+ alert('Please don\'t start your feedback with an angle bracket, instead explain what topic your feedback is about first.');
+ return true;
+ } else if (form.elements.text.value.match(/ [^ ]+ [^ ]+ [^ ]+ [^ ]+ /)) {
+ if (form.elements.text.value.match(/^Please enter your feedback, carefully/)) {
+ alert('Please enter your feedback, explaining what is wrong, and without repeating the instructions. Thanks!');
+ return true;
+ } else if (form.elements.text.value.match(/ [^ ]+ [^ ]+ [^ ]+ [^ ]+ /)) {
+ form.action = "http://www.whatwg.org/specs/web-apps/current-work/file-bug.cgi";
+ return true;
+ } else {
+ alert('Please include significantly more detail about exactly what problem you are trying to solve.');
+ return false;
+ }
+ }
+ }
+ </script><p>
+ <input onclick="return checkFeedbackForm(form)" type=submit value="Submit feedback"><small>(Note: Your IP address and user agent will be publicly recorded for spam prevention purposes.)</small>
+ </p>
+ </fieldset></form>
<p>If you cannot do this then you can also e-mail feedback to <a href=mailto:public-html-comments@w3.org>public-html-comments@w3.org</a>
(<a href="mailto:public-html-comments-request@w3.org?subject=subscribe">subscribe</a>,
<a href=http://lists.w3.org/Archives/Public/public-html-comments/>archives</a>),
and arrangements will be made to transpose the comments to our
- public bug database. All feedback is welcome.</p>
+ public bug database.
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING SENTENCE TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+ Alternatively, you can e-mail feedback to <a href=mailto:whatwg@whatwg.org>whatwg@whatwg.org</a> (<a href=http://lists.whatwg.org/listinfo.cgi/whatwg-whatwg.org>subscribe</a>,
+ <a href=http://lists.whatwg.org/pipermail/whatwg-whatwg.org/>archives</a>).
+ The editor guarantees that all substantive feedback sent to this
+ list will receive a reply. However, such feedback is not considered
+ formal feedback for the W3C process.
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING SENTENCE TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+ All feedback is welcome.</p>
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<p>The working groups maintains <a href="http://www.w3.org/Bugs/Public/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=exact&email1=ian%40hixie.ch&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">a
list of all bug reports that the editor has not yet tried to
address</a> and <a href=http://www.w3.org/html/wg/tracker/products/1>a list of issues
- for which the chairs have not yet declared a decision</a>. </p>
-
-
+ for which the chairs have not yet declared a decision</a>. The
+ editor also maintains <a href=http://www.whatwg.org/issues/>a list
+ of all e-mails that he has not yet tried to address</a>. These bugs,
+ issues, and e-mails apply to multiple HTML-related specifications,
+ not just this one.</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+
+
<!-- stability (required) -->
<p>Implementors should be aware that this specification is not
stable. <strong>Implementors who are not taking part in the
- discussions may find the specification changing in incompatible ways.</strong> Vendors interested in
+ discussions are likely to find the specification changing out from
+ under them in incompatible ways.</strong> Vendors interested in
implementing this specification before it eventually reaches the
Candidate Recommendation stage should join the aforementioned
mailing lists and take part in the discussions.</p>
@@ -420,26 +483,55 @@
</div>
-
+ <!-- not everyone agrees with this (requested before html5 fpwd) -->
+ <p>The publication of this document by the W3C as a W3C Working
+ Draft does not imply that all of the participants in the W3C HTML
+ working group endorse the contents of the specification. Indeed, for
+ any section of the specification, one can usually find many members
+ of the working group or of the W3C as a whole who object strongly to
+ the current text, the existence of the section at all, or the idea
+ that the working group should even spend time discussing the concept
+ of that section.</p>
+
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<!-- version history or list of changes (required) -->
<p>The latest stable version of the editor's draft of this
- specification is always available on <a href=http://dev.w3.org/html5/>the W3C CVS server</a>.</p>
-
+ specification is always available on <a href=http://dev.w3.org/html5/>the W3C CVS server</a> and in the <a href=http://svn.whatwg.org/webapps/>WHATWG Subversion
+ repository</a>. The <a href=http://www.whatwg.org/specs/web-apps/current-work/complete.html>latest
+ editor's working copy</a> (which may contain unfinished text in the
+ process of being prepared) contains the latest draft text of this
+ specification (amongst others). For more details, please see the <a href=http://wiki.whatwg.org/wiki/FAQ#What_are_the_various_versions_of_the_spec.3F>WHATWG
+ FAQ</a>.</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING LIST TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<p>There are various ways to follow the change history for the
HTML specifications:</p>
<dl><dt>E-mail notifications of changes</dt>
<dd>HTML-Diffs mailing list (diff-marked HTML versions for each change): <a href=http://lists.w3.org/Archives/Public/public-html-diffs/latest>http://lists.w3.org/Archives/Public/public-html-diffs/latest</a></dd>
+ <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>
- <dd>Github repository <a href=https://github.com/w3c/html/commits/master>https://github.com/w3c/html/commits/master</a></dd>
- </dl><!-- status of document, group responsible (required) --><p>The W3C <a href=http://www.w3.org/html/wg/>HTML Working
+Github repository <a href=https://github.com/w3c/html/commits/master>https://github.com/w3c/html/commits/master</a>
+=======
+ <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
track.
- This specification is the 11 September 2012 Editor's Draft.
+ This specification is the 12 September 2012 Editor's Draft.
</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+ <!-- relationship to other work (required) -->
+ <p>Work on this specification is also done at the <a href=http://www.whatwg.org/>WHATWG</a>. The W3C HTML working group
+ actively pursues convergence with the WHATWG, as required by the <a href=http://www.w3.org/2007/03/HTML-WG-charter>W3C HTML working
+ group charter</a>.</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
Index: the-end.html
===================================================================
RCS file: /sources/public/html5/spec/the-end.html,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- the-end.html 11 Sep 2012 14:14:30 -0000 1.168
+++ the-end.html 12 Sep 2012 18:44:25 -0000 1.169
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="tokenization.html">← 8.2.4 Tokenization</a> –
Index: parsing.html
===================================================================
RCS file: /sources/public/html5/spec/parsing.html,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- parsing.html 11 Sep 2012 14:14:26 -0000 1.178
+++ parsing.html 12 Sep 2012 18:44:21 -0000 1.179
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="syntax.html">← 8 The HTML syntax</a> –
Index: the-span-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-span-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-span-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-span-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-bdo-element.html">← 4.6.24 The bdo element</a> –
Index: the-fieldset-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-fieldset-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-fieldset-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-fieldset-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-form-element.html">← 4.10.3 The form element</a> –
Index: the-figure-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-figure-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-figure-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-figure-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-dd-element.html">← 4.5.10 The dd element</a> –
Index: the-script-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-script-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-script-element.html 11 Sep 2012 14:14:33 -0000 1.173
+++ the-script-element.html 12 Sep 2012 18:44:28 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="scripting-1.html">← 4.3 Scripting</a> –
Index: the-input-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-input-element.html,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- the-input-element.html 11 Sep 2012 15:13:42 -0000 1.234
+++ the-input-element.html 12 Sep 2012 18:44:26 -0000 1.235
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-label-element.html">← 4.10.6 The label element</a> –
Index: constraints.html
===================================================================
RCS file: /sources/public/html5/spec/constraints.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- constraints.html 11 Sep 2012 14:14:24 -0000 1.174
+++ constraints.html 12 Sep 2012 18:44:18 -0000 1.175
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="textFieldSelection.html">← 4.10.20 APIs for the text field selections</a> –
Index: the-p-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-p-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-p-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-p-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="grouping-content.html">← 4.5 Grouping content</a> –
Index: examples.html
===================================================================
RCS file: /sources/public/html5/spec/examples.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- examples.html 11 Sep 2012 14:14:25 -0000 1.172
+++ examples.html 12 Sep 2012 18:44:19 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="attributes-common-to-td-and-th-elements.html">← 4.9.11 Attributes common to td and th elements</a> –
Index: the-map-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-map-element.html,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- the-map-element.html 11 Sep 2012 14:14:31 -0000 1.233
+++ the-map-element.html 12 Sep 2012 18:44:26 -0000 1.234
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-canvas-element.html">← 4.8.11 The canvas element</a> –
Index: the-head-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-head-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-head-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-head-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-html-element.html">← 4.1.1 The html element</a> –
Index: the-s-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-s-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-s-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-s-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-small-element.html">← 4.6.4 The small element</a> –
Index: the-section-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-section-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-section-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-section-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-body-element.html">← 4.4.1 The body element</a> –
Index: the-article-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-article-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-article-element.html 11 Sep 2012 14:14:28 -0000 1.172
+++ the-article-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-nav-element.html">← 4.4.3 The nav element</a> –
Index: the-blockquote-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-blockquote-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-blockquote-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-blockquote-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-pre-element.html">← 4.5.3 The pre element</a> –
Index: the-rp-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-rp-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-rp-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-rp-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-rt-element.html">← 4.6.21 The rt element</a> –
Index: the-details-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-details-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-details-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-details-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="interactive-elements.html">← 4.11 Interactive elements</a> –
Index: the-aside-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-aside-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-aside-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-aside-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-article-element.html">← 4.4.4 The article element</a> –
Index: the-title-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-title-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-title-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-title-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-head-element.html">← 4.2.1 The head element</a> –
Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec/offline.html,v
retrieving revision 1.1229
retrieving revision 1.1230
diff -u -d -r1.1229 -r1.1230
--- offline.html 11 Sep 2012 14:14:26 -0000 1.1229
+++ offline.html 12 Sep 2012 18:44:21 -0000 1.1230
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="history.html">← 5.5 Session history and navigation</a> –
Index: textFieldSelection.html
===================================================================
RCS file: /sources/public/html5/spec/textFieldSelection.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- textFieldSelection.html 11 Sep 2012 14:14:28 -0000 1.172
+++ textFieldSelection.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="form-submission.html">← 4.10.19.6 Form submission</a> –
Index: global-attributes.html
===================================================================
RCS file: /sources/public/html5/spec/global-attributes.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- global-attributes.html 11 Sep 2012 14:14:25 -0000 1.174
+++ global-attributes.html 12 Sep 2012 18:44:19 -0000 1.175
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="elements.html">← 3.2 Elements</a> –
Index: the-bdi-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-bdi-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-bdi-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-bdi-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-rp-element.html">← 4.6.22 The rp element</a> –
Index: the-legend-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-legend-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-legend-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-legend-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-fieldset-element.html">← 4.10.4 The fieldset element</a> –
Index: the-dt-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dt-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-dt-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-dt-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-dl-element.html">← 4.5.8 The dl element</a> –
Index: history.html
===================================================================
RCS file: /sources/public/html5/spec/history.html,v
retrieving revision 1.1266
retrieving revision 1.1267
diff -u -d -r1.1266 -r1.1267
--- history.html 11 Sep 2012 14:14:25 -0000 1.1266
+++ history.html 12 Sep 2012 18:44:19 -0000 1.1267
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="browsers.html">← 5 Loading Web pages</a> –
Index: the-source-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-source-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-source-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-source-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-audio-element.html">← 4.8.7 The audio element</a> –
Index: the-embed-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-embed-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-embed-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-embed-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-iframe-element.html">← 4.8.2 The iframe element</a> –
Index: the-ins-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ins-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-ins-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-ins-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="edits.html">← 4.7 Edits</a> –
Index: the-col-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-col-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-col-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-col-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-colgroup-element.html">← 4.9.3 The colgroup element</a> –
Index: the-em-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-em-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-em-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-em-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-a-element.html">← 4.6.1 The a element</a> –
Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec/semantics.html,v
retrieving revision 1.1253
retrieving revision 1.1254
diff -u -d -r1.1253 -r1.1254
--- semantics.html 11 Sep 2012 14:14:27 -0000 1.1253
+++ semantics.html 12 Sep 2012 18:44:22 -0000 1.1254
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="dynamic-markup-insertion.html">← 3.4 Dynamic markup insertion</a> –
Index: the-q-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-q-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-q-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-q-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-cite-element.html">← 4.6.6 The cite element</a> –
Index: the-style-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-style-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-style-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-style-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-meta-element.html">← 4.2.5 The meta element</a> –
Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec/syntax.html,v
retrieving revision 1.1224
retrieving revision 1.1225
diff -u -d -r1.1224 -r1.1225
--- syntax.html 11 Sep 2012 14:14:28 -0000 1.1224
+++ syntax.html 12 Sep 2012 18:44:22 -0000 1.1225
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="dnd.html">← 7.7 Drag and drop</a> –
Index: webappapis.html
===================================================================
RCS file: /sources/public/html5/spec/webappapis.html,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -d -r1.379 -r1.380
--- webappapis.html 11 Sep 2012 14:14:35 -0000 1.379
+++ webappapis.html 12 Sep 2012 18:44:30 -0000 1.380
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="offline.html">← 5.7 Offline Web applications</a> –
Index: attributes-common-to-form-controls.html
===================================================================
RCS file: /sources/public/html5/spec/attributes-common-to-form-controls.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- attributes-common-to-form-controls.html 11 Sep 2012 14:14:23 -0000 1.172
+++ attributes-common-to-form-controls.html 12 Sep 2012 18:44:17 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="association-of-controls-and-forms.html">← 4.10.18 Association of controls and forms</a> –
Index: scripting-1.html
===================================================================
RCS file: /sources/public/html5/spec/scripting-1.html,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- scripting-1.html 11 Sep 2012 14:14:27 -0000 1.248
+++ scripting-1.html 12 Sep 2012 18:44:21 -0000 1.249
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="styling.html">← 4.2.7 Styling</a> –
Index: the-abbr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-abbr-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-abbr-element.html 11 Sep 2012 14:14:28 -0000 1.172
+++ the-abbr-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-dfn-element.html">← 4.6.8 The dfn element</a> –
Index: the-caption-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-caption-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-caption-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-caption-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-table-element.html">← 4.9.1 The table element</a> –
Index: edits-and-paragraphs.html
===================================================================
RCS file: /sources/public/html5/spec/edits-and-paragraphs.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- edits-and-paragraphs.html 11 Sep 2012 14:14:25 -0000 1.172
+++ edits-and-paragraphs.html 12 Sep 2012 18:44:19 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="attributes-common-to-ins-and-del-elements.html">← 4.7.3 Attributes common to ins and del elements</a> –
Index: the-tbody-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-tbody-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-tbody-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-tbody-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-col-element.html">← 4.9.4 The col element</a> –
Index: the-td-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-td-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-td-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-td-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-tr-element.html">← 4.9.8 The tr element</a> –
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1979
retrieving revision 1.1980
diff -u -d -r1.1979 -r1.1980
--- spec.html 11 Sep 2012 17:44:02 -0000 1.1979
+++ spec.html 12 Sep 2012 18:44:22 -0000 1.1980
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -321,7 +321,7 @@
<h1>HTML5</h1>
<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 11 September 2012</h2>
+ <h2 class="no-num no-toc" id="editor's-draft-date-1-january-1970">Editor's Draft 12 September 2012</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -364,7 +364,16 @@
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
+ available in the WHATWG <a href="http://www.whatwg.org/specs/web-apps/current-work/complete.html">Web Applications 1.0</a> specification, under a license that permits
+ 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>
@@ -380,37 +389,91 @@
<!-- intro boilerplate (required) -->
- <p><em>This section describes the status of this document at the time
- of its publication. Other documents may supersede this document. A list
- of current W3C publications and the latest revision of this technical
- report can be found in the <a href="http://www.w3.org/TR/">W3C technical
- reports index</a> at http://www.w3.org/TR/.</em></p>
+ <p><em>This section describes the status of this document at the
+ time of its publication. Other documents may supersede this
+ document. A list of current W3C publications and the
+
+ most recently formally published <!-- DO NOT CHANGE THIS BACK TO THE STANDARD BOILERPLATE, AS IT IS INACCURATE -->
+
+ revision of this technical report can be found in the <a href="http://www.w3.org/TR/">W3C technical reports index</a> at
+ http://www.w3.org/TR/.</em></p>
<!-- where to send feedback (required) -->
<p>If you wish to make comments regarding this document in a manner
that is tracked by the W3C, please submit them via using <a href="http://www.w3.org/Bugs/Public/enter_bug.cgi?product=HTML%20WG">our
- public bug database</a>. </p>
+ public bug database</a>. If you do not have an account then you can
+ enter feedback using this form:</p>
+ <form action="http://www.whatwg.org/specs/web-apps/current-work/file-spam.cgi" method="post">
+ <fieldset><legend>Feedback Comments</legend>
+ <input name="id" type="hidden" value="top"><input name="component" type="hidden" value="HTML5 spec (editor: Ian Hickson)"><input name="response" type="hidden" value="html"><p><label for="feedbackBox">Please enter your feedback, carefully
+ indicating the title of the section for which you are submitting
+ feedback, quoting the text that's wrong today if appropriate. If
+ you're suggesting a new feature, it's really important to say
+ <em>what</em> the problem you're trying to solve is. That's more
+ important than the solution, in fact.</label></p>
+ <p><textarea cols="79" id="feedbackBox" name="text" rows="10"></textarea></p>
+ <p class="note">Please don't use section numbers as these tend to
+ change rapidly and make your feedback harder to understand.</p>
+ <script>
+ function checkFeedbackForm(form) {
+ if (form.elements.text.value.match(/^ *</)) {
+ alert('Please don\'t start your feedback with an angle bracket, instead explain what topic your feedback is about first.');
+ return true;
+ } else if (form.elements.text.value.match(/ [^ ]+ [^ ]+ [^ ]+ [^ ]+ /)) {
+ if (form.elements.text.value.match(/^Please enter your feedback, carefully/)) {
+ alert('Please enter your feedback, explaining what is wrong, and without repeating the instructions. Thanks!');
+ return true;
+ } else if (form.elements.text.value.match(/ [^ ]+ [^ ]+ [^ ]+ [^ ]+ /)) {
+ form.action = "http://www.whatwg.org/specs/web-apps/current-work/file-bug.cgi";
+ return true;
+ } else {
+ alert('Please include significantly more detail about exactly what problem you are trying to solve.');
+ return false;
+ }
+ }
+ }
+ </script><p>
+ <input onclick="return checkFeedbackForm(form)" type="submit" value="Submit feedback"><small>(Note: Your IP address and user agent will be publicly recorded for spam prevention purposes.)</small>
+ </p>
+ </fieldset></form>
<p>If you cannot do this then you can also e-mail feedback to <a href="mailto:public-html-comments@w3.org">public-html-comments@w3.org</a>
(<a href="mailto:public-html-comments-request@w3.org?subject=subscribe">subscribe</a>,
<a href="http://lists.w3.org/Archives/Public/public-html-comments/">archives</a>),
and arrangements will be made to transpose the comments to our
- public bug database. All feedback is welcome.</p>
+ public bug database.
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING SENTENCE TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+ Alternatively, you can e-mail feedback to <a href="mailto:whatwg@whatwg.org">whatwg@whatwg.org</a> (<a href="http://lists.whatwg.org/listinfo.cgi/whatwg-whatwg.org">subscribe</a>,
+ <a href="http://lists.whatwg.org/pipermail/whatwg-whatwg.org/">archives</a>).
+ The editor guarantees that all substantive feedback sent to this
+ list will receive a reply. However, such feedback is not considered
+ formal feedback for the W3C process.
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING SENTENCE TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+ All feedback is welcome.</p>
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<p>The working groups maintains <a href="http://www.w3.org/Bugs/Public/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=exact&email1=ian%40hixie.ch&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">a
list of all bug reports that the editor has not yet tried to
address</a> and <a href="http://www.w3.org/html/wg/tracker/products/1">a list of issues
- for which the chairs have not yet declared a decision</a>. </p>
-
-
+ for which the chairs have not yet declared a decision</a>. The
+ editor also maintains <a href="http://www.whatwg.org/issues/">a list
+ of all e-mails that he has not yet tried to address</a>. These bugs,
+ issues, and e-mails apply to multiple HTML-related specifications,
+ not just this one.</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+
+
<!-- stability (required) -->
<p>Implementors should be aware that this specification is not
stable. <strong>Implementors who are not taking part in the
- discussions may find the specification changing in incompatible ways.</strong> Vendors interested in
+ discussions are likely to find the specification changing out from
+ under them in incompatible ways.</strong> Vendors interested in
implementing this specification before it eventually reaches the
Candidate Recommendation stage should join the aforementioned
mailing lists and take part in the discussions.</p>
@@ -420,26 +483,55 @@
</div>
-
+ <!-- not everyone agrees with this (requested before html5 fpwd) -->
+ <p>The publication of this document by the W3C as a W3C Working
+ Draft does not imply that all of the participants in the W3C HTML
+ working group endorse the contents of the specification. Indeed, for
+ any section of the specification, one can usually find many members
+ of the working group or of the W3C as a whole who object strongly to
+ the current text, the existence of the section at all, or the idea
+ that the working group should even spend time discussing the concept
+ of that section.</p>
+
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<!-- version history or list of changes (required) -->
<p>The latest stable version of the editor's draft of this
- specification is always available on <a href="http://dev.w3.org/html5/">the W3C CVS server</a>.</p>
-
+ specification is always available on <a href="http://dev.w3.org/html5/">the W3C CVS server</a> and in the <a href="http://svn.whatwg.org/webapps/">WHATWG Subversion
+ repository</a>. The <a href="http://www.whatwg.org/specs/web-apps/current-work/complete.html">latest
+ editor's working copy</a> (which may contain unfinished text in the
+ process of being prepared) contains the latest draft text of this
+ specification (amongst others). For more details, please see the <a href="http://wiki.whatwg.org/wiki/FAQ#What_are_the_various_versions_of_the_spec.3F">WHATWG
+ FAQ</a>.</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING LIST TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
<p>There are various ways to follow the change history for the
HTML specifications:</p>
<dl><dt>E-mail notifications of changes</dt>
<dd>HTML-Diffs mailing list (diff-marked HTML versions for each change): <a href="http://lists.w3.org/Archives/Public/public-html-diffs/latest">http://lists.w3.org/Archives/Public/public-html-diffs/latest</a></dd>
+ <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>
- <dd>Github repository <a href="https://github.com/w3c/html/commits/master">https://github.com/w3c/html/commits/master</a></dd>
- </dl><!-- status of document, group responsible (required) --><p>The W3C <a href="http://www.w3.org/html/wg/">HTML Working
+Github repository <a href="https://github.com/w3c/html/commits/master">https://github.com/w3c/html/commits/master</a>
+=======
+ <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
track.
- This specification is the 11 September 2012 Editor's Draft.
+ This specification is the 12 September 2012 Editor's Draft.
</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
+ <!-- relationship to other work (required) -->
+ <p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
+ actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
+ group charter</a>.</p>
+ <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST -->
Index: system-state-and-capabilities.html
===================================================================
RCS file: /sources/public/html5/spec/system-state-and-capabilities.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- system-state-and-capabilities.html 11 Sep 2012 14:14:28 -0000 1.173
+++ system-state-and-capabilities.html 12 Sep 2012 18:44:23 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="user-prompts.html">← 6.4 User prompts</a> –
Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec/browsers.html,v
retrieving revision 1.1261
retrieving revision 1.1262
diff -u -d -r1.1261 -r1.1262
--- browsers.html 11 Sep 2012 14:14:23 -0000 1.1261
+++ browsers.html 12 Sep 2012 18:44:17 -0000 1.1262
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="links.html">← 4.12 Links</a> –
Index: media-elements.html
===================================================================
RCS file: /sources/public/html5/spec/media-elements.html,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- media-elements.html 11 Sep 2012 15:13:41 -0000 1.174
+++ media-elements.html 12 Sep 2012 18:44:20 -0000 1.175
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-track-element.html">← 4.8.9 The track element</a> –
Index: the-base-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-base-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-base-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-base-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-title-element.html">← 4.2.2 The title element</a> –
Index: the-menu-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-menu-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-menu-element.html 11 Sep 2012 14:14:32 -0000 1.173
+++ the-menu-element.html 12 Sep 2012 18:44:26 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-command-element.html">← 4.11.3 The command element</a> –
Index: styling.html
===================================================================
RCS file: /sources/public/html5/spec/styling.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- styling.html 11 Sep 2012 14:14:28 -0000 1.172
+++ styling.html 12 Sep 2012 18:44:22 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-style-element.html">← 4.2.6 The style element</a> –
Index: the-noscript-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-noscript-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-noscript-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-noscript-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-script-element.html">← 4.3.1 The script element</a> –
Index: the-code-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-code-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-code-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-code-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-time-element.html">← 4.6.10 The time element</a> –
Index: the-command-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-command-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-command-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-command-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-summary-element.html">← 4.11.2 The summary element</a> –
Index: urls.html
===================================================================
RCS file: /sources/public/html5/spec/urls.html,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- urls.html 11 Sep 2012 14:14:34 -0000 1.235
+++ urls.html 12 Sep 2012 18:44:29 -0000 1.236
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="common-microsyntaxes.html">← 2.5 Common microsyntaxes</a> –
Index: the-textarea-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-textarea-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-textarea-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-textarea-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-option-element.html">← 4.10.12 The option element</a> –
Index: the-div-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-div-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-div-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-div-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-figcaption-element.html">← 4.5.12 The figcaption element</a> –
Index: the-output-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-output-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-output-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-output-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-keygen-element.html">← 4.10.14 The keygen element</a> –
Index: the-label-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-label-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-label-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-label-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-legend-element.html">← 4.10.5 The legend element</a> –
Index: dnd.html
===================================================================
RCS file: /sources/public/html5/spec/dnd.html,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- dnd.html 11 Sep 2012 14:14:24 -0000 1.263
+++ dnd.html 12 Sep 2012 18:44:18 -0000 1.264
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="editing-apis.html">← 7.6.4 Editing APIs</a> –
Index: the-dl-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dl-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-dl-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-dl-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-li-element.html">← 4.5.7 The li element</a> –
Index: the-select-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-select-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-select-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-select-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-button-element.html">← 4.10.8 The button element</a> –
Index: editing-apis.html
===================================================================
RCS file: /sources/public/html5/spec/editing-apis.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- editing-apis.html 11 Sep 2012 14:14:24 -0000 1.173
+++ editing-apis.html 12 Sep 2012 18:44:19 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="editing.html">← 7 User interaction</a> –
Index: dom.html
===================================================================
RCS file: /sources/public/html5/spec/dom.html,v
retrieving revision 1.1253
retrieving revision 1.1254
diff -u -d -r1.1253 -r1.1254
--- dom.html 11 Sep 2012 14:14:24 -0000 1.1253
+++ dom.html 12 Sep 2012 18:44:18 -0000 1.1254
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="namespaces.html">← 2.9 Namespaces</a> –
Index: the-xhtml-syntax.html
===================================================================
RCS file: /sources/public/html5/spec/the-xhtml-syntax.html,v
retrieving revision 1.1218
retrieving revision 1.1219
diff -u -d -r1.1218 -r1.1219
--- the-xhtml-syntax.html 11 Sep 2012 14:14:34 -0000 1.1218
+++ the-xhtml-syntax.html 12 Sep 2012 18:44:29 -0000 1.1219
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="named-character-references.html">← 8.5 Named character references</a> –
Index: the-colgroup-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-colgroup-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-colgroup-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-colgroup-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-caption-element.html">← 4.9.2 The caption 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.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- attributes-common-to-ins-and-del-elements.html 11 Sep 2012 14:14:23 -0000 1.172
+++ attributes-common-to-ins-and-del-elements.html 12 Sep 2012 18:44:17 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-del-element.html">← 4.7.2 The del element</a> –
Index: the-video-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-video-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-video-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-video-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-param-element.html">← 4.8.5 The param element</a> –
Index: the-table-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-table-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-table-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-table-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="tabular-data.html">← 4.9 Tabular data</a> –
Index: the-audio-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-audio-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-audio-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-audio-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-video-element.html">← 4.8.6 The video element</a> –
Index: edits-and-lists.html
===================================================================
RCS file: /sources/public/html5/spec/edits-and-lists.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- edits-and-lists.html 11 Sep 2012 14:14:25 -0000 1.172
+++ edits-and-lists.html 12 Sep 2012 18:44:19 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="edits-and-paragraphs.html">← 4.7.4 Edits and paragraphs</a> –
Index: the-pre-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-pre-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-pre-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-pre-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-hr-element.html">← 4.5.2 The hr element</a> –
Index: dynamic-markup-insertion.html
===================================================================
RCS file: /sources/public/html5/spec/dynamic-markup-insertion.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- dynamic-markup-insertion.html 11 Sep 2012 14:14:24 -0000 1.173
+++ dynamic-markup-insertion.html 12 Sep 2012 18:44:19 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="interactions-with-xpath-and-xslt.html">← 3.3 Interactions with XPath and XSLT</a> –
Index: the-tfoot-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-tfoot-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-tfoot-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-tfoot-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-thead-element.html">← 4.9.6 The thead element</a> –
Index: the-thead-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-thead-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-thead-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-thead-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-tbody-element.html">← 4.9.5 The tbody element</a> –
Index: image-maps.html
===================================================================
RCS file: /sources/public/html5/spec/image-maps.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- image-maps.html 11 Sep 2012 14:14:25 -0000 1.172
+++ image-maps.html 12 Sep 2012 18:44:20 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-area-element.html">← 4.8.13 The area element</a> –
Index: the-br-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-br-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-br-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-br-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-span-element.html">← 4.6.25 The span element</a> –
Index: the-meta-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-meta-element.html,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- the-meta-element.html 11 Sep 2012 17:44:03 -0000 1.176
+++ the-meta-element.html 12 Sep 2012 18:44:26 -0000 1.177
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-link-element.html">← 4.2.4 The link element</a> –
Index: the-wbr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-wbr-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-wbr-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-wbr-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-br-element.html">← 4.6.26 The br element</a> –
Index: introduction.html
===================================================================
RCS file: /sources/public/html5/spec/introduction.html,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -d -r1.1232 -r1.1233
--- introduction.html 11 Sep 2012 14:14:26 -0000 1.1232
+++ introduction.html 12 Sep 2012 18:44:20 -0000 1.1233
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -323,8 +323,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="spec.html#contents">Table of contents</a> –
Index: editing.html
===================================================================
RCS file: /sources/public/html5/spec/editing.html,v
retrieving revision 1.1238
retrieving revision 1.1239
diff -u -d -r1.1238 -r1.1239
--- editing.html 11 Sep 2012 14:14:24 -0000 1.1238
+++ editing.html 12 Sep 2012 18:44:19 -0000 1.1239
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="system-state-and-capabilities.html">← 6.5 System state and capabilities</a> –
Index: common-microsyntaxes.html
===================================================================
RCS file: /sources/public/html5/spec/common-microsyntaxes.html,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- common-microsyntaxes.html 11 Sep 2012 14:43:44 -0000 1.240
+++ common-microsyntaxes.html 12 Sep 2012 18:44:18 -0000 1.241
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="infrastructure.html">← 2 Common infrastructure</a> –
Index: rendering.html
===================================================================
RCS file: /sources/public/html5/spec/rendering.html,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- rendering.html 11 Sep 2012 14:14:27 -0000 1.240
+++ rendering.html 12 Sep 2012 18:44:21 -0000 1.241
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-xhtml-syntax.html">← 9 The XHTML syntax</a> –
Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec/text-level-semantics.html,v
retrieving revision 1.1240
retrieving revision 1.1241
diff -u -d -r1.1240 -r1.1241
--- text-level-semantics.html 11 Sep 2012 14:14:28 -0000 1.1240
+++ text-level-semantics.html 12 Sep 2012 18:44:23 -0000 1.1241
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-div-element.html">← 4.5.13 The div element</a> –
Index: element-definitions.html
===================================================================
RCS file: /sources/public/html5/spec/element-definitions.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- element-definitions.html 11 Sep 2012 14:14:25 -0000 1.172
+++ element-definitions.html 12 Sep 2012 18:44:19 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="global-attributes.html">← 3.2.3 Global attributes</a> –
Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec/infrastructure.html,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -d -r1.1299 -r1.1300
--- infrastructure.html 11 Sep 2012 14:14:25 -0000 1.1299
+++ infrastructure.html 12 Sep 2012 18:44:20 -0000 1.1300
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="introduction.html">← 1 Introduction</a> –
Index: form-submission.html
===================================================================
RCS file: /sources/public/html5/spec/form-submission.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- form-submission.html 11 Sep 2012 14:14:25 -0000 1.172
+++ form-submission.html 12 Sep 2012 18:44:19 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="attributes-common-to-form-controls.html">← 4.10.19 Attributes common to form controls</a> –
Index: user-prompts.html
===================================================================
RCS file: /sources/public/html5/spec/user-prompts.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- user-prompts.html 11 Sep 2012 14:14:35 -0000 1.172
+++ user-prompts.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="timers.html">← 6.3 Timers</a> –
Index: tabular-data.html
===================================================================
RCS file: /sources/public/html5/spec/tabular-data.html,v
retrieving revision 1.1220
retrieving revision 1.1221
diff -u -d -r1.1220 -r1.1221
--- tabular-data.html 11 Sep 2012 14:14:28 -0000 1.1220
+++ tabular-data.html 12 Sep 2012 18:44:23 -0000 1.1221
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="dimension-attributes.html">← 4.8.17 Dimension attributes</a> –
Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-iframe-element.html,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- the-iframe-element.html 11 Sep 2012 14:14:31 -0000 1.318
+++ the-iframe-element.html 12 Sep 2012 18:44:26 -0000 1.319
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-img-element.html">← 4.8.1 The img element</a> –
Index: dimension-attributes.html
===================================================================
RCS file: /sources/public/html5/spec/dimension-attributes.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- dimension-attributes.html 11 Sep 2012 14:14:24 -0000 1.172
+++ dimension-attributes.html 12 Sep 2012 18:44:18 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="mathml.html">← 4.8.15 MathML</a> –
Index: association-of-controls-and-forms.html
===================================================================
RCS file: /sources/public/html5/spec/association-of-controls-and-forms.html,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- association-of-controls-and-forms.html 11 Sep 2012 14:14:23 -0000 1.283
+++ association-of-controls-and-forms.html 12 Sep 2012 18:44:17 -0000 1.284
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-meter-element.html">← 4.10.17 The meter element</a> –
Index: common-dom-interfaces.html
===================================================================
RCS file: /sources/public/html5/spec/common-dom-interfaces.html,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- common-dom-interfaces.html 11 Sep 2012 14:14:24 -0000 1.256
+++ common-dom-interfaces.html 12 Sep 2012 18:44:18 -0000 1.257
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="urls.html">← 2.6 URLs</a> –
Index: the-strong-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-strong-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-strong-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-strong-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-em-element.html">← 4.6.2 The em element</a> –
Index: the-form-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-form-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-form-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-form-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="forms.html">← 4.10 Forms</a> –
Index: the-li-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-li-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-li-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-li-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-ul-element.html">← 4.5.6 The ul element</a> –
Index: the-keygen-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-keygen-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-keygen-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-keygen-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-textarea-element.html">← 4.10.13 The textarea element</a> –
Index: the-link-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-link-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-link-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-link-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-base-element.html">← 4.2.3 The base element</a> –
Index: the-optgroup-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-optgroup-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-optgroup-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-optgroup-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-datalist-element.html">← 4.10.10 The datalist element</a> –
Index: the-param-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-param-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-param-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-param-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-object-element.html">← 4.8.4 The object element</a> –
Index: the-time-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-time-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-time-element.html 11 Sep 2012 14:14:34 -0000 1.173
+++ the-time-element.html 12 Sep 2012 18:44:29 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-abbr-element.html">← 4.6.9 The abbr element</a> –
Index: mathml.html
===================================================================
RCS file: /sources/public/html5/spec/mathml.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- mathml.html 11 Sep 2012 14:14:26 -0000 1.172
+++ mathml.html 12 Sep 2012 18:44:20 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="image-maps.html">← 4.8.14 Image maps</a> –
Index: the-var-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-var-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-var-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-var-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-code-element.html">← 4.6.11 The code element</a> –
Index: the-th-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-th-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-th-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-th-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-td-element.html">← 4.9.9 The td element</a> –
Index: tokenization.html
===================================================================
RCS file: /sources/public/html5/spec/tokenization.html,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- tokenization.html 11 Sep 2012 14:14:34 -0000 1.183
+++ tokenization.html 12 Sep 2012 18:44:29 -0000 1.184
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="parsing.html">← 8.2 Parsing HTML documents</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.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- requirements-relating-to-bidirectional-algorithm-formatting-characters.html 11 Sep 2012 14:14:27 -0000 1.172
+++ requirements-relating-to-bidirectional-algorithm-formatting-characters.html 12 Sep 2012 18:44:21 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="content-models.html">← 3.2.5 Content models</a> –
Index: the-body-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-body-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-body-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-body-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="sections.html">← 4.4 Sections</a> –
Index: common-input-element-attributes.html
===================================================================
RCS file: /sources/public/html5/spec/common-input-element-attributes.html,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- common-input-element-attributes.html 11 Sep 2012 14:14:24 -0000 1.238
+++ common-input-element-attributes.html 12 Sep 2012 18:44:18 -0000 1.239
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="states-of-the-type-attribute.html">← 4.10.7.1 States of the type attribute</a> –
Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/spec/interactive-elements.html,v
retrieving revision 1.1225
retrieving revision 1.1226
diff -u -d -r1.1225 -r1.1226
--- interactive-elements.html 11 Sep 2012 14:14:26 -0000 1.1225
+++ interactive-elements.html 12 Sep 2012 18:44:20 -0000 1.1226
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="constraints.html">← 4.10.21 Constraints</a> –
Index: the-address-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-address-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-address-element.html 11 Sep 2012 14:14:28 -0000 1.172
+++ the-address-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-footer-element.html">← 4.4.9 The footer element</a> –
Index: iana.html
===================================================================
RCS file: /sources/public/html5/spec/iana.html,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -d -r1.543 -r1.544
--- iana.html 11 Sep 2012 14:14:25 -0000 1.543
+++ iana.html 12 Sep 2012 18:44:19 -0000 1.544
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="obsolete.html">← 11 Obsolete features</a> –
Index: the-b-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-b-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-b-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-b-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-i-element.html">← 4.6.16 The i 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.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- states-of-the-type-attribute.html 11 Sep 2012 14:14:28 -0000 1.233
+++ states-of-the-type-attribute.html 12 Sep 2012 18:44:22 -0000 1.234
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-input-element.html">← 4.10.7 The input element</a> –
Index: the-nav-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-nav-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-nav-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-nav-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-section-element.html">← 4.4.2 The section element</a> –
Index: references.html
===================================================================
RCS file: /sources/public/html5/spec/references.html,v
retrieving revision 1.1248
retrieving revision 1.1249
diff -u -d -r1.1248 -r1.1249
--- references.html 11 Sep 2012 14:14:26 -0000 1.1248
+++ references.html 12 Sep 2012 18:44:21 -0000 1.1249
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="index.html">← Index</a> –
Index: the-meter-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-meter-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-meter-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-meter-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-progress-element.html">← 4.10.16 The progress element</a> –
Index: the-ul-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ul-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-ul-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-ul-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-ol-element.html">← 4.5.5 The ol element</a> –
Index: the-html-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-html-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-html-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-html-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="semantics.html">← 4 The elements of HTML</a> –
Index: index.html
===================================================================
RCS file: /sources/public/html5/spec/index.html,v
retrieving revision 1.1291
retrieving revision 1.1292
diff -u -d -r1.1291 -r1.1292
--- index.html 11 Sep 2012 14:14:25 -0000 1.1291
+++ index.html 12 Sep 2012 18:44:20 -0000 1.1292
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="iana.html">← 12 IANA considerations</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.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- attributes-common-to-td-and-th-elements.html 11 Sep 2012 14:14:23 -0000 1.172
+++ attributes-common-to-td-and-th-elements.html 12 Sep 2012 18:44:17 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-th-element.html">← 4.9.10 The th element</a> –
Index: wai-aria.html
===================================================================
RCS file: /sources/public/html5/spec/wai-aria.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- wai-aria.html 11 Sep 2012 14:14:35 -0000 1.173
+++ wai-aria.html 12 Sep 2012 18:44:30 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="requirements-relating-to-bidirectional-algorithm-formatting-characters.html">← 3.2.6 Requirements relating to bidirectional-algorithm formatting characters</a> –
Index: the-ruby-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ruby-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-ruby-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-ruby-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-mark-element.html">← 4.6.19 The mark element</a> –
Index: the-track-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-track-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-track-element.html 11 Sep 2012 14:14:34 -0000 1.173
+++ the-track-element.html 12 Sep 2012 18:44:29 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-source-element.html">← 4.8.8 The source element</a> –
Index: usage-summary.html
===================================================================
RCS file: /sources/public/html5/spec/usage-summary.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- usage-summary.html 11 Sep 2012 14:14:35 -0000 1.172
+++ usage-summary.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-wbr-element.html">← 4.6.27 The wbr element</a> –
Index: sections.html
===================================================================
RCS file: /sources/public/html5/spec/sections.html,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- sections.html 11 Sep 2012 14:14:27 -0000 1.238
+++ sections.html 12 Sep 2012 18:44:22 -0000 1.239
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-noscript-element.html">← 4.3.2 The noscript element</a> –
Index: content-models.html
===================================================================
RCS file: /sources/public/html5/spec/content-models.html,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- content-models.html 11 Sep 2012 14:14:24 -0000 1.282
+++ content-models.html 12 Sep 2012 18:44:18 -0000 1.283
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="element-definitions.html">← 3.2.4 Element definitions</a> –
Index: the-progress-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-progress-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-progress-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-progress-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-output-element.html">← 4.10.15 The output element</a> –
Index: the-footer-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-footer-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-footer-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-footer-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-header-element.html">← 4.4.8 The header 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.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- interactions-with-xpath-and-xslt.html 11 Sep 2012 14:14:25 -0000 1.96
+++ interactions-with-xpath-and-xslt.html 12 Sep 2012 18:44:20 -0000 1.97
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="wai-aria.html">← 3.2.7 WAI-ARIA</a> –
Index: the-dd-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dd-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-dd-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-dd-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-dt-element.html">← 4.5.9 The dt element</a> –
Index: the-bdo-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-bdo-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-bdo-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-bdo-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-bdi-element.html">← 4.6.23 The bdi element</a> –
Index: the-object-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-object-element.html,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- the-object-element.html 11 Sep 2012 14:14:32 -0000 1.173
+++ the-object-element.html 12 Sep 2012 18:44:27 -0000 1.174
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-embed-element.html">← 4.8.3 The embed element</a> –
Index: the-ol-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-ol-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-ol-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-ol-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-blockquote-element.html">← 4.5.4 The blockquote element</a> –
Index: the-area-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-area-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-area-element.html 11 Sep 2012 14:14:28 -0000 1.172
+++ the-area-element.html 12 Sep 2012 18:44:23 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-map-element.html">← 4.8.12 The map element</a> –
Index: the-datalist-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-datalist-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-datalist-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-datalist-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-select-element.html">← 4.10.9 The select element</a> –
Index: grouping-content.html
===================================================================
RCS file: /sources/public/html5/spec/grouping-content.html,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- grouping-content.html 11 Sep 2012 14:14:25 -0000 1.232
+++ grouping-content.html 12 Sep 2012 18:44:19 -0000 1.233
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="headings-and-sections.html">← 4.4.11 Headings and sections</a> –
Index: the-mark-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-mark-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-mark-element.html 11 Sep 2012 14:14:32 -0000 1.172
+++ the-mark-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-u-element.html">← 4.6.18 The u element</a> –
Index: the-dfn-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-dfn-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-dfn-element.html 11 Sep 2012 14:14:30 -0000 1.172
+++ the-dfn-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-q-element.html">← 4.6.7 The q element</a> –
Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/spec/acknowledgements.html,v
retrieving revision 1.1278
retrieving revision 1.1279
diff -u -d -r1.1278 -r1.1279
--- acknowledgements.html 11 Sep 2012 14:14:23 -0000 1.1278
+++ acknowledgements.html 12 Sep 2012 18:44:17 -0000 1.1279
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -323,8 +323,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="references.html">← References</a> –
Index: the-header-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-header-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-header-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-header-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-hgroup-element.html">← 4.4.7 The hgroup element</a> –
Index: elements.html
===================================================================
RCS file: /sources/public/html5/spec/elements.html,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- elements.html 11 Sep 2012 14:14:25 -0000 1.248
+++ elements.html 12 Sep 2012 18:44:19 -0000 1.249
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="dom.html">← 3 Semantics, structure, and APIs of HTML documents</a> –
Index: the-sub-and-sup-elements.html
===================================================================
RCS file: /sources/public/html5/spec/the-sub-and-sup-elements.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-sub-and-sup-elements.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-sub-and-sup-elements.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-kbd-element.html">← 4.6.14 The kbd element</a> –
Index: the-i-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-i-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-i-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-i-element.html 12 Sep 2012 18:44:26 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-sub-and-sup-elements.html">← 4.6.15 The sub and sup elements</a> –
Index: forms.html
===================================================================
RCS file: /sources/public/html5/spec/forms.html,v
retrieving revision 1.1226
retrieving revision 1.1227
diff -u -d -r1.1226 -r1.1227
--- forms.html 11 Sep 2012 14:14:25 -0000 1.1226
+++ forms.html 12 Sep 2012 18:44:19 -0000 1.1227
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="examples.html">← 4.9.13 Examples</a> –
Index: edits.html
===================================================================
RCS file: /sources/public/html5/spec/edits.html,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- edits.html 11 Sep 2012 14:14:25 -0000 1.217
+++ edits.html 12 Sep 2012 18:44:19 -0000 1.218
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="usage-summary.html">← 4.6.28 Usage summary</a> –
Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-canvas-element.html,v
retrieving revision 1.1097
retrieving revision 1.1098
diff -u -d -r1.1097 -r1.1098
--- the-canvas-element.html 11 Sep 2012 14:14:29 -0000 1.1097
+++ the-canvas-element.html 12 Sep 2012 18:44:24 -0000 1.1098
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="media-elements.html">← 4.8.10 Media elements</a> –
Index: commands.html
===================================================================
RCS file: /sources/public/html5/spec/commands.html,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- commands.html 11 Sep 2012 14:14:24 -0000 1.225
+++ commands.html 12 Sep 2012 18:44:17 -0000 1.226
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-menu-element.html">← 4.11.4 The menu element</a> –
Index: the-samp-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-samp-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-samp-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-samp-element.html 12 Sep 2012 18:44:28 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-var-element.html">← 4.6.12 The var element</a> –
Index: the-u-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-u-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-u-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-u-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-b-element.html">← 4.6.17 The b element</a> –
Index: headings-and-sections.html
===================================================================
RCS file: /sources/public/html5/spec/headings-and-sections.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- headings-and-sections.html 11 Sep 2012 14:14:25 -0000 1.172
+++ headings-and-sections.html 12 Sep 2012 18:44:19 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-address-element.html">← 4.4.10 The address element</a> –
Index: obsolete.html
===================================================================
RCS file: /sources/public/html5/spec/obsolete.html,v
retrieving revision 1.1233
retrieving revision 1.1234
diff -u -d -r1.1233 -r1.1234
--- obsolete.html 11 Sep 2012 14:14:26 -0000 1.1233
+++ obsolete.html 12 Sep 2012 18:44:21 -0000 1.1234
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="rendering.html">← 10 Rendering</a> –
Index: named-character-references.html
===================================================================
RCS file: /sources/public/html5/spec/named-character-references.html,v
retrieving revision 1.1191
retrieving revision 1.1192
diff -u -d -r1.1191 -r1.1192
--- named-character-references.html 11 Sep 2012 14:14:26 -0000 1.1191
+++ named-character-references.html 12 Sep 2012 18:44:20 -0000 1.1192
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-end.html">← 8.2.6 The end</a> –
Index: the-button-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-button-element.html,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- the-button-element.html 11 Sep 2012 14:14:29 -0000 1.275
+++ the-button-element.html 12 Sep 2012 18:44:24 -0000 1.276
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="common-input-element-apis.html">← 4.10.7.4 Common input element APIs</a> –
Index: links.html
===================================================================
RCS file: /sources/public/html5/spec/links.html,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- links.html 11 Sep 2012 14:14:26 -0000 1.277
+++ links.html 12 Sep 2012 18:44:20 -0000 1.278
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="commands.html">← 4.11.5 Commands</a> –
Index: the-cite-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-cite-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-cite-element.html 11 Sep 2012 14:14:29 -0000 1.172
+++ the-cite-element.html 12 Sep 2012 18:44:24 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-s-element.html">← 4.6.5 The s element</a> –
Index: the-hgroup-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-hgroup-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-hgroup-element.html 11 Sep 2012 14:14:31 -0000 1.172
+++ the-hgroup-element.html 12 Sep 2012 18:44:25 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-aside-element.html">← 4.4.5 The aside element</a> –
Index: common-input-element-apis.html
===================================================================
RCS file: /sources/public/html5/spec/common-input-element-apis.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- common-input-element-apis.html 11 Sep 2012 14:14:24 -0000 1.172
+++ common-input-element-apis.html 12 Sep 2012 18:44:18 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="common-input-element-attributes.html">← 4.10.7.3 Common input element attributes</a> –
Index: the-tr-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-tr-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-tr-element.html 11 Sep 2012 14:14:34 -0000 1.172
+++ the-tr-element.html 12 Sep 2012 18:44:29 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-tfoot-element.html">← 4.9.7 The tfoot element</a> –
Index: timers.html
===================================================================
RCS file: /sources/public/html5/spec/timers.html,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- timers.html 11 Sep 2012 14:14:34 -0000 1.243
+++ timers.html 12 Sep 2012 18:44:29 -0000 1.244
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="webappapis.html">← 6 Web application APIs</a> –
Index: namespaces.html
===================================================================
RCS file: /sources/public/html5/spec/namespaces.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- namespaces.html 11 Sep 2012 14:14:26 -0000 1.213
+++ namespaces.html 12 Sep 2012 18:44:21 -0000 1.214
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="common-dom-interfaces.html">← 2.8 Common DOM interfaces</a> –
Index: the-rt-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-rt-element.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- the-rt-element.html 11 Sep 2012 14:14:33 -0000 1.172
+++ the-rt-element.html 12 Sep 2012 18:44:27 -0000 1.173
@@ -279,23 +279,23 @@
@font-face {
font-family: 'Essays1743';
- src: url('../fonts/Essays1743.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743.ttf');
}
@font-face {
font-family: 'Essays1743';
font-weight: bold;
- src: url('../fonts/Essays1743-Bold.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Bold.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
- src: url('../fonts/Essays1743-Italic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-Italic.ttf');
}
@font-face {
font-family: 'Essays1743';
font-style: italic;
font-weight: bold;
- src: url('../fonts/Essays1743-BoldItalic.ttf');
+ src: url('http://www.whatwg.org/specs/web-apps/current-work/fonts/Essays1743-BoldItalic.ttf');
}
</style><link href="data:text/css," id="complete" rel="stylesheet" title="Complete specification"><link href="data:text/css,.impl%20%7B%20display:%20none;%20%7D%0Ahtml%20%7B%20border:%20solid%20yellow;%20%7D%20.domintro:before%20%7B%20display:%20none;%20%7D" id="author" rel="alternate stylesheet" title="Author documentation only"><link href="data:text/css,.impl%20%7B%20background:%20%23FFEEEE;%20%7D%20.domintro:before%20%7B%20background:%20%23FFEEEE;%20%7D" id="highlight" rel="alternate stylesheet" title="Highlight implementation requirements"><script>
@@ -324,8 +324,9 @@
<h1>HTML5</h1>
<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 11 September 2012</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">
<a href="the-ruby-element.html">← 4.6.20 The ruby element</a> –
Received on Wednesday, 12 September 2012 18:44:50 UTC