[html5] r7591 - [e] (0) Make Ms2ger happier. Affected topics: Canvas, HTML, Video Text Tracks, V [...]

whatwg at whatwg.org whatwg at whatwg.org
Tue Dec 18 10:55:52 PST 2012


Author: ianh
Date: 2012-12-18 10:55:50 -0800 (Tue, 18 Dec 2012)
New Revision: 7591

Modified:
   complete.html
   index
   source
Log:
[e] (0) Make Ms2ger happier.
Affected topics: Canvas, HTML, Video Text Tracks, Video and Audio

Modified: complete.html
===================================================================
--- complete.html	2012-12-18 00:10:07 UTC (rev 7590)
+++ complete.html	2012-12-18 18:55:50 UTC (rev 7591)
@@ -7904,10 +7904,10 @@
 
   <p>When a user agent is to <dfn id=fetch>fetch</dfn><!--FETCH--> a resource or <a href=#url>URL</a>, optionally
   <strong>from</strong> an origin <i title="">origin</i>, optionally <strong>using</strong> a
-  specific <a href=#referrer-source>referrer source</a> as an <i>override referrer source</i>, and optionally with a
-  <i>synchronous flag</i>, a <i>manual redirect flag</i>, a <i>force same-origin flag</i>, and/or a
-  <i>block cookies flag</i>, the following steps must be run. (When a <em>URL</em> is to be fetched,
-  the URL identifies a resource to be obtained.)</p>
+  specific <a href=#referrer-source>referrer source</a> as an <i>override referrer source</i>, and optionally with
+  any of a <i>synchronous flag</i>, a <i>manual redirect flag</i>, a <i>force same-origin flag</i>,
+  and a <i>block cookies flag</i>, the following steps must be run. (When a <em>URL</em> is to be
+  fetched, the URL identifies a resource to be obtained.)</p>
 
   <!-- if invoked with the synchronous flag, make sure to release the storage mutex first -->
 
@@ -12826,7 +12826,7 @@
   semantics</a> and corresponding <a href=#default-implicit-aria-semantics>default implicit ARIA
   semantics</a> that apply to <a href=#html-elements>HTML elements</a>. Each
   language feature (element or attribute) in a cell in the first
-  column implies the ARIA semantics (role, states, and/or properties)
+  column implies the ARIA semantics (any role, states, and properties)
   given in the cell in the second column of the same row. <span class=impl>When multiple rows apply to an element, the role from
   the last row to define a role must be applied, and the states and
   properties from all the rows must be combined.</span></p>
@@ -17561,8 +17561,8 @@
   targeted at users who can benefit from navigation information being
   omitted in the initial rendering, or who can benefit from navigation
   information being immediately available, can use this element as a
-  way to determine what content on the page to initially skip and/or
-  provide on request.</p>
+  way to determine what content on the page to initially skip or
+  provide on request (or both).</p>
 
   <div class=example>
 
@@ -17925,7 +17925,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and/or <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> elements.</dd>
+   <dd>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> elements.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dt><a href=#element-dfn-dom title=element-dfn-dom>DOM interface</a>:</dt><!--TOPIC:DOM APIs-->
@@ -24074,7 +24074,7 @@
    <li><p><i>Descriptor parser</i>: Let <var title="">candidates</var>
    be an initially empty ordered list of <a href=#url title=URL>URLs</a>
    each with an associated pixel density, and optionally an associated
-   width and/or height. The order of entries in the list is the order
+   width, height, or both. The order of entries in the list is the order
    in which entries are added to the list.</p>
 
    <li>
