[html5] r3980 - [e] (0) Apparently 'tool bar' isn't right.
whatwg at whatwg.org
whatwg at whatwg.org
Wed Sep 23 05:59:36 PDT 2009
Author: ianh
Date: 2009-09-23 05:59:35 -0700 (Wed, 23 Sep 2009)
New Revision: 3980
Modified:
index
source
Log:
[e] (0) Apparently 'tool bar' isn't right.
Modified: index
===================================================================
--- index 2009-09-23 08:43:15 UTC (rev 3979)
+++ index 2009-09-23 12:59:35 UTC (rev 3980)
@@ -596,9 +596,9 @@
<li><a href=#menus><span class=secno>4.11.3 </span>The <code>menu</code> element</a>
<ol>
<li><a href=#menus-intro><span class=secno>4.11.3.1 </span>Introduction</a></li>
- <li><a href=#building-menus-and-tool-bars><span class=secno>4.11.3.2 </span>Building menus and tool bars</a></li>
+ <li><a href=#building-menus-and-toolbars><span class=secno>4.11.3.2 </span>Building menus and toolbars</a></li>
<li><a href=#context-menus><span class=secno>4.11.3.3 </span>Context menus</a></li>
- <li><a href=#tool-bars><span class=secno>4.11.3.4 </span>Tool bars</a></ol></li>
+ <li><a href=#toolbars><span class=secno>4.11.3.4 </span>Toolbars</a></ol></li>
<li><a href=#commands><span class=secno>4.11.4 </span>Commands</a>
<ol>
<li><a href=#using-the-a-element-to-define-a-command><span class=secno>4.11.4.1 </span>Using the <code>a</code> element to define a command</a></li>
@@ -1002,7 +1002,7 @@
<li><a href=#images-0><span class=secno>11.3.2 </span>Images</a></li>
<li><a href=#attributes-for-embedded-content-and-images><span class=secno>11.3.3 </span>Attributes for embedded content and images</a></li>
<li><a href=#image-maps-0><span class=secno>11.3.4 </span>Image maps</a></li>
- <li><a href=#tool-bars-0><span class=secno>11.3.5 </span>Tool bars</a></ol></li>
+ <li><a href=#toolbars-0><span class=secno>11.3.5 </span>Toolbars</a></ol></li>
<li><a href=#bindings><span class=secno>11.4 </span>Bindings</a>
<ol>
<li><a href=#introduction-8><span class=secno>11.4.1 </span>Introduction</a></li>
@@ -8689,7 +8689,7 @@
<li><code><a href=#the-input-element>input</a></code> (if the <code title=attr-input-type><a href=#attr-input-type>type</a></code> attribute is <em>not</em> in the <a href=#hidden-state title=attr-input-type-hidden>Hidden</a> state)</li>
<li><code><a href=#the-keygen-element>keygen</a></code></li>
<li><code><a href=#the-label-element>label</a></code></li>
- <li><code><a href=#menus>menu</a></code> (if the <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state)</li>
+ <li><code><a href=#menus>menu</a></code> (if the <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#toolbar-state title="toolbar state">toolbar</a> state)</li>
<li><code><a href=#the-object-element>object</a></code> (if the <code title=attr-hyperlink-usemap><a href=#attr-hyperlink-usemap>usemap</a></code> attribute is present)<!-- see also comment in <object> section --></li>
<li><code><a href=#the-select-element>select</a></code></li>
<li><code><a href=#the-textarea-element>textarea</a></code></li>
@@ -9144,7 +9144,7 @@
<tr><td><code><a href=#menus>menu</a></code> element with a <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute in the <a href=#list-state title="list state">list</a> state
<td><code title=attr-aria-role-menu>menu</code> role
- <tr><td><code><a href=#menus>menu</a></code> element with a <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state
+ <tr><td><code><a href=#menus>menu</a></code> element with a <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute in the <a href=#toolbar-state title="toolbar state">toolbar</a> state
<td><code title=attr-aria-role-toolbar>toolbar</code> role
<tr><td><code><a href=#the-nav-element>nav</a></code> element
@@ -15237,7 +15237,7 @@
not present.</p>
<div class=example>
- <p>If a site uses a consistent navigation tool bar on every page,
+ <p>If a site uses a consistent navigation toolbar on every page,
then the link that would normally link to the page itself could be
marked up using an <code><a href=#the-a-element>a</a></code> element:</p>
<pre><nav>
@@ -42145,7 +42145,7 @@
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content>Flow content</a>.</dd>
- <dd>If the element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state: <a href=#interactive-content>Interactive content</a>.</dd>
+ <dd>If the element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#toolbar-state title="toolbar state">toolbar</a> state: <a href=#interactive-content>Interactive content</a>.</dd>
<dt>Contexts in which this element may be used:</dt>
<dd>Where <a href=#flow-content>flow content</a> is expected.</dd>
<dt>Content model:</dt>
@@ -42170,19 +42170,19 @@
being declared. The attribute has three states. The <code title=attr-menu-type-context>context</code> keyword maps to the
<dfn id=context-menu-state title="context menu state">context menu</dfn> state, in which
the element is declaring a context menu. The <code title=attr-menu-type-toolbar>toolbar</code> keyword maps to the
- <dfn id=tool-bar-state title="tool bar state">tool bar</dfn> state, in which the
- element is declaring a tool bar. The attribute may also be
+ <dfn id=toolbar-state title="toolbar state">toolbar</dfn> state, in which the
+ element is declaring a toolbar. The attribute may also be
omitted. The <i>missing value default</i> is the <dfn id=list-state title="list
state">list</dfn> state, which indicates that the element is merely
a list of commands that is neither declaring a context menu nor
- defining a tool bar.</p>
+ defining a toolbar.</p>
<p>If a <code><a href=#menus>menu</a></code> element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#context-menu-state title="context menu state">context menu</a> state, then the
element <a href=#represents>represents</a> the commands of a context menu, and
the user can only interact with the commands if that context menu is
activated.</p>
- <p>If a <code><a href=#menus>menu</a></code> element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state, then the element
+ <p>If a <code><a href=#menus>menu</a></code> element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#toolbar-state title="toolbar state">toolbar</a> state, then the element
<a href=#represents>represents</a> a list of active commands that the user can
immediately interact with.</p>
@@ -42214,7 +42214,7 @@
<p><i>This section is non-normative.</i></p>
<p>The <code><a href=#menus>menu</a></code> element is used to define context menus and
- tool bars.</p>
+ toolbars.</p>
<p>For example, the following represents a toolbar with three menu
buttons on it, each of which has a dropdown menu with a series of
@@ -42283,9 +42283,9 @@
<div class=impl>
- <h5 id=building-menus-and-tool-bars><span class=secno>4.11.3.2 </span><dfn>Building menus and tool bars</dfn></h5>
+ <h5 id=building-menus-and-toolbars><span class=secno>4.11.3.2 </span><dfn>Building menus and toolbars</dfn></h5>
- <p>A menu (or tool bar) consists of a list of zero or more of the
+ <p>A menu (or toolbar) consists of a list of zero or more of the
following components:</p>
<ul class=brief><li><a href=#concept-command title=concept-command>Commands</a>, which can be marked as default commands</li>
@@ -42401,8 +42401,8 @@
<!-- v2: include modifier key information -->
<p>The default action of <em>this</em> event is that the user agent
- must show a context menu <a href=#building-menus-and-tool-bars title="building menus and tool
- bars">built</a> from the <code><a href=#menus>menu</a></code> element.</p>
+ must show a context menu <a href=#building-menus-and-toolbars title="building menus and
+ toolbars">built</a> from the <code><a href=#menus>menu</a></code> element.</p>
<p>The user agent may also provide access to its default context
menu, if any, with the context menu shown. For example, it could
@@ -42435,16 +42435,16 @@
<div class=impl>
- <h5 id=tool-bars><span class=secno>4.11.3.4 </span><dfn>Tool bars</dfn></h5>
+ <h5 id=toolbars><span class=secno>4.11.3.4 </span><dfn>Toolbars</dfn></h5>
- <p>When a <code><a href=#menus>menu</a></code> element has a <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state, then the user agent
- must <a href=#building-menus-and-tool-bars title="building menus and tool bars">build</a> the
+ <p>When a <code><a href=#menus>menu</a></code> element has a <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute in the <a href=#toolbar-state title="toolbar state">toolbar</a> state, then the user agent
+ must <a href=#building-menus-and-toolbars title="building menus and toolbars">build</a> the
menu for that <code><a href=#menus>menu</a></code> element, and use the result in the
rendering.</p>
<p>The user agent must reflect changes made to the
- <code><a href=#menus>menu</a></code>'s DOM, by immediately <a href=#building-menus-and-tool-bars title="building menus
- and tool bars">rebuilding</a> the menu.</p>
+ <code><a href=#menus>menu</a></code>'s DOM, by immediately <a href=#building-menus-and-toolbars title="building menus
+ and toolbars">rebuilding</a> the menu.</p>
</div>
@@ -48919,7 +48919,7 @@
<dt><var title="">window</var> . <code title=dom-window-toolbar><a href=#dom-window-toolbar>toolbar</a></code> . <code title=dom-BarProp-visible><a href=#dom-barprop-visible>visible</a></code></dt>
<dd>
- <p>Returns true if the tool bar is visible; otherwise, returns false.</p>
+ <p>Returns true if the toolbar is visible; otherwise, returns false.</p>
</dd>
</dl><div class=impl>
@@ -48968,7 +48968,7 @@
interface element was absent (i.e. its <code title=dom-BarProp-visible><a href=#dom-barprop-visible>visible</a></code> attribute may return
false).</dd>
- <dt><dfn id=the-tool-bar-barprop-object>The tool bar <code>BarProp</code> object</dfn></dt>
+ <dt><dfn id=the-toolbar-barprop-object>The toolbar <code>BarProp</code> object</dfn></dt>
<dd>Represents the user interface element found immediately above
or before the document, as appropriate for the <a href=#default-view>default
@@ -48998,7 +48998,7 @@
object</a>.</p>
<p>The <dfn id=dom-window-toolbar title=dom-window-toolbar><code>toolbar</code></dfn>
- attribute must return <a href=#the-tool-bar-barprop-object>the tool bar <code>BarProp</code>
+ attribute must return <a href=#the-toolbar-barprop-object>the toolbar <code>BarProp</code>
object</a>.</p>
<!--
@@ -72541,15 +72541,15 @@
<div class=impl>
- <h4 id=tool-bars-0><span class=secno>11.3.5 </span>Tool bars</h4>
+ <h4 id=toolbars-0><span class=secno>11.3.5 </span>Toolbars</h4>
- <p>When a <code><a href=#menus>menu</a></code> element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state, the element is
+ <p>When a <code><a href=#menus>menu</a></code> element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#toolbar-state title="toolbar state">toolbar</a> state, the element is
expected to be treated as a replaced element with a height about two
lines high and a width derived from the contents of the element.</p>
<p>The element is expected to have, by default, the appearance of a
- tool bar on the user agent's platform. It is expected to contain the
- menu that is <a href=#building-menus-and-tool-bars title="building menus and tool bars">built</a>
+ toolbar on the user agent's platform. It is expected to contain the
+ menu that is <a href=#building-menus-and-toolbars title="building menus and toolbars">built</a>
from the element.</p>
<p class="example XXX">...example with screenshot...</p>
Modified: source
===================================================================
--- source 2009-09-23 08:43:15 UTC (rev 3979)
+++ source 2009-09-23 12:59:35 UTC (rev 3980)
@@ -8869,7 +8869,7 @@
<li><code>input</code> (if the <code title="attr-input-type">type</code> attribute is <em>not</em> in the <span title="attr-input-type-hidden">Hidden</span> state)</li>
<li><code>keygen</code></li>
<li><code>label</code></li>
- <li><code>menu</code> (if the <code title="attr-menu-type">type</code> attribute is in the <span title="tool bar state">tool bar</span> state)</li>
+ <li><code>menu</code> (if the <code title="attr-menu-type">type</code> attribute is in the <span title="toolbar state">toolbar</span> state)</li>
<li><code>object</code> (if the <code title="attr-hyperlink-usemap">usemap</code> attribute is present)<!-- see also comment in <object> section --></li>
<li><code>select</code></li>
<li><code>textarea</code></li>
@@ -9399,7 +9399,7 @@
<td><code title="attr-aria-role-menu">menu</code> role
<tr>
- <td><code>menu</code> element with a <code title="attr-menu-type">type</code> attribute in the <span title="tool bar state">tool bar</span> state
+ <td><code>menu</code> element with a <code title="attr-menu-type">type</code> attribute in the <span title="toolbar state">toolbar</span> state
<td><code title="attr-aria-role-toolbar">toolbar</code> role
<tr>
@@ -16209,7 +16209,7 @@
not present.</p>
<div class="example">
- <p>If a site uses a consistent navigation tool bar on every page,
+ <p>If a site uses a consistent navigation toolbar on every page,
then the link that would normally link to the page itself could be
marked up using an <code>a</code> element:</p>
<pre><nav>
@@ -46996,7 +46996,7 @@
<dl class="element">
<dt>Categories</dt>
<dd><span>Flow content</span>.</dd>
- <dd>If the element's <code title="attr-menu-type">type</code> attribute is in the <span title="tool bar state">tool bar</span> state: <span>Interactive content</span>.</dd>
+ <dd>If the element's <code title="attr-menu-type">type</code> attribute is in the <span title="toolbar state">toolbar</span> state: <span>Interactive content</span>.</dd>
<dt>Contexts in which this element may be used:</dt>
<dd>Where <span>flow content</span> is expected.</dd>
<dt>Content model:</dt>
@@ -47025,12 +47025,12 @@
<dfn title="context menu state">context menu</dfn> state, in which
the element is declaring a context menu. The <code
title="attr-menu-type-toolbar">toolbar</code> keyword maps to the
- <dfn title="tool bar state">tool bar</dfn> state, in which the
- element is declaring a tool bar. The attribute may also be
+ <dfn title="toolbar state">toolbar</dfn> state, in which the
+ element is declaring a toolbar. The attribute may also be
omitted. The <i>missing value default</i> is the <dfn title="list
state">list</dfn> state, which indicates that the element is merely
a list of commands that is neither declaring a context menu nor
- defining a tool bar.</p>
+ defining a toolbar.</p>
<p>If a <code>menu</code> element's <code
title="attr-menu-type">type</code> attribute is in the <span
@@ -47041,7 +47041,7 @@
<p>If a <code>menu</code> element's <code
title="attr-menu-type">type</code> attribute is in the <span
- title="tool bar state">tool bar</span> state, then the element
+ title="toolbar state">toolbar</span> state, then the element
<span>represents</span> a list of active commands that the user can
immediately interact with.</p>
@@ -47077,7 +47077,7 @@
<p><i>This section is non-normative.</i></p>
<p>The <code>menu</code> element is used to define context menus and
- tool bars.</p>
+ toolbars.</p>
<p>For example, the following represents a toolbar with three menu
buttons on it, each of which has a dropdown menu with a series of
@@ -47148,9 +47148,9 @@
<div class="impl">
- <h5><dfn>Building menus and tool bars</dfn></h5>
+ <h5><dfn>Building menus and toolbars</dfn></h5>
- <p>A menu (or tool bar) consists of a list of zero or more of the
+ <p>A menu (or toolbar) consists of a list of zero or more of the
following components:</p>
<ul class="brief">
@@ -47285,8 +47285,8 @@
<!-- v2: include modifier key information -->
<p>The default action of <em>this</em> event is that the user agent
- must show a context menu <span title="building menus and tool
- bars">built</span> from the <code>menu</code> element.</p>
+ must show a context menu <span title="building menus and
+ toolbars">built</span> from the <code>menu</code> element.</p>
<p>The user agent may also provide access to its default context
menu, if any, with the context menu shown. For example, it could
@@ -47322,18 +47322,18 @@
<div class="impl">
- <h5><dfn>Tool bars</dfn></h5>
+ <h5><dfn>Toolbars</dfn></h5>
<p>When a <code>menu</code> element has a <code
title="attr-menu-type">type</code> attribute in the <span
- title="tool bar state">tool bar</span> state, then the user agent
- must <span title="building menus and tool bars">build</span> the
+ title="toolbar state">toolbar</span> state, then the user agent
+ must <span title="building menus and toolbars">build</span> the
menu for that <code>menu</code> element, and use the result in the
rendering.</p>
<p>The user agent must reflect changes made to the
<code>menu</code>'s DOM, by immediately <span title="building menus
- and tool bars">rebuilding</span> the menu.</p>
+ and toolbars">rebuilding</span> the menu.</p>
</div>
@@ -55175,7 +55175,7 @@
<dt><var title="">window</var> . <code title="dom-window-toolbar">toolbar</code> . <code title="dom-BarProp-visible">visible</code></dt>
<dd>
- <p>Returns true if the tool bar is visible; otherwise, returns false.</p>
+ <p>Returns true if the toolbar is visible; otherwise, returns false.</p>
</dd>
</dl>
@@ -55230,7 +55230,7 @@
title="dom-BarProp-visible">visible</code> attribute may return
false).</dd>
- <dt><dfn>The tool bar <code>BarProp</code> object</dfn></dt>
+ <dt><dfn>The toolbar <code>BarProp</code> object</dfn></dt>
<dd>Represents the user interface element found immediately above
or before the document, as appropriate for the <span>default
@@ -55267,7 +55267,7 @@
object</span>.</p>
<p>The <dfn title="dom-window-toolbar"><code>toolbar</code></dfn>
- attribute must return <span>the tool bar <code>BarProp</code>
+ attribute must return <span>the toolbar <code>BarProp</code>
object</span>.</p>
<!--
@@ -86092,17 +86092,17 @@
<div class="impl">
- <h4>Tool bars</h4>
+ <h4>Toolbars</h4>
<p>When a <code>menu</code> element's <code
title="attr-menu-type">type</code> attribute is in the <span
- title="tool bar state">tool bar</span> state, the element is
+ title="toolbar state">toolbar</span> state, the element is
expected to be treated as a replaced element with a height about two
lines high and a width derived from the contents of the element.</p>
<p>The element is expected to have, by default, the appearance of a
- tool bar on the user agent's platform. It is expected to contain the
- menu that is <span title="building menus and tool bars">built</span>
+ toolbar on the user agent's platform. It is expected to contain the
+ menu that is <span title="building menus and toolbars">built</span>
from the element.</p>
<p class="example XXX">...example with screenshot...</p>
More information about the Commit-Watchers
mailing list