[e] (0) Fix recent checkins, including the one with a translation exa…

…mple Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=26069 Affected topics: HTML, Video and Audio git-svn-id: http://svn.whatwg.org/webapps@8674 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jun 12, 2014 · c22c19b · c22c19b
1 parent 8e91b34
commit c22c19b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/complete.html b/complete.html
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 11 June 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 June 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -11187,11 +11187,13 @@ <h5 id=embedding-custom-non-visible-data-with-the-data-*-attributes><span class=
    that they are intending to use:</p>
 
    <pre>&lt;p&gt;The third &lt;span data-mytrans-de="Anspruch"&gt;claim&lt;/span&gt; covers the case of &lt;span
-data-mytrans-all="HTML"&gt;HTML&lt;/span&gt; markup.&lt;/p&gt;</pre>
+translate="no"&gt;HTML&lt;/span&gt; markup.&lt;/p&gt;</pre>
 
-   <p>(In this example, the "<code title="">data-mytrans-de</code>" attribute gives specific text
-   for the MyTrans product to use when translating the phrase "claim" to German, and the "<code title="">data-mytrans-all</code>" attribute gives tells it that in all languages, "HTML" is to
-   remain unchanged.)</p>
+   <p>In this example, the "<code title="">data-mytrans-de</code>" attribute gives specific text
+   for the MyTrans product to use when translating the phrase "claim" to German. However, the
+   standard <code title=attr-translate><a href=#attr-translate>translate</a></code> attribute is used to tell it that in all
+   languages, "HTML" is to remain unchanged. When a standard attribute is available, there is no
+   need for a <a href=#custom-data-attribute>custom data attribute</a> to be used.</p>
 
   </div>
 
@@ -25585,7 +25587,7 @@ <h4 id=media-elements><span class=secno>4.7.10 </span>Media elements</h4>
   <a href=#media-element>media element</a>, the video data of the <a href=#media-resource>media resource</a> is only that of the
   currently selected track (if any) as given by the element's <code title=dom-media-videoTracks><a href=#dom-media-videotracks>videoTracks</a></code> attribute when the <a href=#event-loop>event loop</a> last reached step 1, and the audio data of the <a href=#media-resource>media
   resource</a> is the result of mixing all the currently enabled tracks (if any) given by the
-  element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code> attribute when the the <a href=#event-loop>event loop</a> last reached step 1.</p>
+  element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code> attribute when the <a href=#event-loop>event loop</a> last reached step 1.</p>
 
   <p class=note>Both <code><a href=#the-audio-element>audio</a></code> and <code><a href=#the-video-element>video</a></code> elements can be used for both audio
   and video. The main difference between the two is simply that the <code><a href=#the-audio-element>audio</a></code> element has

diff --git a/index b/index
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 11 June 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 June 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -11187,11 +11187,13 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
    that they are intending to use:</p>
 
    <pre>&lt;p&gt;The third &lt;span data-mytrans-de="Anspruch"&gt;claim&lt;/span&gt; covers the case of &lt;span
-data-mytrans-all="HTML"&gt;HTML&lt;/span&gt; markup.&lt;/p&gt;</pre>
+translate="no"&gt;HTML&lt;/span&gt; markup.&lt;/p&gt;</pre>
 
-   <p>(In this example, the "<code title="">data-mytrans-de</code>" attribute gives specific text
-   for the MyTrans product to use when translating the phrase "claim" to German, and the "<code title="">data-mytrans-all</code>" attribute gives tells it that in all languages, "HTML" is to
-   remain unchanged.)</p>
+   <p>In this example, the "<code title="">data-mytrans-de</code>" attribute gives specific text
+   for the MyTrans product to use when translating the phrase "claim" to German. However, the
+   standard <code title=attr-translate><a href=#attr-translate>translate</a></code> attribute is used to tell it that in all
+   languages, "HTML" is to remain unchanged. When a standard attribute is available, there is no
+   need for a <a href=#custom-data-attribute>custom data attribute</a> to be used.</p>
 
   </div>
 
@@ -25585,7 +25587,7 @@ interface <dfn id=htmlmediaelement>HTMLMediaElement</dfn> : <a href=#htmlelement
   <a href=#media-element>media element</a>, the video data of the <a href=#media-resource>media resource</a> is only that of the
   currently selected track (if any) as given by the element's <code title=dom-media-videoTracks><a href=#dom-media-videotracks>videoTracks</a></code> attribute when the <a href=#event-loop>event loop</a> last reached step 1, and the audio data of the <a href=#media-resource>media
   resource</a> is the result of mixing all the currently enabled tracks (if any) given by the
-  element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code> attribute when the the <a href=#event-loop>event loop</a> last reached step 1.</p>
+  element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code> attribute when the <a href=#event-loop>event loop</a> last reached step 1.</p>
 
   <p class=note>Both <code><a href=#the-audio-element>audio</a></code> and <code><a href=#the-video-element>video</a></code> elements can be used for both audio
   and video. The main difference between the two is simply that the <code><a href=#the-audio-element>audio</a></code> element has

diff --git a/source b/source
@@ -11172,12 +11172,13 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
    that they are intending to use:</p>
 
    <pre>&lt;p>The third &lt;span data-mytrans-de="Anspruch">claim&lt;/span> covers the case of &lt;span
-data-mytrans-all="HTML">HTML&lt;/span> markup.&lt;/p></pre>
+translate="no">HTML&lt;/span> markup.&lt;/p></pre>
 
-   <p>(In this example, the "<code data-x="">data-mytrans-de</code>" attribute gives specific text
-   for the MyTrans product to use when translating the phrase "claim" to German, and the "<code
-   data-x="">data-mytrans-all</code>" attribute gives tells it that in all languages, "HTML" is to
-   remain unchanged.)</p>
+   <p>In this example, the "<code data-x="">data-mytrans-de</code>" attribute gives specific text
+   for the MyTrans product to use when translating the phrase "claim" to German. However, the
+   standard <code data-x="attr-translate">translate</code> attribute is used to tell it that in all
+   languages, "HTML" is to remain unchanged. When a standard attribute is available, there is no
+   need for a <span>custom data attribute</span> to be used.</p>
 
   </div>
 
@@ -25852,7 +25853,7 @@ interface <dfn>HTMLMediaElement</dfn> : <span>HTMLElement</span> {
   currently selected track (if any) as given by the element's <code
   data-x="dom-media-videoTracks">videoTracks</code> attribute when the <span>event loop</span> last reached step 1, and the audio data of the <span>media
   resource</span> is the result of mixing all the currently enabled tracks (if any) given by the
-  element's <code data-x="dom-media-audioTracks">audioTracks</code> attribute when the the <span>event loop</span> last reached step 1.</p>
+  element's <code data-x="dom-media-audioTracks">audioTracks</code> attribute when the <span>event loop</span> last reached step 1.</p>
 
   <p class="note">Both <code>audio</code> and <code>video</code> elements can be used for both audio
   and video. The main difference between the two is simply that the <code>audio</code> element has