@@ -29100,8 +29100,8 @@
     what the right solution is. In the absence of any requirement here, the HTTP specification's
     strict requirement to follow the Content-Type header prevails ("Content-Type specifies the media
     type of the underlying data." ... "If and only if the media type is not given by a Content-Type
-    field, the recipient MAY attempt to guess the media type via inspection of its content and/or
-    the name extension(s) of the URI used to identify the resource.").</p>
+    field, the recipient MAY attempt to guess the media type via inspection of its content
+    and<!---->/<!---->or the name extension(s) of the URI used to identify the resource.").</p>
 
     <p>The <a href=#networking-task-source>networking task source</a> <a href=#concept-task title=concept-task>tasks</a> to process
     the data as it is being fetched must, when appropriate, include the relevant substeps from the
@@ -32709,8 +32709,8 @@
     the right solution is. In the absence of any requirement here, the HTTP specification's strict
     requirement to follow the Content-Type header prevails ("Content-Type specifies the media type
     of the underlying data." ... "If and only if the media type is not given by a Content-Type
-    field, the recipient MAY attempt to guess the media type via inspection of its content and/or
-    the name extension(s) of the URI used to identify the resource.").</p>
+    field, the recipient MAY attempt to guess the media type via inspection of its content
+    and<!---->/<!---->or the name extension(s) of the URI used to identify the resource.").</p>
 
     <p>If the <a href=#fetch title=fetch>fetching algorithm</a> fails for any reason (network error, the
     server returns an error code, a cross-origin check fails, etc), if <var title="">URL</var> is
@@ -38683,8 +38683,8 @@
 
    <li><p><a href=#scroll-an-element-into-view title="scroll an element into view">Scroll <var title="">notional child</var> into view</a> with the <var title="">align to top flag</var> set.</p>
 
-   <li><p>Optionally, <a href=#inform>inform the user</a> that the caret and/or selection cover
-   <var title="">the specified rectangle</var> of the canvas. If the
+   <li><p>Optionally, <a href=#inform>inform the user</a> that the caret or selection (or both)
+   cover <var title="">the specified rectangle</var> of the canvas. If the
    <code><a href=#canvasrenderingcontext2d>CanvasRenderingContext2D</a></code> object's <a href=#concept-canvas-context-bitmap-mode title=concept-canvas-context-bitmap-mode>context bitmap mode</a> was <a href=#concept-canvas-fixed title=concept-canvas-fixed>fixed</a> when the method was invoked, the user agent may wait
    until the next time the <a href=#event-loop>event loop</a> reaches its "update the rendering" step to
    optionally inform the user.</li>
@@ -50881,12 +50881,9 @@
 
   <div class=impl>
 
-  <p>User agents should present this hint to the user, after having
-  <a href=#strip-line-breaks title="strip line breaks">stripped line breaks</a> from it,
-  when the element's <a href=#concept-fe-value title=concept-fe-value>value</a> is
-  the empty string and/or the control is not focused (e.g. by
-  displaying it inside a blank unfocused control and hiding it
-  otherwise).</p>
+  <p>User agents should present this hint to the user, after having <a href=#strip-line-breaks title="strip line
+  breaks">stripped line breaks</a> from it, when the element's <a href=#concept-fe-value title=concept-fe-value>value</a> is the empty string or the control is not focused (or both),
+  e.g. by displaying it inside a blank unfocused control and hiding it otherwise.</p>
 
   </div>
 
@@ -55088,7 +55085,7 @@
 
   <p>When the user agent prefills form controls, elements with the same <a href=#form-owner>form owner</a> and
   the same <a href=#autofill-scope>autofill scope</a> must use data relating to the same person, address, payment
-  instrument, and/or contact details.</p>
+  instrument, and contact details.</p>
 
   <p class=example>Suppose a user agent knows of two phone numbers,
   +1 555 123 1234 and +1 555 666 7777. It would not be conforming for
@@ -66036,7 +66033,7 @@
    <li>
 
     <p>Otherwise, a new browsing context is being requested, and what happens depends on the user
-    agent's configuration and/or abilities — it is determined by the rules given for the first
+    agent's configuration and abilities — it is determined by the rules given for the first
     applicable option from the following list:</p>
 
     <dl class=switch><dt id=sandboxWindowOpen>If the current browsing context's <a href=#active-document>active document</a>'s
@@ -74465,8 +74462,8 @@
 
   <ol><li>
 
-    <p>The user agent may display a message to the user and/or may
-    abort these steps.</p>
+    <p>The user agent may display a message to the user or
+    abort these steps (or both).</p>
 
     <p class=example>For instance, a kiosk browser could silently
     ignore any invocations of the <code title=dom-print><a href=#dom-print>print()</a></code> method.</p>
@@ -76014,9 +76011,9 @@
     corners are the four points (<var title="">sx</var>, <var title="">sy</var>), (<span title=""><var title="">sx</var>+<var title="">sw</var></span>, <var title="">sy</var>), (<span title=""><var title="">sx</var>+<var title="">sw</var></span>, <span title=""><var title="">sy</var>+<var title="">sh</var></span>), (<var title="">sx</var>, <span title=""><var title="">sy</var>+<var title="">sh</var></span>).</p>
 
     <p class=note>If either <var title="">sw</var> or <var title="">sh</var> are negative, then
-    the top-left corner of this rectangle will be to the right and/or above the (<var title="">sx</var>, <var title="">sy</var>) point. If any of the pixels on this rectangle are
-    outside the area where the <var title="">input</var> bitmap was placed, then they will be
-    transparent black in <var title="">output</var>.</p>
+    the top-left corner of this rectangle will be to the left or above the (<var title="">sx</var>,
+    <var title="">sy</var>) point. If any of the pixels on this rectangle are outside the area where
+    the <var title="">input</var> bitmap was placed, then they will be transparent black in <var title="">output</var>.</p>
 
    </li>
 
@@ -77238,7 +77235,7 @@
   <code><a href=#the-textarea-element>textarea</a></code> elements, it is the element itself.</p>
 
   <p>To determine if a word, sentence, or other piece of text in an
-  applicable element (as defined above) is to have spelling- and/or
+  applicable element (as defined above) is to have spelling- and
   grammar-checking enabled, the UA must use the following
   algorithm:</p>
 
@@ -77280,10 +77277,10 @@
    <li>Otherwise, checking is disabled.</li>
 
   </ol><p>If the checking is enabled for a word/sentence/text, the user agent should indicate spelling
-  and/or grammar errors in that text. User agents should take into account the other semantics given
-  in the document when suggesting spelling and grammar corrections. User agents may use the language
-  of the element to determine what spelling and grammar rules to use, or may use the user's
-  preferred language settings. UAs should use <code><a href=#the-input-element>input</a></code> element attributes such as <code title=attr-input-pattern><a href=#attr-input-pattern>pattern</a></code> to ensure that the resulting value is valid, where
+  and grammar errors in that text. User agents should take into account the other semantics given in
+  the document when suggesting spelling and grammar corrections. User agents may use the language of
+  the element to determine what spelling and grammar rules to use, or may use the user's preferred
+  language settings. UAs should use <code><a href=#the-input-element>input</a></code> element attributes such as <code title=attr-input-pattern><a href=#attr-input-pattern>pattern</a></code> to ensure that the resulting value is valid, where
   possible.</p>
 
   <p>If checking is disabled, the user agent should not indicate spelling or grammar errors for that
@@ -98244,7 +98241,7 @@
 
    <dd>
 
-    <p>Use appropriate elements and/or CSS instead.</p>
+    <p>Use appropriate elements or CSS instead.</p>
 
     <p>Where the <code><a href=#tt>tt</a></code> element would have been used for marking up keyboard input,
     consider the <code><a href=#the-kbd-element>kbd</a></code> element; for variables, consider the <code><a href=#the-var-element>var</a></code> element; for
@@ -100736,7 +100733,7 @@
      <td><a href=#flow-content title="Flow content">flow</a>;
          <a href=#heading-content title="Heading content">heading</a></td>
      <td><a href=#flow-content title="Flow content">flow</a></td>
-     <td>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and/or <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code></td>
+     <td>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code></td>
      <td><a href=#global-attributes title="global attributes">globals</a></td>
      <td><code><a href=#htmlelement>HTMLElement</a></code></td>
     <tr><th><code><a href=#the-hr-element>hr</a></code></th>

Modified: index
===================================================================
--- index	2012-12-18 00:10:07 UTC (rev 7590)
+++ index	2012-12-18 18:55:50 UTC (rev 7591)
@@ -7904,10 +7904,10 @@
 
   <p>When a user agent is to <dfn id=fetch>fetch</dfn><!--FETCH--> a resource or <a href=#url>URL</a>, optionally
   <strong>from</strong> an origin <i title="">origin</i>, optionally <strong>using</strong> a
-  specific <a href=#referrer-source>referrer source</a> as an <i>override referrer source</i>, and optionally with a
-  <i>synchronous flag</i>, a <i>manual redirect flag</i>, a <i>force same-origin flag</i>, and/or a
-  <i>block cookies flag</i>, the following steps must be run. (When a <em>URL</em> is to be fetched,
-  the URL identifies a resource to be obtained.)</p>
+  specific <a href=#referrer-source>referrer source</a> as an <i>override referrer source</i>, and optionally with
+  any of a <i>synchronous flag</i>, a <i>manual redirect flag</i>, a <i>force same-origin flag</i>,
+  and a <i>block cookies flag</i>, the following steps must be run. (When a <em>URL</em> is to be
+  fetched, the URL identifies a resource to be obtained.)</p>
 
   <!-- if invoked with the synchronous flag, make sure to release the storage mutex first -->
 
@@ -12826,7 +12826,7 @@
   semantics</a> and corresponding <a href=#default-implicit-aria-semantics>default implicit ARIA
   semantics</a> that apply to <a href=#html-elements>HTML elements</a>. Each
   language feature (element or attribute) in a cell in the first
-  column implies the ARIA semantics (role, states, and/or properties)
+  column implies the ARIA semantics (any role, states, and properties)
   given in the cell in the second column of the same row. <span class=impl>When multiple rows apply to an element, the role from
   the last row to define a role must be applied, and the states and
   properties from all the rows must be combined.</span></p>
@@ -17561,8 +17561,8 @@
   targeted at users who can benefit from navigation information being
   omitted in the initial rendering, or who can benefit from navigation
   information being immediately available, can use this element as a
-  way to determine what content on the page to initially skip and/or
-  provide on request.</p>
+  way to determine what content on the page to initially skip or
+  provide on request (or both).</p>
 
   <div class=example>
 
@@ -17925,7 +17925,7 @@
    <dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
    <dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
    <dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
-   <dd>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and/or <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> elements.</dd>
+   <dd>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code> elements.</dd>
    <dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
    <dd><a href=#global-attributes>Global attributes</a></dd>
    <dt><a href=#element-dfn-dom title=element-dfn-dom>DOM interface</a>:</dt><!--TOPIC:DOM APIs-->
@@ -24074,7 +24074,7 @@
    <li><p><i>Descriptor parser</i>: Let <var title="">candidates</var>
    be an initially empty ordered list of <a href=#url title=URL>URLs</a>
    each with an associated pixel density, and optionally an associated
-   width and/or height. The order of entries in the list is the order
+   width, height, or both. The order of entries in the list is the order
    in which entries are added to the list.</p>
 
    <li>
@@ -29100,8 +29100,8 @@
     what the right solution is. In the absence of any requirement here, the HTTP specification's
     strict requirement to follow the Content-Type header prevails ("Content-Type specifies the media
     type of the underlying data." ... "If and only if the media type is not given by a Content-Type
-    field, the recipient MAY attempt to guess the media type via inspection of its content and/or
-    the name extension(s) of the URI used to identify the resource.").</p>
+    field, the recipient MAY attempt to guess the media type via inspection of its content
+    and<!---->/<!---->or the name extension(s) of the URI used to identify the resource.").</p>
 
     <p>The <a href=#networking-task-source>networking task source</a> <a href=#concept-task title=concept-task>tasks</a> to process
     the data as it is being fetched must, when appropriate, include the relevant substeps from the
@@ -32709,8 +32709,8 @@
     the right solution is. In the absence of any requirement here, the HTTP specification's strict
     requirement to follow the Content-Type header prevails ("Content-Type specifies the media type
     of the underlying data." ... "If and only if the media type is not given by a Content-Type
-    field, the recipient MAY attempt to guess the media type via inspection of its content and/or
-    the name extension(s) of the URI used to identify the resource.").</p>
+    field, the recipient MAY attempt to guess the media type via inspection of its content
+    and<!---->/<!---->or the name extension(s) of the URI used to identify the resource.").</p>
 
     <p>If the <a href=#fetch title=fetch>fetching algorithm</a> fails for any reason (network error, the
     server returns an error code, a cross-origin check fails, etc), if <var title="">URL</var> is
@@ -38683,8 +38683,8 @@
 
    <li><p><a href=#scroll-an-element-into-view title="scroll an element into view">Scroll <var title="">notional child</var> into view</a> with the <var title="">align to top flag</var> set.</p>
 
-   <li><p>Optionally, <a href=#inform>inform the user</a> that the caret and/or selection cover
-   <var title="">the specified rectangle</var> of the canvas. If the
+   <li><p>Optionally, <a href=#inform>inform the user</a> that the caret or selection (or both)
+   cover <var title="">the specified rectangle</var> of the canvas. If the
    <code><a href=#canvasrenderingcontext2d>CanvasRenderingContext2D</a></code> object's <a href=#concept-canvas-context-bitmap-mode title=concept-canvas-context-bitmap-mode>context bitmap mode</a> was <a href=#concept-canvas-fixed title=concept-canvas-fixed>fixed</a> when the method was invoked, the user agent may wait
    until the next time the <a href=#event-loop>event loop</a> reaches its "update the rendering" step to
    optionally inform the user.</li>
@@ -50881,12 +50881,9 @@
 
   <div class=impl>
 
-  <p>User agents should present this hint to the user, after having
-  <a href=#strip-line-breaks title="strip line breaks">stripped line breaks</a> from it,
-  when the element's <a href=#concept-fe-value title=concept-fe-value>value</a> is
-  the empty string and/or the control is not focused (e.g. by
-  displaying it inside a blank unfocused control and hiding it
-  otherwise).</p>
+  <p>User agents should present this hint to the user, after having <a href=#strip-line-breaks title="strip line
+  breaks">stripped line breaks</a> from it, when the element's <a href=#concept-fe-value title=concept-fe-value>value</a> is the empty string or the control is not focused (or both),
+  e.g. by displaying it inside a blank unfocused control and hiding it otherwise.</p>
 
   </div>
 
@@ -55088,7 +55085,7 @@
 
   <p>When the user agent prefills form controls, elements with the same <a href=#form-owner>form owner</a> and
   the same <a href=#autofill-scope>autofill scope</a> must use data relating to the same person, address, payment
-  instrument, and/or contact details.</p>
+  instrument, and contact details.</p>
 
   <p class=example>Suppose a user agent knows of two phone numbers,
   +1 555 123 1234 and +1 555 666 7777. It would not be conforming for
@@ -66036,7 +66033,7 @@
    <li>
 
     <p>Otherwise, a new browsing context is being requested, and what happens depends on the user
-    agent's configuration and/or abilities — it is determined by the rules given for the first
+    agent's configuration and abilities — it is determined by the rules given for the first
     applicable option from the following list:</p>
 
     <dl class=switch><dt id=sandboxWindowOpen>If the current browsing context's <a href=#active-document>active document</a>'s
@@ -74465,8 +74462,8 @@
 
   <ol><li>
 
-    <p>The user agent may display a message to the user and/or may
-    abort these steps.</p>
+    <p>The user agent may display a message to the user or
+    abort these steps (or both).</p>
 
     <p class=example>For instance, a kiosk browser could silently
     ignore any invocations of the <code title=dom-print><a href=#dom-print>print()</a></code> method.</p>
@@ -76014,9 +76011,9 @@
     corners are the four points (<var title="">sx</var>, <var title="">sy</var>), (<span title=""><var title="">sx</var>+<var title="">sw</var></span>, <var title="">sy</var>), (<span title=""><var title="">sx</var>+<var title="">sw</var></span>, <span title=""><var title="">sy</var>+<var title="">sh</var></span>), (<var title="">sx</var>, <span title=""><var title="">sy</var>+<var title="">sh</var></span>).</p>
 
     <p class=note>If either <var title="">sw</var> or <var title="">sh</var> are negative, then
-    the top-left corner of this rectangle will be to the right and/or above the (<var title="">sx</var>, <var title="">sy</var>) point. If any of the pixels on this rectangle are
-    outside the area where the <var title="">input</var> bitmap was placed, then they will be
-    transparent black in <var title="">output</var>.</p>
+    the top-left corner of this rectangle will be to the left or above the (<var title="">sx</var>,
+    <var title="">sy</var>) point. If any of the pixels on this rectangle are outside the area where
+    the <var title="">input</var> bitmap was placed, then they will be transparent black in <var title="">output</var>.</p>
 
    </li>
 
@@ -77238,7 +77235,7 @@
   <code><a href=#the-textarea-element>textarea</a></code> elements, it is the element itself.</p>
 
   <p>To determine if a word, sentence, or other piece of text in an
-  applicable element (as defined above) is to have spelling- and/or
+  applicable element (as defined above) is to have spelling- and
   grammar-checking enabled, the UA must use the following
   algorithm:</p>
 
@@ -77280,10 +77277,10 @@
    <li>Otherwise, checking is disabled.</li>
 
   </ol><p>If the checking is enabled for a word/sentence/text, the user agent should indicate spelling
-  and/or grammar errors in that text. User agents should take into account the other semantics given
-  in the document when suggesting spelling and grammar corrections. User agents may use the language
-  of the element to determine what spelling and grammar rules to use, or may use the user's
-  preferred language settings. UAs should use <code><a href=#the-input-element>input</a></code> element attributes such as <code title=attr-input-pattern><a href=#attr-input-pattern>pattern</a></code> to ensure that the resulting value is valid, where
+  and grammar errors in that text. User agents should take into account the other semantics given in
+  the document when suggesting spelling and grammar corrections. User agents may use the language of
+  the element to determine what spelling and grammar rules to use, or may use the user's preferred
+  language settings. UAs should use <code><a href=#the-input-element>input</a></code> element attributes such as <code title=attr-input-pattern><a href=#attr-input-pattern>pattern</a></code> to ensure that the resulting value is valid, where
   possible.</p>
 
   <p>If checking is disabled, the user agent should not indicate spelling or grammar errors for that
@@ -98244,7 +98241,7 @@
 
    <dd>
 
-    <p>Use appropriate elements and/or CSS instead.</p>
+    <p>Use appropriate elements or CSS instead.</p>
 
     <p>Where the <code><a href=#tt>tt</a></code> element would have been used for marking up keyboard input,
     consider the <code><a href=#the-kbd-element>kbd</a></code> element; for variables, consider the <code><a href=#the-var-element>var</a></code> element; for
@@ -100736,7 +100733,7 @@
      <td><a href=#flow-content title="Flow content">flow</a>;
          <a href=#heading-content title="Heading content">heading</a></td>
      <td><a href=#flow-content title="Flow content">flow</a></td>
-     <td>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and/or <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code></td>
+     <td>One or more <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h1</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h2</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h3</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h4</a></code>, <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h5</a></code>, and <code><a href=#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements>h6</a></code></td>
      <td><a href=#global-attributes title="global attributes">globals</a></td>
      <td><code><a href=#htmlelement>HTMLElement</a></code></td>
     <tr><th><code><a href=#the-hr-element>hr</a></code></th>

Modified: source
===================================================================
--- source	2012-12-18 00:10:07 UTC (rev 7590)
+++ source	2012-12-18 18:55:50 UTC (rev 7591)
@@ -7583,10 +7583,10 @@
 
   <p>When a user agent is to <dfn>fetch</dfn><!--FETCH--> a resource or <span>URL</span>, optionally
   <strong>from</strong> an origin <i title="">origin</i>, optionally <strong>using</strong> a
-  specific <span>referrer source</span> as an <i>override referrer source</i>, and optionally with a
-  <i>synchronous flag</i>, a <i>manual redirect flag</i>, a <i>force same-origin flag</i>, and/or a
-  <i>block cookies flag</i>, the following steps must be run. (When a <em>URL</em> is to be fetched,
-  the URL identifies a resource to be obtained.)</p>
+  specific <span>referrer source</span> as an <i>override referrer source</i>, and optionally with
+  any of a <i>synchronous flag</i>, a <i>manual redirect flag</i>, a <i>force same-origin flag</i>,
+  and a <i>block cookies flag</i>, the following steps must be run. (When a <em>URL</em> is to be
+  fetched, the URL identifies a resource to be obtained.)</p>
 
   <!-- if invoked with the synchronous flag, make sure to release the storage mutex first -->
 
@@ -13169,7 +13169,7 @@
   semantics</span> and corresponding <span>default implicit ARIA
   semantics</span> that apply to <span>HTML elements</span>. Each
   language feature (element or attribute) in a cell in the first
-  column implies the ARIA semantics (role, states, and/or properties)
+  column implies the ARIA semantics (any role, states, and properties)
   given in the cell in the second column of the same row. <span
   class="impl">When multiple rows apply to an element, the role from
   the last row to define a role must be applied, and the states and
@@ -18551,8 +18551,8 @@
   targeted at users who can benefit from navigation information being
   omitted in the initial rendering, or who can benefit from navigation
   information being immediately available, can use this element as a
-  way to determine what content on the page to initially skip and/or
-  provide on request.</p>
+  way to determine what content on the page to initially skip or
+  provide on request (or both).</p>
 
   <div class="example">
 
@@ -18927,7 +18927,7 @@
    <dt><span title="element-dfn-contexts">Contexts in which this element can be used</span>:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
    <dt><span title="element-dfn-content-model">Content model</span>:</dt>
-   <dd>One or more <code>h1</code>, <code>h2</code>, <code>h3</code>, <code>h4</code>, <code>h5</code>, and/or <code>h6</code> elements.</dd>
+   <dd>One or more <code>h1</code>, <code>h2</code>, <code>h3</code>, <code>h4</code>, <code>h5</code>, and <code>h6</code> elements.</dd>
    <dt><span title="element-dfn-attributes">Content attributes</span>:</dt>
    <dd><span>Global attributes</span></dd>
    <dt><span title="element-dfn-dom">DOM interface</span>:</dt><!--TOPIC:DOM APIs-->
@@ -25598,7 +25598,7 @@
    <li><p><i>Descriptor parser</i>: Let <var title="">candidates</var>
    be an initially empty ordered list of <span title="URL">URLs</span>
    each with an associated pixel density, and optionally an associated
-   width and/or height. The order of entries in the list is the order
+   width, height, or both. The order of entries in the list is the order
    in which entries are added to the list.</p>
 
    <li>
@@ -31279,8 +31279,8 @@
     what the right solution is. In the absence of any requirement here, the HTTP specification's
     strict requirement to follow the Content-Type header prevails ("Content-Type specifies the media
     type of the underlying data." ... "If and only if the media type is not given by a Content-Type
-    field, the recipient MAY attempt to guess the media type via inspection of its content and/or
-    the name extension(s) of the URI used to identify the resource.").</p>
+    field, the recipient MAY attempt to guess the media type via inspection of its content
+    and<!---->/<!---->or the name extension(s) of the URI used to identify the resource.").</p>
 
     <p>The <span>networking task source</span> <span title="concept-task">tasks</span> to process
     the data as it is being fetched must, when appropriate, include the relevant substeps from the
@@ -35512,8 +35512,8 @@
     the right solution is. In the absence of any requirement here, the HTTP specification's strict
     requirement to follow the Content-Type header prevails ("Content-Type specifies the media type
     of the underlying data." ... "If and only if the media type is not given by a Content-Type
-    field, the recipient MAY attempt to guess the media type via inspection of its content and/or
-    the name extension(s) of the URI used to identify the resource.").</p>
+    field, the recipient MAY attempt to guess the media type via inspection of its content
+    and<!---->/<!---->or the name extension(s) of the URI used to identify the resource.").</p>
 
     <p>If the <span title="fetch">fetching algorithm</span> fails for any reason (network error, the
     server returns an error code, a cross-origin check fails, etc), if <var title="">URL</var> is
@@ -37048,7 +37048,7 @@
    line, the second one to terminate the header block: in the future,
    we can add a metadata block before the first blank line -->
 
-   <li>Zero or more <span title="WebVTT cue">WebVTT cues</span> and/or <span title="WebVTT
+   <li>Zero or more <span title="WebVTT cue">WebVTT cues</span> and <span title="WebVTT
    comment">WebVTT comments</span> separated from each other by two or more <span title="WebVTT
    line terminator">WebVTT line terminators</span>.</li>
 
@@ -45203,8 +45203,8 @@
    title="">notional child</var> into view</span> with the <var
    title="">align to top flag</var> set.</p>
 
-   <li><p>Optionally, <a href="#inform">inform the user</a> that the caret and/or selection cover
-   <var title="">the specified rectangle</var> of the canvas. If the
+   <li><p>Optionally, <a href="#inform">inform the user</a> that the caret or selection (or both)
+   cover <var title="">the specified rectangle</var> of the canvas. If the
    <code>CanvasRenderingContext2D</code> object's <span
    title="concept-canvas-context-bitmap-mode">context bitmap mode</span> was <span
    title="concept-canvas-fixed">fixed</span> when the method was invoked, the user agent may wait
@@ -59294,12 +59294,10 @@
 
   <div class="impl">
 
-  <p>User agents should present this hint to the user, after having
-  <span title="strip line breaks">stripped line breaks</span> from it,
-  when the element's <span title="concept-fe-value">value</span> is
-  the empty string and/or the control is not focused (e.g. by
-  displaying it inside a blank unfocused control and hiding it
-  otherwise).</p>
+  <p>User agents should present this hint to the user, after having <span title="strip line
+  breaks">stripped line breaks</span> from it, when the element's <span
+  title="concept-fe-value">value</span> is the empty string or the control is not focused (or both),
+  e.g. by displaying it inside a blank unfocused control and hiding it otherwise.</p>
 
   </div>
 
@@ -64352,7 +64350,7 @@
 
   <p>When the user agent prefills form controls, elements with the same <span>form owner</span> and
   the same <span>autofill scope</span> must use data relating to the same person, address, payment
-  instrument, and/or contact details.</p>
+  instrument, and contact details.</p>
 
   <p class="example">Suppose a user agent knows of two phone numbers,
   +1 555 123 1234 and +1 555 666 7777. It would not be conforming for
@@ -77298,7 +77296,7 @@
    <li>
 
     <p>Otherwise, a new browsing context is being requested, and what happens depends on the user
-    agent's configuration and/or abilities — it is determined by the rules given for the first
+    agent's configuration and abilities — it is determined by the rules given for the first
     applicable option from the following list:</p>
 
     <dl class="switch">
@@ -87065,8 +87063,8 @@
 
    <li>
 
-    <p>The user agent may display a message to the user and/or may
-    abort these steps.</p>
+    <p>The user agent may display a message to the user or
+    abort these steps (or both).</p>
 
     <p class="example">For instance, a kiosk browser could silently
     ignore any invocations of the <code
@@ -88833,10 +88831,10 @@
     title="">sy</var>+<var title="">sh</var></span>).</p>
 
     <p class="note">If either <var title="">sw</var> or <var title="">sh</var> are negative, then
-    the top-left corner of this rectangle will be to the right and/or above the (<var
-    title="">sx</var>, <var title="">sy</var>) point. If any of the pixels on this rectangle are
-    outside the area where the <var title="">input</var> bitmap was placed, then they will be
-    transparent black in <var title="">output</var>.</p>
+    the top-left corner of this rectangle will be to the left or above the (<var title="">sx</var>,
+    <var title="">sy</var>) point. If any of the pixels on this rectangle are outside the area where
+    the <var title="">input</var> bitmap was placed, then they will be transparent black in <var
+    title="">output</var>.</p>
 
    </li>
 
@@ -90235,7 +90233,7 @@
   <code>textarea</code> elements, it is the element itself.</p>
 
   <p>To determine if a word, sentence, or other piece of text in an
-  applicable element (as defined above) is to have spelling- and/or
+  applicable element (as defined above) is to have spelling- and
   grammar-checking enabled, the UA must use the following
   algorithm:</p>
 
@@ -90288,10 +90286,10 @@
   </ol>
 
   <p>If the checking is enabled for a word/sentence/text, the user agent should indicate spelling
-  and/or grammar errors in that text. User agents should take into account the other semantics given
-  in the document when suggesting spelling and grammar corrections. User agents may use the language
-  of the element to determine what spelling and grammar rules to use, or may use the user's
-  preferred language settings. UAs should use <code>input</code> element attributes such as <code
+  and grammar errors in that text. User agents should take into account the other semantics given in
+  the document when suggesting spelling and grammar corrections. User agents may use the language of
+  the element to determine what spelling and grammar rules to use, or may use the user's preferred
+  language settings. UAs should use <code>input</code> element attributes such as <code
   title="attr-input-pattern">pattern</code> to ensure that the resulting value is valid, where
   possible.</p>
 
@@ -114722,7 +114720,7 @@
 
    <dd>
 
-    <p>Use appropriate elements and/or CSS instead.</p>
+    <p>Use appropriate elements or CSS instead.</p>
 
     <p>Where the <code>tt</code> element would have been used for marking up keyboard input,
     consider the <code>kbd</code> element; for variables, consider the <code>var</code> element; for
@@ -117794,7 +117792,7 @@
      <td><span title="Flow content">flow</span>;
          <span title="Heading content">heading</span></td>
      <td><span title="Flow content">flow</span></td>
-     <td>One or more <code>h1</code>, <code>h2</code>, <code>h3</code>, <code>h4</code>, <code>h5</code>, and/or <code>h6</code></td>
+     <td>One or more <code>h1</code>, <code>h2</code>, <code>h3</code>, <code>h4</code>, <code>h5</code>, and <code>h6</code></td>
      <td><span title="global attributes">globals</span></td>
      <td><code>HTMLElement</code></td>
     </tr>




More information about the Commit-Watchers mailing list