aboutsummaryrefslogtreecommitdiffstats
path: root/zot.txt
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-01 06:30:38 -0700
committerFriendika <info@friendika.com>2011-09-01 06:30:38 -0700
commitef1b99aa44031662187be878485be14edf35b42b (patch)
treeceeaa5259c06af2f69db3b7c24072534cc63e87e /zot.txt
parent1621630b064474eb385bfa05d248fec712645814 (diff)
parentaf62c81b8bbcc79582ed2c25d4f50cdae22648ba (diff)
downloadvolse-hubzilla-ef1b99aa44031662187be878485be14edf35b42b.tar.gz
volse-hubzilla-ef1b99aa44031662187be878485be14edf35b42b.tar.bz2
volse-hubzilla-ef1b99aa44031662187be878485be14edf35b42b.zip
Merge branch 'pull'
Diffstat (limited to 'zot.txt')
-rw-r--r--zot.txt19
1 files changed, 18 insertions, 1 deletions
diff --git a/zot.txt b/zot.txt
index 7568d1c30..93fdf3b9d 100644
--- a/zot.txt
+++ b/zot.txt
@@ -1,4 +1,3 @@
-
This is the Zot! social communications protocol.
Specification revision: 1
@@ -247,5 +246,23 @@ Only authentication via OpenID is defined in this version of the specification.
This can be used to provide access control to any web resource to any
webfinger identity on the internet.
+*********
+* Links *
+*********
+
+Salmon Protocol
+ http://www.salmon-protocol.org/salmon-protocol-summary
+
+Salmon Magic Envelope
+ http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-01.html
+
+Atom Activity Stream Draft
+ http://activitystrea.ms/specs/atom/1.0/
+
+Activty Stream Base Schema
+ http://activitystrea.ms/head/activity-schema.html
+
+WebFinger Protocol
+ http://code.google.com/p/webfinger/wiki/WebFingerProtocol