Index: source
===================================================================
--- source	(revision 2485)
+++ source	(revision 2486)
@@ -12547,16 +12547,28 @@
   <p>The <code>q</code> element represents some <span title="phrasing
   content">phrasing content</span> quoted from another source.</p>
 
-  <p>Quotation punctuation (such as quotation marks), if any, must be
-  placed inside the <code>q</code> element.</p>
+  <p>Quotation punctuation (such as quotation marks) must not appear
+  immediately before, after, or inside <code>q</code> elements; they
+  will be inserted into the rendering by the user agent.</p>
 
   <p>Content inside a <code>q</code> element must be quoted from
   another source, whose address, if it has one, should be cited in the
-  <dfn title="attr-q-cite"><code>cite</code></dfn> attribute.</p>
+  <dfn title="attr-q-cite"><code>cite</code></dfn> attribute. The
+  source may be fictional, as when quoting characters in a novel or
+  screenplay.</p>
 
   <p>If the <code title="attr-q-cite">cite</code> attribute is
-  present, it must be a <span>valid URL</span>. User agents should allow
-  users to follow such citation links.</p>
+  present, it must be a <span>valid URL</span>. User agents should
+  allow users to follow such citation links.</p>
+
+  <p>The <code>q</code> element must not be used in place of quotation
+  marks that do not represent quotes; for example, it is inappropriate
+  to use the <code>q</code> element for marking up sarcastic
+  statements.</p>
+
+  <p>The use of <code>q</code> elements to mark up quotations is
+  entirely optional; using explicit quotation punctuation without
+  <code>q</code> elements is just as correct.</p>
 
   <p>If a <code>q</code> element is contained (directly or indirectly)
   in a <span>paragraph</span> that contains a single <code>cite</code>
@@ -12570,8 +12582,8 @@
    <p>Here is a simple example of the use of the <code>q</code>
    element:</p>
 
-   <pre>&lt;p>The man said &lt;q>"Things that are impossible just take
-longer"&lt;/q>. I disagreed with him.&lt;/p></pre>
+   <pre>&lt;p>The man said &lt;q>Things that are impossible just take
+longer&lt;/q>. I disagreed with him.&lt;/p></pre>
 
   </div>
 
@@ -12581,9 +12593,9 @@
    <code>q</code> element, and an explicit citation outside:</p>
 
    <pre>&lt;p>The W3C page &lt;cite>About W3C&lt;/cite> says the W3C's
-mission is &lt;q cite="http://www.w3.org/Consortium/">"To lead the
+mission is &lt;q cite="http://www.w3.org/Consortium/">To lead the
 World Wide Web to its full potential by developing protocols and
-guidelines that ensure long-term growth for the Web"&lt;/q>. I
+guidelines that ensure long-term growth for the Web&lt;/q>. I
 disagree with this mission.&lt;/p></pre>
 
   </div>
@@ -12593,17 +12605,30 @@
    <p>In the following example, the quotation itself contains a
    quotation:</p>
 
-   <pre>&lt;p>In &lt;cite>Example One&lt;/cite>, he writes &lt;q>"The man
-said &lt;q>'Things that are impossible just take longer'&lt;/q>. I
-disagreed with him"&lt;/q>. Well, I disagree even more!&lt;/p></pre>
+   <pre>&lt;p>In &lt;cite>Example One&lt;/cite>, he writes &lt;q>The man
+said &lt;q>Things that are impossible just take longer&lt;/q>. I
+disagreed with him&lt;/q>. Well, I disagree even more!&lt;/p></pre>
+
+  </div>
+
+  <div class="example">
+
+   <p>In the following example, quotation marks are used instead of
+   the <code>q</code> element:</p>
+
+   <pre>&lt;p>His best argument was &#x275D;I disagree&#x275E;, which
+I thought was laughable.&lt;/p></pre>
 
   </div>
 
   <div class="example">
 
-   <p>In the following example, there are no quotation marks:</p>
+   <p>In the following example, there is no quote &mdash; the
+   quotation marks are used to name a word. Use of the <code>q</code>
+   element in this case would be inappropriate.</p>
 
-   <pre>&lt;p>His best argument: &lt;q>I disagree!&lt;/q>&lt;/p></pre>
+   <pre>&lt;p>The word "ineffable" could have been used to describe the disaster
+resulting from the campaign's mismanagement.&lt;/p></pre>
 
   </div>