- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 25 Jul 2011 19:46:28 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv22599
Modified Files:
spec.html text-level-semantics.html
Log Message:
expand on <var>'s definition. (whatwg r6323)
[updated by splitter]
Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec/text-level-semantics.html,v
retrieving revision 1.1046
retrieving revision 1.1047
diff -u -d -r1.1046 -r1.1047
--- text-level-semantics.html 22 Jul 2011 07:46:35 -0000 1.1046
+++ text-level-semantics.html 25 Jul 2011 19:46:25 -0000 1.1047
@@ -1315,10 +1315,11 @@
<dd><a href="elements.html#global-attributes">Global attributes</a></dd>
<dt>DOM interface:</dt>
<dd>Uses <code><a href="elements.html#htmlelement">HTMLElement</a></code>.</dd>
- </dl><p>The <code><a href="#the-var-element">var</a></code> element <a href="rendering.html#represents">represents</a> a
- variable. This could be an actual variable in a mathematical
- expression or programming context, or it could just be a term used
- as a placeholder in prose.</p><div class="example">
+ </dl><p>The <code><a href="#the-var-element">var</a></code> element <a href="rendering.html#represents">represents</a> a variable.
+ This could be an actual variable in a mathematical expression or
+ programming context, an identifier representing a constant, a
+ function parameter, or just be a term used as a placeholder in
+ prose.</p><div class="example">
<p>In the paragraph below, the letter "n" is being used as a
variable in prose:</p>
<pre><p>If there are <var>n</var> pipes leading to the ice
@@ -1350,6 +1351,16 @@
</figcaption>
</figure></pre>
+ </div><div class="example">
+
+ <p>Here, the equation describing mass-energy equivalence is used in
+ a sentence, and the <code><a href="#the-var-element">var</a></code> element is used to mark the
+ variables and constants in that equation:</p>
+
+ <pre><p>Then he turned to the blackboard and picked up the chalk. After a few moment's
+thought, he wrote <var>E</var> = <var>m</var> <var>c</var><sup>2</sup>. The teacher
+looked pleased.</p></pre>
+
</div><h4 id="the-samp-element"><span class="secno">4.6.13 </span>The <dfn><code>samp</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
<dd><a href="content-models.html#flow-content">Flow content</a>.</dd>
<dd><a href="content-models.html#phrasing-content">Phrasing content</a>.</dd>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1571
retrieving revision 1.1572
diff -u -d -r1.1571 -r1.1572
--- spec.html 24 Jul 2011 02:46:50 -0000 1.1571
+++ spec.html 25 Jul 2011 19:46:25 -0000 1.1572
@@ -322,7 +322,7 @@
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
- <h2 class="no-num no-toc" id="editor-s-draft-24-july-2011">Editor's Draft 24 July 2011</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-25-july-2011">Editor's Draft 25 July 2011</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -347,7 +347,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.5053.
+This is revision 1.5054.
</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
@@ -468,7 +468,7 @@
Group</a> is the W3C working group responsible for this
specification's progress along the W3C Recommendation
track.
- This specification is the 24 July 2011 Editor's Draft.
+ This specification is the 25 July 2011 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
Received on Monday, 25 July 2011 19:46:29 UTC