--- a/microdata-rdf/index.html	Fri Nov 18 12:44:33 2011 -0800
+++ b/microdata-rdf/index.html	Fri Nov 18 12:56:29 2011 -0800
@@ -387,8 +387,9 @@
     about the need for a <tref>registry</tref> and the details of processing. Among the options investigated by
     the Task Force are the following:</p>
   <ul>
-    <li>Property URI generation using the original microdata specification with a base URI and fragment
-      made up of the in-scope <tref>item type</tref> and <tref>properties</tref>.</li>
+    <li>Property URI generation using the original microdata specification with a base URI and
+      <cite><a href="http://tools.ietf.org/html/rfc3986#section-3.5">fragment</a></cite> made up of the in-scope <tref>item
+      type</tref> and <tref>properties</tref>.</li>
     <li>Vocabulary-based URI generation, where the <tref>vocabulary</tref> is determined from the
       in-scope <tref>item type</tref>, either through an algorithmic modification of the type URL or by matching the
       URL against a <tref>registry</tref>. The vocabulary URI is then used to generate property URIs in a namespace
@@ -640,8 +641,10 @@
     </dd>
   </dl>
   <p>If the <tref>registry</tref> contains no match for <tref>current type</tref> implementations act as if
-    there is a <tref>URI prefix</tref> made from the first <aref>itemtype</aref> value by stripping either
-    the fragment content or local name, if the value has no fragment.</p>
+    there is a <tref>URI prefix</tref> made from the first <aref>itemtype</aref> value by stripping either the <cite><a
+    href="http://tools.ietf.org/html/rfc3986#section-3.5">fragment</a></cite> content or <cite><a
+    href="http://tools.ietf.org/html/rfc3986#section-3.3">last path segment</a></cite>, if the value has no fragment (See
+    [[!RFC3986]]).</p>
   <p class="note">Deconstructing the <aref>itemtype</aref> URL to create or identify a vocabulary URI
     is a violation of the microdata specification which is necessary to
     support the use of existing vocabularies designed for use with RDF, and
@@ -655,7 +658,8 @@
 -->
   </pre>
   <p>In this example, assuming no matching entry in the <tref>registry</tref>,
-    the <tref>URI prefix</tref> is constructed by removing the local name, leaving the URI
+    the <tref>URI prefix</tref> is constructed by removing the
+    <cite><a href="http://tools.ietf.org/html/rfc3986#section-3.3">last path segment</a></cite>, leaving the URI
     <code>http://schema.org/</code>. As there is no explicit <tref><code>propertyURI</code></tref>,
     the default <code>vocabulary</code> is used, and the resulting property URI would be
     <code>http://schema.org/title</code>.</p>
@@ -1135,8 +1139,9 @@
       <li>If <em>name</em> is an <tref>absolute URL</tref>, return <em>name</em>
         as a <tref>URI reference</tref>.</li>
       <li>If <tref>current type</tref> from <em>context</em> is null, there can be no <tref>current vocabulary</tref>.        
-        Return the <tref>URI reference</tref> that is the <tref>document base</tref> with
-        its fragment set to the <tref>fragment-escape</tref>d value of <em>name</em></p>
+        Return the <tref>URI reference</tref> that is the <tref>document base</tref> with its <cite><a
+        href="http://tools.ietf.org/html/rfc3986#section-3.5">fragment</a></cite> set to the <tref>fragment-escape</tref>d value
+        of <em>name</em></p>
         <div class="note">
           This rule is intended to allow for a the case where no type is set, and therefore there is no
           vocabulary from which to extract rules. For example, if there is a <tref>document base</tref> of
@@ -1149,7 +1154,7 @@
         <tref>propertyURI</tref> entry that is not null, set that as <em>scheme</em>. Otherwise,
         set <em>scheme</em> to <code>vocabulary</code>.</li>
       <li id="scheme-vocab">If <em>scheme</em> is <code>vocabulary</code> return the <tref>URI reference</tref> constructed
-        by appending the fragment escaped value of <em>name</em> to <tref>current vocabulary</tref>,
+        by appending the <tref>fragment-escape</tref>d value of <em>name</em> to <tref>current vocabulary</tref>,
         separated by a U+0023 NUMBER SIGN character (#) unless the <tref>current vocabulary</tref> ends
         with either a U+0023 NUMBER SIGN character (#) or SOLIDUS U+002F (/).</li>
       <li id="scheme-context">If <em>scheme</em> is <code>contextual</code>, return the <tref>URI reference</tref>