updated examples to use recommended cid format

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2178 4b5297f7-1745-476d-ba37-a9c6900126ab

xep-0158.xml

@@ -176,7 +176,7 @@
             http://www.victim.com/challenges/ocr.jpeg?F3A6292C
           </uri>
           <uri type='image/jpeg'>
-            cid:99f2fea6-63e0-11dd-88e6-001143d5d5db@victim.com
+            cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org
           </uri>
         </media>
       </field>
@@ -188,7 +188,7 @@
             http://www.victim.com/challenges/picture.jpeg?F3A6292C
           </uri>
           <uri type='image/jpeg'>
-            cid:1f2dc6fe-63e2-11dd-9d43-001143d5d5db@victim.com
+            cid:sha1+f2377f3a3287eac81028243079e1aa9905c466bc@bob.xmpp.org
           </uri>
         </media>
       </field>
@@ -336,7 +336,7 @@
             http://www.victim.com/challenges/ocr.jpeg?F3A6292C
           </uri>
           <uri type='image/jpeg'>
-            cid:99f2fea6-63e0-11dd-88e6-001143d5d5db@victim.com
+            cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org
           </uri>
         </media>
       </field>
@@ -488,7 +488,7 @@
             http://www.victim.com/challenges/picture.jpeg?A4C7303D
           </uri>
           <uri type='image/jpeg'>
-            cid:1f2dc6fe-63e2-11dd-9d43-001143d5d5db@victim.com
+            cid:sha1+f2377f3a3287eac81028243079e1aa9905c466bc@bob.xmpp.org
           </uri>
         </media>
       </field>

xep-0221.xml

@@ -75,7 +75,7 @@
     http://victim.example.com/challenges/speech.wav?F3A6292C
   </uri>
   <uri type='audio/ogg; codecs=speex'>
-    cid:eb52a668-63d9-11dd-8065-001143d5d5db@victim.example.com
+    cid:sha1+a15a505e360702b79c75a5f67773072ed392f52a@bob.xmpp.org
   </uri>
   <uri type='audio/mpeg'>
     http://victim.example.com/challenges/speech.mp3?F3A6292C
@@ -95,7 +95,7 @@
         http://www.victim.com/challenges/ocr.jpeg?F3A6292C
       </uri>
       <uri type='image/jpeg'>
-        cid:99f2fea6-63e0-11dd-88e6-001143d5d5db@victim.example.com
+        cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org
       </uri>
     </media>
   </field>

xep-0231.xml

@@ -141,12 +141,13 @@
       <p>
         Yet here's a spot.
         <img alt='A spot'
-             src='cid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6@shakespeare.lit'/></p>
+             src='cid:sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org'/>
+      </p>
     </body>
   </html>
 </message>
     ]]></example>
-    <p>The recipient can then retrieve the data from the sender.</p>
+    <p>The recipient can then retrieve the data from the sender as described in the next section.</p>
   </section2>
 
   <section2 topic='Retrieving Uncached Data' anchor='retrieving'>
@@ -157,7 +158,7 @@
     to='ladymacbeth@shakespeare.lit/castle'
     type='get'>
   <data xmlns='urn:xmpp:tmp:bob' 
-        cid='f81d4fae-7dec-11d0-a765-00a0c91e6bf6@shakespeare.lit'/>
+        cid='sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org'/>
 </iq>
     ]]></example>
     <p>The recipient then would either return an error (e.g., &notfound; if it does not have data matching the Content-ID) or return the data.</p>
@@ -167,7 +168,7 @@
     to='doctor@shakespeare.lit/pda'
     type='result'>
   <data xmlns='urn:xmpp:tmp:bob' 
-        cid='f81d4fae-7dec-11d0-a765-00a0c91e6bf6@shakespeare.lit'
+        cid='sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org'/>
         max-age='86400'
         type='image/png'>
     iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGP
@@ -217,7 +218,7 @@
     <p>The following example illustrates the format (line endings are provided for readability only).</p>
     <example caption='Data element format'><![CDATA[
 <data xmlns='urn:xmpp:tmp:bob' 
-      cid='f81d4fae-7dec-11d0-a765-00a0c91e6bf6@shakespeare.lit'
+      cid='sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org'/>
       max-age='86400'
       type='image/png'>
   iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGP