Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[a] (2) Try to clarify <output> and <samp> based on discussions on th…
…e WHATWG list

Affected topics: HTML

git-svn-id: http://svn.whatwg.org/webapps@8417 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Jan 22, 2014
1 parent 7882da8 commit f52b67e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 14 deletions.
16 changes: 11 additions & 5 deletions complete.html
Expand Up @@ -298,7 +298,7 @@

<header class=head id=head><p><a href=http://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 21 January 2014</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 22 January 2014</h2>
</hgroup><dl><dt><strong>Web developer edition:</strong></dt>
<dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
<dt>Multiple-page version:</dt>
Expand Down Expand Up @@ -19062,11 +19062,14 @@ <h4 id=the-samp-element><span class=secno>4.5.14 </span>The <dfn><code>samp</cod
<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-->
<dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-samp-element>samp</a></code> element <a href=#represents>represents</a> (sample) output from a program or
computing system.</p>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-samp-element>samp</a></code> element <a href=#represents>represents</a> sample or quoted output from another
program or computing system.</p>

<p class=note>See the <code><a href=#the-pre-element>pre</a></code> and <code><a href=#the-kbd-element>kbd</a></code> elements for more details.</p>

<p class=note>This element can be contrasted with the <code><a href=#the-output-element>output</a></code> element, which can be
used to provide immediate output in a Web application.</p>

<div class=example>
<p>This example shows the <code><a href=#the-samp-element>samp</a></code> element being used
inline:</p>
Expand Down Expand Up @@ -45828,8 +45831,11 @@ <h4 id=the-output-element><span class=secno>4.10.13 </span>The <dfn><code>output
readonly attribute <a href=#nodelist>NodeList</a> <a href=#dom-lfe-labels title=dom-lfe-labels>labels</a>;
};</pre>
</dd>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-output-element>output</a></code> element <a href=#represents>represents</a> the result of a calculation or user
action.</p>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-output-element>output</a></code> element <a href=#represents>represents</a> the result of a calculation performed
by the application, or the result of a user action.</p>

<p class=note>This element can be contrasted with the <code><a href=#the-samp-element>samp</a></code> element, which is the
appropriate element for quoting the output of other programs run previously.</p>

<p>The <dfn id=attr-output-for title=attr-output-for><code>for</code></dfn> content attribute allows an explicit
relationship to be made between the result of a calculation and the elements that represent the
Expand Down
16 changes: 11 additions & 5 deletions index
Expand Up @@ -298,7 +298,7 @@

<header class=head id=head><p><a href=http://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 21 January 2014</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 22 January 2014</h2>
</hgroup><dl><dt><strong>Web developer edition:</strong></dt>
<dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
<dt>Multiple-page version:</dt>
Expand Down Expand Up @@ -19062,11 +19062,14 @@ looked pleased.&lt;/p&gt;</pre>
<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-->
<dd>Uses <code><a href=#htmlelement>HTMLElement</a></code>.</dd>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-samp-element>samp</a></code> element <a href=#represents>represents</a> (sample) output from a program or
computing system.</p>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-samp-element>samp</a></code> element <a href=#represents>represents</a> sample or quoted output from another
program or computing system.</p>

<p class=note>See the <code><a href=#the-pre-element>pre</a></code> and <code><a href=#the-kbd-element>kbd</a></code> elements for more details.</p>

<p class=note>This element can be contrasted with the <code><a href=#the-output-element>output</a></code> element, which can be
used to provide immediate output in a Web application.</p>

<div class=example>
<p>This example shows the <code><a href=#the-samp-element>samp</a></code> element being used
inline:</p>
Expand Down Expand Up @@ -45828,8 +45831,11 @@ Daddy"&gt;&lt;/textarea&gt;</pre>
readonly attribute <a href=#nodelist>NodeList</a> <a href=#dom-lfe-labels title=dom-lfe-labels>labels</a>;
};</pre>
</dd>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-output-element>output</a></code> element <a href=#represents>represents</a> the result of a calculation or user
action.</p>
</dl><!--TOPIC:HTML--><p>The <code><a href=#the-output-element>output</a></code> element <a href=#represents>represents</a> the result of a calculation performed
by the application, or the result of a user action.</p>

<p class=note>This element can be contrasted with the <code><a href=#the-samp-element>samp</a></code> element, which is the
appropriate element for quoting the output of other programs run previously.</p>

<p>The <dfn id=attr-output-for title=attr-output-for><code>for</code></dfn> content attribute allows an explicit
relationship to be made between the result of a calculation and the elements that represent the
Expand Down
14 changes: 10 additions & 4 deletions source
Expand Up @@ -19891,11 +19891,14 @@ looked pleased.&lt;/p></pre>
<dd>Uses <code>HTMLElement</code>.</dd>
</dl><!--TOPIC:HTML-->

<p>The <code>samp</code> element <span>represents</span> (sample) output from a program or
computing system.</p>
<p>The <code>samp</code> element <span>represents</span> sample or quoted output from another
program or computing system.</p>

<p class="note">See the <code>pre</code> and <code>kbd</code> elements for more details.</p>

<p class="note">This element can be contrasted with the <code>output</code> element, which can be
used to provide immediate output in a Web application.</p>

<div class="example">
<p>This example shows the <code>samp</code> element being used
inline:</p>
Expand Down Expand Up @@ -50272,8 +50275,11 @@ Daddy">&lt;/textarea></pre>
</dd>
</dl><!--TOPIC:HTML-->

<p>The <code>output</code> element <span>represents</span> the result of a calculation or user
action.</p>
<p>The <code>output</code> element <span>represents</span> the result of a calculation performed
by the application, or the result of a user action.</p>

<p class="note">This element can be contrasted with the <code>samp</code> element, which is the
appropriate element for quoting the output of other programs run previously.</p>

<p>The <dfn data-x="attr-output-for"><code>for</code></dfn> content attribute allows an explicit
relationship to be made between the result of a calculation and the elements that represent the
Expand Down

0 comments on commit f52b67e

Please sign in to comment.