- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 28 Oct 2011 20:47:17 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv31798
Modified Files:
browsers.html common-dom-interfaces.html edits.html links.html
spec.html syntax.html text-level-semantics.html
the-button-element.html the-canvas-element.html
the-iframe-element.html
Log Message:
grammar (whatwg r6778)
[updated by splitter]
Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec/text-level-semantics.html,v
retrieving revision 1.1060
retrieving revision 1.1061
diff -u -d -r1.1060 -r1.1061
--- text-level-semantics.html 13 Oct 2011 00:46:36 -0000 1.1060
+++ text-level-semantics.html 28 Oct 2011 20:47:12 -0000 1.1061
@@ -1015,7 +1015,7 @@
<li>Abbreviations that are likely to be unfamiliar to the
document's readers, for which authors are encouraged to either mark
- up the abbreviation using a <code><a href="#the-abbr-element">abbr</a></code> element with a <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute or include the expansion
+ up the abbreviation using an <code><a href="#the-abbr-element">abbr</a></code> element with a <code title="attr-title"><a href="elements.html#the-title-attribute">title</a></code> attribute or include the expansion
inline in the text the first time the abbreviation is used.</li>
<li>Abbreviations whose presence needs to be semantically
Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-canvas-element.html,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -d -r1.920 -r1.921
--- the-canvas-element.html 5 Oct 2011 23:46:32 -0000 1.920
+++ the-canvas-element.html 28 Oct 2011 20:47:13 -0000 1.921
@@ -744,9 +744,9 @@
<ul><li><p>The element's 2D context's <code title="dom-context-2d-drawImage">drawImage()</code> method is
called with an <code><a href="embedded-content-1.html#htmlimageelement">HTMLImageElement</a></code> or an
<code><a href="the-iframe-element.html#htmlvideoelement">HTMLVideoElement</a></code> whose <a href="origin-0.html#origin">origin</a> is not the
- <a href="origin-0.html#same-origin" title="same origin">same</a> as that of the
- <code><a href="infrastructure.html#document">Document</a></code> object that owns the <code><a href="#the-canvas-element">canvas</a></code>
- element.</p></li>
+ <a href="origin-0.html#same-origin" title="same origin">same</a> as the <span>effective
+ origin</span> of the <code><a href="infrastructure.html#document">Document</a></code> object that owns the
+ <code><a href="#the-canvas-element">canvas</a></code> element.</p></li>
<li><p>The element's 2D context's <code title="dom-context-2d-drawImage">drawImage()</code> method is
called with an <code><a href="#htmlcanvaselement">HTMLCanvasElement</a></code> whose
@@ -756,9 +756,9 @@
to a <code>CanvasPattern</code> object that was created from an
<code><a href="embedded-content-1.html#htmlimageelement">HTMLImageElement</a></code> or an <code><a href="the-iframe-element.html#htmlvideoelement">HTMLVideoElement</a></code>
whose <a href="origin-0.html#origin">origin</a> was not the <a href="origin-0.html#same-origin" title="same
- origin">same</a> as that of the <code><a href="infrastructure.html#document">Document</a></code> object
- that owns the <code><a href="#the-canvas-element">canvas</a></code> element when the pattern was
- created.</p></li>
+ origin">same</a> as the <span>effective origin</span> of the
+ <code><a href="infrastructure.html#document">Document</a></code> object that owns the <code><a href="#the-canvas-element">canvas</a></code>
+ element when the pattern was created.</p></li>
<li><p>The element's 2D context's <code title="dom-context-2d-fillStyle">fillStyle</code> attribute is set
to a <code>CanvasPattern</code> object that was created from an
@@ -769,9 +769,9 @@
set to a <code>CanvasPattern</code> object that was created from an
<code><a href="embedded-content-1.html#htmlimageelement">HTMLImageElement</a></code> or an <code><a href="the-iframe-element.html#htmlvideoelement">HTMLVideoElement</a></code>
whose <a href="origin-0.html#origin">origin</a> was not the <a href="origin-0.html#same-origin" title="same
- origin">same</a> as that of the <code><a href="infrastructure.html#document">Document</a></code> object
- that owns the <code><a href="#the-canvas-element">canvas</a></code> element when the pattern was
- created.</p></li>
+ origin">same</a> as the <span>effective origin</span> of the
+ <code><a href="infrastructure.html#document">Document</a></code> object that owns the <code><a href="#the-canvas-element">canvas</a></code>
+ element when the pattern was created.</p></li>
<li><p>The element's 2D context's <code title="dom-context-2d-strokeStyle">strokeStyle</code> attribute is
set to a <code>CanvasPattern</code> object that was created from an
@@ -780,11 +780,11 @@
<li><p>The element's 2D context's <code title="dom-context-2d-fillText">fillText()</code> or <code title="dom-context-2d-fillText">strokeText()</code> methods are
invoked and consider using a font that has an <a href="origin-0.html#origin">origin</a>
- that is not the <a href="origin-0.html#same-origin" title="same origin">same</a> as that of
- the <code><a href="infrastructure.html#document">Document</a></code> object that owns the <code><a href="#the-canvas-element">canvas</a></code>
- element. (The font doesn't even have to be used; all that matters
- is whether the font was considered for any of the glyphs
- drawn.)</p></li>
+ that is not the <a href="origin-0.html#same-origin" title="same origin">same</a> as the
+ <span>effective origin</span> of the <code><a href="infrastructure.html#document">Document</a></code> object
+ that owns the <code><a href="#the-canvas-element">canvas</a></code> element. (The font doesn't even
+ have to be used; all that matters is whether the font was
+ considered for any of the glyphs drawn.)</p></li>
</ul><p>Whenever the <code title="dom-canvas-toDataURL"><a href="#dom-canvas-todataurl">toDataURL()</a></code> method of a
<code><a href="#the-canvas-element">canvas</a></code> element whose <i>origin-clean</i> flag is set to
false is called, the method must throw a <code><a href="infrastructure.html#securityerror">SecurityError</a></code>
@@ -799,9 +799,10 @@
<p>Whenever the <code title="dom-context-2d-measureText">measureText()</code> method of
the 2D context of a <code><a href="#the-canvas-element">canvas</a></code> element ends up using a font
that has an <a href="origin-0.html#origin">origin</a> that is not the <a href="origin-0.html#same-origin" title="same
- origin">same</a> as that of the <code><a href="infrastructure.html#document">Document</a></code> object that
- owns the <code><a href="#the-canvas-element">canvas</a></code> element, the method must throw a
- <code><a href="infrastructure.html#securityerror">SecurityError</a></code> exception.</p>
+ origin">same</a> as the <span>effective origin</span> of the
+ <code><a href="infrastructure.html#document">Document</a></code> object that owns the <code><a href="#the-canvas-element">canvas</a></code>
+ element, the method must throw a <code><a href="infrastructure.html#securityerror">SecurityError</a></code>
+ exception.</p>
<p class="note">Even resetting the canvas state by changing its
<code title="attr-canvas-width"><a href="#attr-canvas-width">width</a></code> or <code title="attr-canvas-height"><a href="#attr-canvas-height">height</a></code> attributes doesn't reset
Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-iframe-element.html,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- the-iframe-element.html 27 Oct 2011 20:46:58 -0000 1.141
+++ the-iframe-element.html 28 Oct 2011 20:47:13 -0000 1.142
@@ -886,10 +886,11 @@
have the <code title="attr-iframe-sandbox-allow-forms"><a href="#attr-iframe-sandbox-allow-forms">allow-forms</a></code> keyword
set.</p>
- <p>Suppose now that a script in A removes all the <code title="attr-iframe-sandbox"><a href="#attr-iframe-sandbox">sandbox</a></code> attributes in A and
- B. This would change nothing immediately. If the user clicked the
- link in C, loading page D into the <code><a href="#the-iframe-element">iframe</a></code> in B, page D
- would now act as if the <code><a href="#the-iframe-element">iframe</a></code> in B had the <code title="attr-iframe-sandbox-allow-same-origin"><a href="#attr-iframe-sandbox-allow-same-origin">allow-same-origin</a></code>
+ <p>Suppose now that a script in A removes all the <code title="attr-iframe-sandbox"><a href="#attr-iframe-sandbox">sandbox</a></code> attributes in A
+ and B. This would change nothing
+ immediately. If the user clicked the link in C, loading page D into
+ the <code><a href="#the-iframe-element">iframe</a></code> in B, page D would now act as if the
+ <code><a href="#the-iframe-element">iframe</a></code> in B had the <code title="attr-iframe-sandbox-allow-same-origin"><a href="#attr-iframe-sandbox-allow-same-origin">allow-same-origin</a></code>
and <code title="attr-iframe-sandbox-allow-forms"><a href="#attr-iframe-sandbox-allow-forms">allow-forms</a></code> keywords
set, because that was the state of the <a href="browsers.html#nested-browsing-context">nested browsing
context</a> in the <code><a href="#the-iframe-element">iframe</a></code> in A when page B was
@@ -3573,7 +3574,7 @@
<dd>
- <ol><li><p>Create a <code><a href="#audiotrack">AudioTrack</a></code> object to represent the
+ <ol><li><p>Create an <code><a href="#audiotrack">AudioTrack</a></code> object to represent the
audio track.</p></li>
<li><p>Update the <a href="#media-element">media element</a>'s <code title="dom-media-audioTracks"><a href="#dom-media-audiotracks">audioTracks</a></code> attribute's
@@ -5534,7 +5535,7 @@
<code><a href="#audiotracklist">AudioTrackList</a></code> and <code><a href="#videotracklist">VideoTrackList</a></code> objects
at any instant are the numbers from zero to the number of tracks
represented by the respective object minus one, if any tracks are
- represented. If a <code><a href="#audiotracklist">AudioTrackList</a></code> or
+ represented. If an <code><a href="#audiotracklist">AudioTrackList</a></code> or
<code><a href="#videotracklist">VideoTrackList</a></code> object represents no tracks, it has no
<a href="infrastructure.html#supported-property-indices">supported property indices</a>.</p>
Index: common-dom-interfaces.html
===================================================================
RCS file: /sources/public/html5/spec/common-dom-interfaces.html,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- common-dom-interfaces.html 19 Oct 2011 01:46:25 -0000 1.82
+++ common-dom-interfaces.html 28 Oct 2011 20:46:52 -0000 1.83
@@ -1011,7 +1011,7 @@
clone</dfn> of a value, optionally with a <i>transfer map</i>, it
must run the following algorithm, which either returns a separate
value, or throws an exception. If a <i>transfer map</i> is provided,
- it consists of a association list of <code><a href="#transferable">Transferable</a></code>
+ it consists of an association list of <code><a href="#transferable">Transferable</a></code>
objects to placeholder objects.</p>
<ol><li><p>Let <var title="">input</var> be the value being
Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec/browsers.html,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -d -r1.1085 -r1.1086
--- browsers.html 27 Oct 2011 21:46:24 -0000 1.1085
+++ browsers.html 28 Oct 2011 20:46:48 -0000 1.1086
@@ -653,7 +653,7 @@
<dfn id="unit-of-related-similar-origin-browsing-contexts">unit of related similar-origin browsing contexts</dfn>.</p>
<p>Each <a href="#unit-of-related-similar-origin-browsing-contexts">unit of related similar-origin browsing
- contexts</a> can have a <dfn id="entry-script">entry script</dfn> which is used to
+ contexts</a> can have an <dfn id="entry-script">entry script</dfn> which is used to
obtain, amongst other things, the <a href="webappapis.html#script-s-base-url">script's base URL</a> to
<a href="urls.html#resolve-a-url" title="resolve a url">resolve</a> relative <a href="urls.html#url" title="URL">URLs</a> used in scripts running in that <a href="#unit-of-related-similar-origin-browsing-contexts">unit
of related similar-origin browsing contexts</a>. Initially, there
@@ -797,7 +797,7 @@
</td><td>current
</td><td>current
- </td></tr><tr><td>name that exists and is a ancestor that is top
+ </td></tr><tr><td>name that exists and is an ancestor that is top
</td><td>specified ancestor
</td><td>specified ancestor
</td><td>none
@@ -805,7 +805,7 @@
</td><td>specified ancestor/top
</td><td>specified ancestor/top
- </td></tr><tr><td>name that exists and is a ancestor that is not top
+ </td></tr><tr><td>name that exists and is an ancestor that is not top
</td><td>specified ancestor
</td><td>specified ancestor
</td><td>none
Index: edits.html
===================================================================
RCS file: /sources/public/html5/spec/edits.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- edits.html 5 Oct 2011 23:46:26 -0000 1.43
+++ edits.html 28 Oct 2011 20:46:53 -0000 1.44
@@ -578,7 +578,7 @@
<strong> <tr> <td> <ins>Portal 2</ins> <td> <ins>Valve</ins> <td> <ins>10/10</ins></strong>
</table></pre>
- <p>Here, a a column has been removed (the time at which it was removed is given also, as is a link to the page explaining why):</p>
+ <p>Here, a column has been removed (the time at which it was removed is given also, as is a link to the page explaining why):</p>
<pre><table>
<thead>
Index: the-button-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-button-element.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- the-button-element.html 19 Oct 2011 23:46:27 -0000 1.98
+++ the-button-element.html 28 Oct 2011 20:47:13 -0000 1.99
@@ -1210,7 +1210,7 @@
attribute's behavior depends on whether the <code><a href="#the-option-element">option</a></code>
element is in a <code><a href="#the-select-element">select</a></code> element or not. If the
<code><a href="#the-option-element">option</a></code> has a <code><a href="#the-select-element">select</a></code> element as its parent,
- or has a <code><a href="#the-optgroup-element">optgroup</a></code> element as its parent and that
+ or has an <code><a href="#the-optgroup-element">optgroup</a></code> element as its parent and that
<code><a href="#the-optgroup-element">optgroup</a></code> element has a <code><a href="#the-select-element">select</a></code> element as
its parent, then the <code title="dom-option-form"><a href="#dom-option-form">form</a></code> IDL
attribute must return the same value as the <code title="dom-fae-form"><a href="association-of-controls-and-forms.html#dom-fae-form">form</a></code> IDL attribute on that
Index: links.html
===================================================================
RCS file: /sources/public/html5/spec/links.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- links.html 20 Oct 2011 23:46:28 -0000 1.97
+++ links.html 28 Oct 2011 20:46:53 -0000 1.98
@@ -1026,13 +1026,13 @@
<dt>External Resource</dt>
- <dd>The keyword may be specified on a <code><a href="text-level-semantics.html#the-a-element">a</a></code> and
+ <dd>The keyword may be specified on <code><a href="text-level-semantics.html#the-a-element">a</a></code> and
<code><a href="the-map-element.html#the-area-element">area</a></code> elements; it creates an <a href="#external-resource-link">external resource
link</a>.</dd>
<dt>Hyperlink Annotation</dt>
- <dd>The keyword may be specified on a <code><a href="text-level-semantics.html#the-a-element">a</a></code> and
+ <dd>The keyword may be specified on <code><a href="text-level-semantics.html#the-a-element">a</a></code> and
<code><a href="the-map-element.html#the-area-element">area</a></code> elements; it <a href="#hyperlink-annotation" title="hyperlink
annotation">annotates</a> other <a href="#hyperlink" title="hyperlink">hyperlinks</a> created by the element.</dd>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1758
retrieving revision 1.1759
diff -u -d -r1.1758 -r1.1759
--- spec.html 28 Oct 2011 00:46:34 -0000 1.1758
+++ spec.html 28 Oct 2011 20:46:55 -0000 1.1759
@@ -349,7 +349,7 @@
<a href="Overview.html">single page HTML</a>,
<a href="spec.html">multipage HTML</a>,
<a href="author/">web developer edition</a>.
-This is revision 1.5424.
+This is revision 1.5427.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2011 <a href="http://www.w3.org/"><abbr title="World Wide
Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec/syntax.html,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -d -r1.1050 -r1.1051
--- syntax.html 4 Oct 2011 17:46:32 -0000 1.1050
+++ syntax.html 28 Oct 2011 20:47:02 -0000 1.1051
@@ -755,7 +755,7 @@
inside the <code><a href="sections.html#the-body-element">body</a></code> element is a <code><a href="scripting-1.html#the-script-element">script</a></code> or
<code><a href="semantics.html#the-style-element">style</a></code> element. </p><p>A <code><a href="sections.html#the-body-element">body</a></code> element's <a href="#syntax-end-tag" title="syntax-end-tag">end
tag</a> may be omitted if the <code><a href="sections.html#the-body-element">body</a></code> element is not
- immediately followed by a <a href="#syntax-comments" title="syntax-comments">comment</a>.</p><p>A <code><a href="grouping-content.html#the-li-element">li</a></code> element's <a href="#syntax-end-tag" title="syntax-end-tag">end
+ immediately followed by a <a href="#syntax-comments" title="syntax-comments">comment</a>.</p><p>An <code><a href="grouping-content.html#the-li-element">li</a></code> element's <a href="#syntax-end-tag" title="syntax-end-tag">end
tag</a> may be omitted if the <code><a href="grouping-content.html#the-li-element">li</a></code> element is
immediately followed by another <code><a href="grouping-content.html#the-li-element">li</a></code> element or if there
is no more content in the parent element.</p><p>A <code><a href="grouping-content.html#the-dt-element">dt</a></code> element's <a href="#syntax-end-tag" title="syntax-end-tag">end
Received on Friday, 28 October 2011 20:47:20 UTC