From 15542cb4ca6a08c8d92945e43662d4faa71d39e8 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@directdigitalllc.com>
Date: Thu, 2 Jul 2015 11:23:38 -0400
Subject: [PATCH] per #79 this removes all acct: to replace with http://

---
 activitystreams2-vocabulary.html | 444 +++++++++++++++----------------
 activitystreams2.html            |  30 +--
 2 files changed, 237 insertions(+), 237 deletions(-)

diff --git a/activitystreams2-vocabulary.html b/activitystreams2-vocabulary.html
index fa805a2..d5e9cb2 100644
--- a/activitystreams2-vocabulary.html
+++ b/activitystreams2-vocabulary.html
@@ -1196,7 +1196,7 @@ <h2>Activity Types</h2>
   },
   "object": {
     "@type": "Invite",
-    "actor": "acct:john@example.org",
+    "actor": "http://john.example.org",
     "object": {
       "@type": "Event",
       "displayName": "A Party!"
@@ -1218,7 +1218,7 @@ <h2>Activity Types</h2>
   &lt;span itemprop="object" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Invite">
     &lt;link itemprop="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span itemprop="object" itemscope
       itemtype="http://www.w3.org/ns/activitystreams#Event">
@@ -1241,7 +1241,7 @@ <h2>Activity Types</h2>
   accepted
   &lt;span property="object" typeof="Invite">
     &lt;link property="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span property="object" typeof="Event">
       &lt;span property="displayName">
@@ -1281,7 +1281,7 @@ <h2>Activity Types</h2>
   ] ;
   as:object [
     a as:Invite ;
-      as:actor &lt;acct:john@example.org&gt; ;
+      as:actor &lt;http://john.example.org&gt; ;
       as:object [
         a as:Event ;
           as:displayName "A Party!" .
@@ -1336,7 +1336,7 @@ <h2>Activity Types</h2>
   },
   "object": {
     "@type": "Invite",
-    "actor": "acct:john@example.org",
+    "actor": "http://john.example.org",
     "object": {
       "@type": "Event",
       "displayName": "A Party!"
@@ -1358,7 +1358,7 @@ <h2>Activity Types</h2>
   &lt;span itemprop="object" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Invite">
     &lt;link itemprop="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span itemprop="object" itemscope
       itemtype="http://www.w3.org/ns/activitystreams#Event">
@@ -1381,7 +1381,7 @@ <h2>Activity Types</h2>
   tentatively accepted
   &lt;span property="object" typeof="Invite">
     &lt;link property="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span property="object" typeof="Event">
       &lt;span property="displayName">
@@ -1400,7 +1400,7 @@ <h2>Activity Types</h2>
   tentatively accepted
   &lt;span class="p-item h-as-invite">
     &lt;link class="u-author"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span class="p-item h-event">
       &lt;span class="p-name">A Party!&lt;/span>
@@ -1419,7 +1419,7 @@ <h2>Activity Types</h2>
   ] ;
   as:object [
     a as:Invite ;
-      as:actor &lt;acct:john@example.org&gt; ;
+      as:actor &lt;http://john.example.org&gt; ;
       as:object [
         a as:Event ;
           as:displayName "A Party!" .
@@ -2940,7 +2940,7 @@ <h2>Activity Types</h2>
   },
   "object": {
     "@type": "Invite",
-    "actor": "acct:john@example.org",
+    "actor": "http://john.example.org",
     "object": {
       "@type": "Event",
       "displayName": "A Party!"
@@ -2962,7 +2962,7 @@ <h2>Activity Types</h2>
   &lt;span itemprop="object" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Invite">
     &lt;link itemprop="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span itemprop="object" itemscope
       itemtype="http://www.w3.org/ns/activitystreams#Event">
@@ -2985,7 +2985,7 @@ <h2>Activity Types</h2>
   rejected
   &lt;span property="object" typeof="Invite">
     &lt;link property="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span property="object" typeof="Event">
       &lt;span property="displayName">
@@ -3005,7 +3005,7 @@ <h2>Activity Types</h2>
   &lt;span class="p-item h-as-invite">
     &lt;span class="p-author h-card">
       &lt;link class="u-url"
-        href="acct:john@example.org">John's&lt;/link>
+        href="http://john.example.org">John's&lt;/link>
     &lt;/span>
     invitation to
     &lt;span class="p-item h-event">
@@ -3025,7 +3025,7 @@ <h2>Activity Types</h2>
   ] ;
   as:object [
     a as:Invite ;
-      as:actor &lt;acct:john@example.org&gt; ;
+      as:actor &lt;http://john.example.org&gt; ;
       as:object [
         a as:Event ;
           as:displayName "A Party!" .
@@ -3077,7 +3077,7 @@ <h2>Activity Types</h2>
   },
   "object": {
     "@type": "Invite",
-    "actor": "acct:john@example.org",
+    "actor": "http://john.example.org",
     "object": {
       "@type": "Event",
       "displayName": "A Party!"
@@ -3099,7 +3099,7 @@ <h2>Activity Types</h2>
   &lt;span itemprop="object" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Invite">
     &lt;link itemprop="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span itemprop="object" itemscope
       itemtype="http://www.w3.org/ns/activitystreams#Event">
@@ -3122,7 +3122,7 @@ <h2>Activity Types</h2>
   tentatively rejected
   &lt;span property="object" typeof="Invite">
     &lt;link property="actor"
-      href="acct:john@example.org">John's&lt;/link>
+      href="http://john.example.org">John's&lt;/link>
       invitation to
     &lt;span property="object" typeof="Event">
       &lt;span property="displayName">
@@ -3142,7 +3142,7 @@ <h2>Activity Types</h2>
   &lt;span class="p-item h-as-invite">
     &lt;span class="p-author h-card">
       &lt;link class="u-url"
-        href="acct:john@example.org">John's&lt;/link>
+        href="http://john.example.org">John's&lt;/link>
     &lt;/span>
     invitation to
     &lt;span class="p-item h-event">
@@ -3162,7 +3162,7 @@ <h2>Activity Types</h2>
   ] ;
   as:object [
     a as:Invite ;
-      as:actor &lt;acct:john@example.org&gt; ;
+      as:actor &lt;http://john.example.org&gt; ;
       as:object [
         a as:Event ;
           as:displayName "A Party!" .
@@ -3452,12 +3452,12 @@ <h2>Activity Types</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Undo",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": {
     "@type": "Offer",
-    "actor": "acct:sally@example.org",
+    "actor": "http://sally.example.org",
     "object": "http://example.org/posts/1",
-    "target": "acct:john@example.org"
+    "target": "http://john.example.org"
   }
 }</pre>
   </div>
@@ -3466,14 +3466,14 @@ <h2>Activity Types</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Undo">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   stopped
   &lt;span itemprop="object" itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
     &lt;link itemprop="actor"
-    href="acct:sally@example.org" />
+    href="http://sally.example.org" />
     sharing
     &lt;a itemprop="object"
       href="http://example.org/posts/1">
@@ -3481,7 +3481,7 @@ <h2>Activity Types</h2>
     &lt;/a>
     with
     &lt;link itemprop="target"
-      href="acct:john@example.org">
+      href="http://john.example.org">
       John
     &lt;/link>
   &lt;/span>
@@ -3492,13 +3492,13 @@ <h2>Activity Types</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Undo">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   stopped
   &lt;span property="object" typeof="Offer">
     &lt;link property="actor"
-    href="acct:sally@example.org" />
+    href="http://sally.example.org" />
     sharing
     &lt;a property="object"
       href="http://example.org/posts/1">
@@ -3506,7 +3506,7 @@ <h2>Activity Types</h2>
     &lt;/a>
     with
     &lt;link property="target"
-      href="acct:john@example.org">
+      href="http://john.example.org">
       John
     &lt;/link>
   &lt;/span>
@@ -3515,7 +3515,7 @@ <h2>Activity Types</h2>
   <div id="ex32-microformats" style="display: none;">
 <pre class="example highlight html"
 >&lt;div class="h-as-undo">
-  &lt;link class="u-author"href="acct:sally@example.org">
+  &lt;link class="u-author"href="http://sally.example.org">
     Sally
   &lt;/link>
   stopped
@@ -3527,7 +3527,7 @@ <h2>Activity Types</h2>
     &lt;/a>
     with
     &lt;link class="u-as-target"
-      href="acct:john@example.org">
+      href="http://john.example.org">
       John
     &lt;/link>
   &lt;/span>
@@ -3538,12 +3538,12 @@ <h2>Activity Types</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Undo ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object [
     a as:Offer ;
-    as:actor &lt;acct:sally@example.org&gt; ;
+    as:actor &lt;http://sally.example.org&gt; ;
     as:object &lt;http://example.org/posts/1&gt; ;
-    as:target &lt;acct:john@example.org&gt; .
+    as:target &lt;http://john.example.org&gt; .
   ] .
 </pre>
   </div>
@@ -4376,12 +4376,12 @@ <h2>Activity Types</h2>
   "@type": "Announce",
   "actor": {
     "@type": "Person",
-    "@id": "acct:sally@example.org",
+    "@id": "http://sally.example.org",
     "displayName": "Sally"
   },
   "object": {
     "@type": "Arrive",
-    "actor": "acct:sally@example.org",
+    "actor": "http://sally.example.org",
     "location": {
       "@type": "Place",
       "displayName": "Work"
@@ -4395,14 +4395,14 @@ <h2>Activity Types</h2>
   itemtype="http://www.w3.org/ns/activitystreams#Announce">
   &lt;span itemprop="actor" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Person"
-    itemid="acct:sally@example.org">
+    itemid="http://sally.example.org">
     &lt;span itemprop="displayName">Sally&lt;/span>
   &lt;/span>
   announced
   &lt;span itemprop="object" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Arrive">
     &lt;span itemprop="actor" itemscope="Person"
-      itemid="acct:sally@example.org">her&lt;/span>
+      itemid="http://sally.example.org">her&lt;/span>
     &lt;span itemprop="location" itemscope
       itemtype="http://www.w3.org/ns/activitystreams#Place">
       at &lt;span itemprop="displayName">Work&lt;/span>
@@ -4415,13 +4415,13 @@ <h2>Activity Types</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Announce">
   &lt;span property="actor" typeof="Person"
-    resource="acct:sally@example.org">
+    resource="http://sally.example.org">
     &lt;span property="displayName">Sally&lt;/span>
   &lt;/span>
   announced
   &lt;span property="object" typeof="Arrive">
     &lt;span property="actor" typeof="Person"
-      resource="acct:sally@example.org">her&lt;/span>
+      resource="http://sally.example.org">her&lt;/span>
     &lt;span property="location" typeof="Place">
       at &lt;span property="displayName">Work&lt;/span>
     &lt;/span>
@@ -4445,14 +4445,14 @@ <h2>Activity Types</h2>
 <pre class="example highlight turtle">
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
-&lt;acct:sally@example.org&gt; a as:Person ;
+&lt;http://sally.example.org&gt; a as:Person ;
   as:displayName "Sally" .
 
 _:b0 a as:Announce ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object [
     a as:Arrive ;
-      as:actor &lt;acct:sally@example.org&gt; ;
+      as:actor &lt;http://sally.example.org&gt; ;
       as:location [
         a as:Place ;
           as:displayName "Work" .
@@ -4498,8 +4498,8 @@ <h2>Activity Types</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Block",
-  "actor": "acct:sally@example.org",
-  "object": "acct:joe@example.org"
+  "actor": "http://sally.example.org",
+  "object": "http://joe.example.org"
 }</pre>
 </div>
 <div id="ex173-microdata" style="display:none;">
@@ -4507,10 +4507,10 @@ <h2>Activity Types</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Block">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   blocked
   &lt;link itemprop="object"
-    href="acct:joe@example.org">Joe&lt;/link>
+    href="http://joe.example.org">Joe&lt;/link>
 &lt;/div></pre>
   </div>
   <div id="ex173-rdfa" style="display:none;">
@@ -4518,20 +4518,20 @@ <h2>Activity Types</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Block">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   blocked
   &lt;link property="object"
-    href="acct:joe@example.org">Joe&lt;/link>
+    href="http://joe.example.org">Joe&lt;/link>
 &lt;/div></pre>
   </div>
   <div id="ex173-microformats" style="display:none;">
 <pre class="example highlight html"
 >&lt;div class="h-as-block">
   &lt;link class="u-actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   blocked
   &lt;link class="u-item"
-    href="acct:joe@example.org">Joe&lt;/link>
+    href="http://joe.example.org">Joe&lt;/link>
 &lt;/div></pre>
   </div>
 <div id="ex173-turtle" style="display: none;">
@@ -4539,8 +4539,8 @@ <h2>Activity Types</h2>
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Block ;
-  as:actor &lt;acct:sally@example.org&gt; ;
-  as:object &lt;acct:joe@example.org&gt;.</pre>
+  as:actor &lt;http://sally.example.org&gt; ;
+  as:object &lt;http://joe.example.org&gt;.</pre>
   </div>
 </div>
             </td>
@@ -4584,7 +4584,7 @@ <h2>Activity Types</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Flag",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": {
     "@type": "Note",
     "content": "An inappropriate note"
@@ -4596,7 +4596,7 @@ <h2>Activity Types</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Flag">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   flagged
   &lt;span itemprop="object" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Note">
@@ -4611,7 +4611,7 @@ <h2>Activity Types</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Flag">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   flagged
   &lt;span property="object" typeof="Note">
     "&lt;span property="content">
@@ -4624,7 +4624,7 @@ <h2>Activity Types</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-flag">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   flagged
   &lt;span class="p-item h-entry">
     "&lt;span class="e-content">An inappropriate note&lt;/span>"
@@ -4636,7 +4636,7 @@ <h2>Activity Types</h2>
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Flag ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object [
     a as:Note ;
       as:content "An inappropriate note" .
@@ -4682,7 +4682,7 @@ <h2>Activity Types</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Dislike",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1"
 }</pre>
 </div>
@@ -4691,7 +4691,7 @@ <h2>Activity Types</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Dislike">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   dislikes
   &lt;a itemprop="object" href="http://example.org/posts/1">
     http://example.org/posts/1
@@ -4703,7 +4703,7 @@ <h2>Activity Types</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Dislike">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   dislikes
   &lt;a property="object" href="http://example.org/posts/1">
     http://example.org/posts/1
@@ -4714,7 +4714,7 @@ <h2>Activity Types</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-dislike">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   dislikes
   &lt;a class="u-dislike-of" href="http://example.org/posts/1">
     http://example.org/posts/1
@@ -4726,7 +4726,7 @@ <h2>Activity Types</h2>
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Dislike ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; .</pre>
   </div>
 </div>
@@ -5386,7 +5386,7 @@ <h2>Object Types</h2>
   "@type": "Article",
   "displayName": "A Blog Post",
   "content": "&lt;div>... a long blog post&lt;/div>",
-  "attributedTo": "acct:sally@example.org"
+  "attributedTo": "http://sally.example.org"
 }</pre>
 </div>
 <div id="ex43-microdata" style="display:none;">
@@ -5395,7 +5395,7 @@ <h2>Object Types</h2>
   itemtype="http://www.w3.org/ns/activitystreams#Article">
   &lt;h2 itemprop="displayName">A Blog Post&lt;/h2>
   &lt;div>By &lt;a itemprop="attributedTo"
-    href="acct:sally@example.org">Sally&lt;/a>&lt;/div>
+    href="http://sally.example.org">Sally&lt;/a>&lt;/div>
   &lt;section itemprop="content"
     &lt;div>... a long blog post&lt;/div>
   &lt;/section>
@@ -5407,7 +5407,7 @@ <h2>Object Types</h2>
   typeof="Article">
   &lt;h2 property="displayName">A Blog Post&lt;/h2>
   &lt;div>By &lt;a property="attributedTo"
-    href="acct:sally@example.org">Sally&lt;/a>&lt;/div>
+    href="http://sally.example.org">Sally&lt;/a>&lt;/div>
   &lt;section property="content"
     &lt;div>... a long blog post&lt;/div>
   &lt;/section>
@@ -5419,7 +5419,7 @@ <h2>Object Types</h2>
   &lt;h2 class="p-name">A Blog Post&lt;/h2>
   &lt;div class="p-author h-card">
     By &lt;a class="p-name u-url"
-    href="acct:sally@example.org">Sally&lt;/a>
+    href="http://sally.example.org">Sally&lt;/a>
   &lt;/div>
   &lt;section class="e-content"
     &lt;div>... a long blog post&lt;/div>
@@ -5433,7 +5433,7 @@ <h2>Object Types</h2>
 _:b0 a as:Article ;
   as:displayName "A Blog Post" ;
   as:content "&lt;div>... a long blog post&lt;/div>" ;
-  as:attributedTo &lt;acct:sally@example.org&gt; .</pre>
+  as:attributedTo &lt;http://sally.example.org&gt; .</pre>
   </div>
 </div>            </td>
           </tr>
@@ -7207,12 +7207,12 @@ <h2>Representing Relationships Between Entities</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Create",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": {
     "@type": "Relationship",
-    "subject": "acct:sally@example.org",
+    "subject": "http://sally.example.org",
     "relationship": "http://purl.org/vocab/relationship/closeFriendOf",
-    "object": "acct:matt@example.org",
+    "object": "http://matt.example.org",
     "startTime": "2015-04-21T12:34:56"
   }
 }</pre>
@@ -7412,7 +7412,7 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/foo"
 }</pre>
 </div>
@@ -7421,7 +7421,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   offered
   &lt;a itemprop="object"
     href="http://example.org/foo">
@@ -7434,7 +7434,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   offered
   &lt;a property="object"
     href="http://example.org/foo">
@@ -7446,7 +7446,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   offered
   &lt;a class="u-item"
     href="http://example.org/foo">
@@ -7459,7 +7459,7 @@ <h2>Properties</h2>
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/foo&gt; .</pre>
   </div>
 </div>
@@ -7479,7 +7479,7 @@ <h2>Properties</h2>
   "@type": "Offer",
   "actor": {
     "@type": "Person",
-    "@id": "acct:sally@example.org",
+    "@id": "http://sally.example.org",
     "displayName": "Sally"
   },
   "object": "http://example.org/foo"
@@ -7491,7 +7491,7 @@ <h2>Properties</h2>
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;span itemprop="actor" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Person"
-    itemid="acct:sally@example.org">
+    itemid="http://sally.example.org">
     &lt;span itemprop="displayName">Sally&lt;/span>
   &lt;/span>
   offered
@@ -7506,7 +7506,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;span property="actor" typeof="Person"
-    resource="acct:sally@example.org">
+    resource="http://sally.example.org">
     &lt;span property="displayName">Sally&lt;/span>
   &lt;/span>
   offered
@@ -7533,11 +7533,11 @@ <h2>Properties</h2>
 <pre class="example highlight turtle">
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
-&lt;acct:sally@example.org&gt; a as:Person ;
+&lt;http://sally.example.org&gt; a as:Person ;
   as:displayName "Sally" .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/foo&gt; .</pre>
   </div>
 </div>
@@ -7555,10 +7555,10 @@ <h2>Properties</h2>
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
   "actor": [
-    "acct:joe@example.org",
+    "http://joe.example.org",
     {
       "@type": "Person",
-      "@id": "acct:sally@example.org",
+      "@id": "http://sally.example.org",
       "displayName": "Sally"
     }
   ],
@@ -7570,11 +7570,11 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:joe@example.org">Joe&lt;/link>
+    href="http://joe.example.org">Joe&lt;/link>
   and
   &lt;span itemprop="actor" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Person"
-    itemid="acct:sally@example.org">
+    itemid="http://sally.example.org">
     &lt;span itemprop="displayName">Sally&lt;/span>
   &lt;/span>
   offered
@@ -7589,10 +7589,10 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:joe@example.org">Joe&lt;/link>
+    href="http://joe.example.org">Joe&lt;/link>
   and
   &lt;span property="actor" typeof="Person"
-    resource="acct:sally@example.org">
+    resource="http://sally.example.org">
     &lt;span property="displayName">Sally&lt;/span>
   &lt;/span>
   offered
@@ -7606,11 +7606,11 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author"
-    href="acct:joe@example.org">Joe&lt;/link>
+    href="http://joe.example.org">Joe&lt;/link>
   and
   &lt;span class="p-author h-card">
     &lt;link class="u-url p-name"
-      href="acct:sally@example.org">Sally&lt;/link>
+      href="http://sally.example.org">Sally&lt;/link>
   &lt;/span>
   offered
   &lt;a class="u-item"
@@ -7623,13 +7623,13 @@ <h2>Properties</h2>
 <pre class="example highlight turtle">
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
-&lt;acct:sally@example.org&gt; a as:Person ;
+&lt;http://sally.example.org&gt; a as:Person ;
   as:displayName "Sally" .
 
 _:b0 a as:Offer ;
   as:actor (
-    &lt;acct:sally@example.org&gt;
-    &lt;acct:joe@example.org&gt;
+    &lt;http://sally.example.org&gt;
+    &lt;http://joe.example.org&gt;
   );
   as:object &lt;http://example.org/foo&gt; .</pre>
   </div>
@@ -7871,7 +7871,7 @@ <h2>Properties</h2>
   "displayName": "A Simple Image",
   "url": "http://example.org/cat.jpeg",
   "attributedTo": [
-    "acct:joe@example.org",
+    "http://joe.example.org",
     {
       "@type": "Person",
       "displayName": "Sally"
@@ -7891,7 +7891,7 @@ <h2>Properties</h2>
     &lt;span itemprop="displayName">Sally&lt;/span>
   &lt;/span> and
   &lt;link itemprop="attributedTo"
-    href="acct:joe@example.org">Joe&lt;link>
+    href="http://joe.example.org">Joe&lt;link>
 &lt;/div></pre>
   </div>
   <div id="ex66-rdfa" style="display:none;">
@@ -7905,7 +7905,7 @@ <h2>Properties</h2>
     &lt;span property="displayName">Sally&lt;/span>"
   &lt;/span> and
   &lt;link property="attributedTo"
-    href="acct:joe@example.org">Joe&lt;link>
+    href="http://joe.example.org">Joe&lt;link>
 &lt;/div></pre>
   </div>
   <div id="ex66-microformats" style="display:none;">
@@ -7919,7 +7919,7 @@ <h2>Properties</h2>
   &lt;/span>
   and
   &lt;link class="u-author"
-    href="acct:joe@example.org">Joe&lt;/link>
+    href="http://joe.example.org">Joe&lt;/link>
 &lt;/div></pre>
   </div>
 <div id="ex66-turtle" style="display: none;">
@@ -7930,7 +7930,7 @@ <h2>Properties</h2>
   as:displayName "A Simple Image" ;
   as:url &lt;http://example.org/cat.jpeg&gt; ;
   as:attributedTo (
-    &lt;acct:joe@example.org&gt;
+    &lt;http://joe.example.org&gt;
     [
       a as:Person ;
         as:displayName "Sally" .
@@ -7976,10 +7976,10 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
-  "target": "acct:john@example.org",
-  "bcc": [ "acct:joe@example.org" ]
+  "target": "http://john.example.org",
+  "bcc": [ "http://joe.example.org" ]
 }</pre>
   </div>
   <div id="ex68-microdata" style="display: none;">
@@ -7987,7 +7987,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -7997,11 +7997,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link itemprop="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (bcc: &lt;link itemprop="bcc"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8011,7 +8011,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -8021,11 +8021,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link property="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (bcc: &lt;link property="bcc"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8034,7 +8034,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;link>
+    href="http://sally.example.org">Sally&lt;link>
   offered
   &lt;a class="u-offer-of"
     href="http://example.org/posts/1">
@@ -8042,11 +8042,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link class="u-as-target"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       John
   &lt;link>
   (bcc: &lt;link class="u-as-bcc"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8056,10 +8056,10 @@ <h2>Properties</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
-  as:target &lt;acct:john@example.org&gt; ;
-  as:bcc &lt;acct:joe@example.org&gt; .
+  as:target &lt;http://john.example.org&gt; ;
+  as:bcc &lt;http://joe.example.org&gt; .
 </pre>
   </div>
 </div>
@@ -8100,10 +8100,10 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
-  "target": "acct:john@example.org",
-  "bto": [ "acct:joe@example.org" ]
+  "target": "http://john.example.org",
+  "bto": [ "http://joe.example.org" ]
 }</pre>
   </div>
   <div id="ex69-microdata" style="display: none;">
@@ -8111,7 +8111,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -8121,11 +8121,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link itemprop="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (bto: &lt;link itemprop="bto"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8135,7 +8135,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -8145,11 +8145,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link property="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (bto: &lt;link property="bto"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8158,7 +8158,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       Sally
   &lt;link>
   offered
@@ -8168,11 +8168,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link class="u-as-target"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       John
   &lt;link>
   (bto: &lt;link class="u-as-bto"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8182,10 +8182,10 @@ <h2>Properties</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
-  as:target &lt;acct:john@example.org&gt; ;
-  as:bto &lt;acct:joe@example.org&gt; .
+  as:target &lt;http://john.example.org&gt; ;
+  as:bto &lt;http://joe.example.org&gt; .
 </pre>
   </div>
 </div>
@@ -8226,10 +8226,10 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
-  "target": "acct:john@example.org",
-  "cc": [ "acct:joe@example.org" ]
+  "target": "http://john.example.org",
+  "cc": [ "http://joe.example.org" ]
 }</pre>
   </div>
   <div id="ex70-microdata" style="display: none;">
@@ -8237,7 +8237,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -8247,11 +8247,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link itemprop="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (cc: &lt;link itemprop="cc"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8261,7 +8261,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -8271,11 +8271,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link property="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (cc: &lt;link property="cc"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8284,7 +8284,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       Sally
   &lt;link>
   offered
@@ -8294,11 +8294,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link class="u-as-target"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       John
   &lt;link>
   (cc: &lt;link class="u-as-cc"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -8308,10 +8308,10 @@ <h2>Properties</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
-  as:target &lt;acct:john@example.org&gt; ;
-  as:cc &lt;acct:joe@example.org&gt; .
+  as:target &lt;http://john.example.org&gt; ;
+  as:cc &lt;http://joe.example.org&gt; .
 </pre>
   </div>
 </div>
@@ -8355,14 +8355,14 @@ <h2>Properties</h2>
   "items": [
     {
       "@type": "Offer",
-      "actor": "acct:sally@example.org",
+      "actor": "http://sally.example.org",
       "object": "http://example.org/posts/1",
-      "target": "acct:john@example.org",
+      "target": "http://john.example.org",
       "context": "http://example.org/contexts/1"
     },
     {
       "@type": "Like",
-      "actor": "acct:joe@example.org",
+      "actor": "http://joe.example.org",
       "object": "http://example.org/posts/2",
       "context": "http://example.org/contexts/1"
     }
@@ -8376,7 +8376,7 @@ <h2>Properties</h2>
     &lt;li itemprop="items" itemscope
       itemtype="http://www.w3.org/ns/activitystreams#Offer">
       &lt;span itemprop="actor"
-        itemid="acct:sally@example.org">
+        itemid="http://sally.example.org">
           Sally
       &lt;span>
       offered
@@ -8386,7 +8386,7 @@ <h2>Properties</h2>
       &lt;/a>
       with
       &lt;link itemprop="target"
-        href="acct:john@example.org">
+        href="http://john.example.org">
           John
       &lt;link>
       &lt;link itemprop="context"
@@ -8395,7 +8395,7 @@ <h2>Properties</h2>
     &lt;li itemprop="items" itemscope
       itemtype="http://www.w3.org/ns/activitystreams#Like">
       &lt;span itemprop="actor"
-        itemid="acct:joe@example.org">
+        itemid="http://joe.example.org">
           Joe
       &lt;span>
       liked
@@ -8416,7 +8416,7 @@ <h2>Properties</h2>
   &lt;ul>
     &lt;li property="items" typeof="Offer">
       &lt;span property="actor"
-        resource="acct:sally@example.org">
+        resource="http://sally.example.org">
           Sally
       &lt;span>
       offered
@@ -8426,7 +8426,7 @@ <h2>Properties</h2>
       &lt;/a>
       with
       &lt;link property="target"
-        href="acct:john@example.org">
+        href="http://john.example.org">
           John
       &lt;link>
       &lt;link property="context"
@@ -8434,7 +8434,7 @@ <h2>Properties</h2>
     &lt;/li>
     &lt;li property="items" typeof="Like">
       &lt;span property="actor"
-        resource="acct:joe@example.org">
+        resource="http://joe.example.org">
           Joe
       &lt;span>
       liked
@@ -8454,7 +8454,7 @@ <h2>Properties</h2>
   &lt;ul class="p-as-items">
     &lt;li class="h-as-offer">
       &lt;link class="u-author"
-        href="acct:sally@example.org">
+        href="http://sally.example.org">
           Sally
       &lt;link>
       offered
@@ -8464,7 +8464,7 @@ <h2>Properties</h2>
       &lt;/a>
       with
       &lt;link class="u-as-target"
-        href="acct:john@example.org">
+        href="http://john.example.org">
           John
       &lt;link>
       &lt;link class="u-as-context"
@@ -8472,7 +8472,7 @@ <h2>Properties</h2>
     &lt;/li>
     &lt;li class="h-as-like">
       &lt;link class="u-author"
-        href="acct:joe@example.org">
+        href="http://joe.example.org">
           Joe
       &lt;link>
       liked
@@ -8494,13 +8494,13 @@ <h2>Properties</h2>
   as:items ( _:b1 _:b2 ) .
 
 _:b1 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
-  as:target &lt;acct:john@example.org&gt; ;
+  as:target &lt;http://john.example.org&gt; ;
   as:context &lt;http://example.org/contexts/1&gt; .
 
 _:b2 a as:Like ;
-  as:actor &lt;acct:joe@example.org&gt; ;
+  as:actor &lt;http://joe.example.org&gt; ;
   as:object &lt;http://example.org/posts/2&gt; ;
   as:context &lt;http://example.org/contexts/1&gt; .
 </pre>
@@ -10843,7 +10843,7 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Move",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
   "target": {
     "@type": "Collection",
@@ -10860,7 +10860,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Move">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   moved
@@ -10885,7 +10885,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Move">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   moved
@@ -10907,7 +10907,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-move">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;link>
+    href="http://sally.example.org">Sally&lt;link>
   moved
   &lt;a class="u-item"
     href="http://example.org/posts/1">
@@ -10928,7 +10928,7 @@ <h2>Properties</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Move ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
   as:target [
     a as:Collection ;
@@ -11291,7 +11291,7 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Like",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1"
 }</pre>
 </div>
@@ -11300,7 +11300,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Like">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;a itemprop="object"
     href="http://example.org/posts/1">
@@ -11313,7 +11313,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Like">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;a property="object"
     href="http://example.org/posts/1">
@@ -11325,7 +11325,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-like">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;a class="u-like-of"
     href="http://example.org/posts/1">
@@ -11338,7 +11338,7 @@ <h2>Properties</h2>
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Like
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; .</pre>
   </div>
 </div>
@@ -11355,7 +11355,7 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Like",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": {
     "@type": "Note",
     "content": "A simple note"
@@ -11367,7 +11367,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Like">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;span itemprop="object" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Note">
@@ -11382,7 +11382,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Like">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;span property="object" typeof="Note">
     "&lt;span property="content">
@@ -11395,7 +11395,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-like">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;span class="p-like-of h-entry">
     "&lt;span class="e-content">
@@ -11409,7 +11409,7 @@ <h2>Properties</h2>
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Like
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object [
     a as:Note;
       as:content "A simple note" .
@@ -11429,7 +11429,7 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Like",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": [
     "http://example.org/posts/1",
     {
@@ -11444,7 +11444,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Like">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;link itemprop="object"
     href="http://example.org/posts/1">
@@ -11463,7 +11463,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Like">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;link property="object"
     href="http://example.org/posts/1">
@@ -11480,7 +11480,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-like">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;/link>
+    href="http://sally.example.org">Sally&lt;/link>
   liked
   &lt;link class="u-like-of"
     href="http://example.org/posts/1">
@@ -11498,7 +11498,7 @@ <h2>Properties</h2>
 @prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Like
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object (
     &lt;http://example.org/posts/1&gt;
     [
@@ -11981,7 +11981,7 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": ["Activity", "urn:example:verbs:Check"],
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/flights/1",
   "result": {
     "@type": "urn:example:types:flightstatus",
@@ -11996,7 +11996,7 @@ <h2>Properties</h2>
     http://www.w3.org/ns/activitystreams#Activity
     urn:example:verbs:Check">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">Sally's&lt;/link>
+    href="http://sally.example.org">Sally's&lt;/link>
   &lt;link itemprop="object"
     href="http://example.org/flights/1">flight&lt;/link>
   is
@@ -12013,7 +12013,7 @@ <h2>Properties</h2>
     http://www.w3.org/ns/activitystreams#Activity
     urn:example:verbs:Check">
   &lt;link property="actor"
-    href="acct:sally@example.org">Sally's&lt;/link>
+    href="http://sally.example.org">Sally's&lt;/link>
   &lt;link property="object"
     href="http://example.org/flights/1">flight&lt;/link>
   is
@@ -12027,7 +12027,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-activity h-x-check">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally's&lt;/link>
+    href="http://sally.example.org">Sally's&lt;/link>
   &lt;link class="u-item"
     href="http://example.org/flights/1">flight&lt;/link>
   is
@@ -12042,7 +12042,7 @@ <h2>Properties</h2>
 
 _:b0 a as:Activity,
           &lt;urn:example:verbs:Check&gt; ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/flights/1&gt; ;
   as:result [
     a &lt;urn:example:types:flightstatus&gt; ;
@@ -12645,7 +12645,7 @@ <h2>Properties</h2>
   "tag": [
     {
       "@type": "Person",
-      "@id": "acct:sally@example.org"
+      "@id": "http://sally.example.org"
     }
   ]
 }</pre>
@@ -12745,9 +12745,9 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
-  "target": "acct:john@example.org"
+  "target": "http://john.example.org"
 }</pre>
   </div>
   <div id="ex120-microdata" style="display: none;">
@@ -12755,7 +12755,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -12765,7 +12765,7 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link itemprop="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
 &lt;/div></pre>
@@ -12775,7 +12775,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -12785,7 +12785,7 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link property="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
 &lt;/div></pre>
@@ -12794,7 +12794,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       Sally
   &lt;link>
   offered
@@ -12804,7 +12804,7 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link class="u-as-target"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       John
   &lt;link>
 &lt;/div></pre>
@@ -12814,9 +12814,9 @@ <h2>Properties</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
-  as:target &lt;acct:john@example.org&gt; .
+  as:target &lt;http://john.example.org&gt; .
 </pre>
   </div>
 </div>
@@ -12833,7 +12833,7 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
   "target": {
     "@type": "Person",
@@ -12846,7 +12846,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -12866,7 +12866,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -12885,7 +12885,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       Sally
   &lt;link>
   offered
@@ -12904,7 +12904,7 @@ <h2>Properties</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
   as:target [
     a as:Person ;
@@ -12954,10 +12954,10 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
-  "target": "acct:john@example.org",
-  "to": [ "acct:joe@example.org" ]
+  "target": "http://john.example.org",
+  "to": [ "http://joe.example.org" ]
 }</pre>
   </div>
   <div id="ex123-microdata" style="display: none;">
@@ -12965,7 +12965,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -12975,11 +12975,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link itemprop="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (to: &lt;link itemprop="to"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -12989,7 +12989,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -12999,11 +12999,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link property="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   (to: &lt;link property="to"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -13012,7 +13012,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author
-    href="acct:sally@example.org">Sally&lt;link>
+    href="http://sally.example.org">Sally&lt;link>
   offered
   &lt;a class="u-offer-of"
     href="http://example.org/posts/1">
@@ -13020,11 +13020,11 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link class="u-as-target"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       John
   &lt;link>
   (to: &lt;link class="u-as-to"
-    href="acct:joe@example.org">
+    href="http://joe.example.org">
     John
   &lt;/link>)
 &lt;/div></pre>
@@ -13034,10 +13034,10 @@ <h2>Properties</h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
-  as:target &lt;acct:john@example.org&gt; ;
-  as:to &lt;acct:joe@example.org&gt; .
+  as:target &lt;http://john.example.org&gt; ;
+  as:to &lt;http://joe.example.org&gt; .
 </pre>
   </div>
 </div>
@@ -14847,9 +14847,9 @@ <h2>Properties</h2>
 <pre class="example highlight json">{
   "@context": "http://www.w3.org/ns/activitystreams",
   "@type": "Offer",
-  "actor": "acct:sally@example.org",
+  "actor": "http://sally.example.org",
   "object": "http://example.org/posts/1",
-  "target": "acct:john@example.org",
+  "target": "http://john.example.org",
   "priority": 0.80
 }</pre>
   </div>
@@ -14858,7 +14858,7 @@ <h2>Properties</h2>
 >&lt;div itemscope
   itemtype="http://www.w3.org/ns/activitystreams#Offer">
   &lt;link itemprop="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -14868,7 +14868,7 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link itemprop="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   &lt;meta itemprop="priority" content="0.80" />
@@ -14879,7 +14879,7 @@ <h2>Properties</h2>
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#"
   typeof="Offer">
   &lt;link property="actor"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
     Sally
   &lt;/link>
   offered
@@ -14889,7 +14889,7 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link property="target"
-    href="acct:john@example.org">
+    href="http://john.example.org">
     John
   &lt;/link>
   &lt;meta property="priority" content="0.80" />
@@ -14899,7 +14899,7 @@ <h2>Properties</h2>
 <pre class="example highlight html"
 >&lt;div class="h-as-offer">
   &lt;link class="u-author"
-    href="acct:sally@example.org">Sally&lt;link>
+    href="http://sally.example.org">Sally&lt;link>
   offered
   &lt;a class="u-item"
     href="http://example.org/posts/1">
@@ -14907,7 +14907,7 @@ <h2>Properties</h2>
   &lt;/a>
   with
   &lt;link class="u-as-target"
-    href="acct:sally@example.org">
+    href="http://sally.example.org">
       John
   &lt;link>
   &lt;meta name="p-as-priority" content="0.80" />
@@ -14919,9 +14919,9 @@ <h2>Properties</h2>
 @prefix xsd: &lt;http://www.w3.org/2001/XMLSchema#&gt; .
 
 _:b0 a as:Offer ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object &lt;http://example.org/posts/1&gt; ;
-  as:target &lt;acct:john@example.org&gt; ;
+  as:target &lt;http://john.example.org&gt; ;
   as:priority "0.80"^^xsd:float .
 </pre>
   </div>
diff --git a/activitystreams2.html b/activitystreams2.html
index 2fc14fb..927307a 100644
--- a/activitystreams2.html
+++ b/activitystreams2.html
@@ -1842,7 +1842,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
   "@type": "Create",
   "actor": {
     "@type": "Person",
-    "@id": "acct:sally@example.org",
+    "@id": "http://sally.example.org",
     "displayName": "Sally Smith"
   },
   "object": {
@@ -1856,7 +1856,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
 >&lt;div itemscope itemtype="http://www.w3.org/ns/activitystreams#Create">
   &lt;div itemprop="actor" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Person"
-    itemid="acct:sally@example.org">
+    itemid="http://sally.example.org">
     &lt;span itemprop="displayName">Sally Smith&lt;/span>
   &lt;/div>
   created
@@ -1869,7 +1869,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
 <pre class="example highlight html"
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#" typeof="Create">
   &lt;div property="actor" typeof="Person"
-    resource="acct:sally@example.org">
+    resource="http://sally.example.org">
     &lt;span property="displayName">Sally Smith&lt;/span>
   &lt;/div>
   created
@@ -1893,11 +1893,11 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
   <div id="ex16-turtle" style="display:none;">
 <pre class="example highlight turtle"
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
-  &lt;acct:sally@example.org&gt; a as:Person ;
+  &lt;http://sally.example.org&gt; a as:Person ;
   as:displayName "Sally Smith" .
 
 _:b0 a as:Create ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object [
     a as:Note ;
       as:content "This is a simple note"
@@ -1923,7 +1923,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
   "@type": "Create",
   "actor": {
     "@type": "Person",
-    "@id": "acct:sally@example.org",
+    "@id": "http://sally.example.org",
     "displayName": "Sally Smith",
     "vcard:given-name": "Sally",
     "vcard:family-name": "Smith"
@@ -1939,7 +1939,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
 >&lt;div itemscope itemtype="http://www.w3.org/ns/activitystreams#Create">
   &lt;div itemprop="actor" itemscope
     itemtype="http://www.w3.org/ns/activitystreams#Person"
-    itemid="acct:sally@example.org">
+    itemid="http://sally.example.org">
     &lt;span itemprop="displayName">
       &lt;span itemprop="http://www.w3.org/2006/vcard/ns#given-name">Sally&lt;/span>
       &lt;span itemprop="http://www.w3.org/2006/vcard/ns#family-name">Smith&lt;/span>
@@ -1955,7 +1955,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
 <pre class="example highlight html"
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#" typeof="Create">
   &lt;div property="actor" typeof="Person"
-    resource="acct:sally@example.org">
+    resource="http://sally.example.org">
       &lt;span property="http://www.w3.org/2006/vcard/ns#given-name">Sally&lt;/span>
       &lt;span property="http://www.w3.org/2006/vcard/ns#family-name">Smith&lt;/span>
   &lt;/div>
@@ -1982,13 +1982,13 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 @prefix vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt; .
 
-&lt;acct:sally@example.org&gt; a as:Person ;
+&lt;http://sally.example.org&gt; a as:Person ;
   as:displayName "Sally Smith" ;
   vcard:given-name "Sally" ;
   vcard:family-name "Smith" .
 
 _:c14n0 a as:Create ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object [
     a as:Note ;
       as:content "This is a simple note"
@@ -2028,7 +2028,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
   "@type": "Create",
   "actor": {
     "@type": ["Person", "vcard:Individual"],
-    "@id": "acct:sally@example.org",
+    "@id": "http://sally.example.org",
     "displayName": "Sally Smith",
     "vcard:given-name": "Sally",
     "vcard:family-name": "Smith"
@@ -2047,7 +2047,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
     itemtype="
       http://www.w3.org/ns/activitystreams#Person
       http://www.w3.org/2006/vcard/ns#Individual"
-    itemid="acct:sally@example.org">
+    itemid="http://sally.example.org">
     &lt;span itemprop="displayName">
       &lt;span itemprop="http://www.w3.org/2006/vcard/ns#given-name">Sally&lt;/span>
       &lt;span itemprop="http://www.w3.org/2006/vcard/ns#family-name">Smith&lt;/span>
@@ -2063,7 +2063,7 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
 <pre class="example highlight html"
 >&lt;div vocab="http://www.w3.org/ns/activitystreams#" typeof="Create">
   &lt;div property="actor" typeof="Person http://www.w3.org/2006/vcard/ns#Individual"
-    resource="acct:sally@example.org">
+    resource="http://sally.example.org">
       &lt;span property="http://www.w3.org/2006/vcard/ns#given-name">Sally&lt;/span>
       &lt;span property="http://www.w3.org/2006/vcard/ns#family-name">Smith&lt;/span>
   &lt;/div>
@@ -2091,13 +2091,13 @@ <h2><dfn title="Actor" id="actor">Actor</dfn></h2>
 >@prefix as: &lt;http://www.w3.org/ns/activitystreams#&gt; .
 @prefix vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt; .
 
-&lt;acct:sally@example.org&gt; a as:Person, vcard:Individual ;
+&lt;http://sally.example.org&gt; a as:Person, vcard:Individual ;
   as:displayName "Sally Smith" ;
   vcard:given-name "Sally" ;
   vcard:family-name "Smith" .
 
 _:b0 a as:Create ;
-  as:actor &lt;acct:sally@example.org&gt; ;
+  as:actor &lt;http://sally.example.org&gt; ;
   as:object [
     a as:Note ;
       as:content "This is a simple note"