Merge branch 'newui' of github.com:fabrixxm/friendika into newui

[friendica.git] / zot.txt

diff --git a/zot.txt b/zot.txt
index 4d3a6f6d00d2662bcef6ee282362855eed056371..0704875af09bfe812107f9f3a22a2027bb3d776b 100644 (file)
--- a/zot.txt
+++ b/zot.txt
@@ -11,7 +11,7 @@ webfinger and encapsulating salmon.
 
 First read the salmon and salmon magic envelope specifications. Zot also 
 makes use of webfinger and ActivityStreams and several concepts from RFC822
 
 First read the salmon and salmon magic envelope specifications. Zot also 
 makes use of webfinger and ActivityStreams and several concepts from RFC822

-(email). Zot encompasses the zot delivery framework, and the zid remote
+(email). Zot encompasses the zot delivery framework and the zid remote

 access protocol.
 
 The current specification revision (1) is frozen until a reference 
 access protocol.
 
 The current specification revision (1) is frozen until a reference 


@@ -25,7 +25,8 @@ change to the revision number.
 Format of a zot wrapper. This completely encapsulates a salmon magic envelope 
 and provides privacy protection, while defining a delivery envelope - a 
 concept familiar to email systems. All addresses in zot are webfinger 
 Format of a zot wrapper. This completely encapsulates a salmon magic envelope 
 and provides privacy protection, while defining a delivery envelope - a 
 concept familiar to email systems. All addresses in zot are webfinger 

-resolvable addresses containing both salmon and zot endpoints. 
+resolvable addresses containing zot endpoints and salmon public keys (zot 
+is a superset of salmon). 

 
 
 <?xml version='1.0' encoding='UTF-8'?>
 
 
 <?xml version='1.0' encoding='UTF-8'?>


@@ -220,6 +221,17 @@ embed alternate message formats and protocols such as
 "application/x-diaspora+xml". If a delivery agent is unable to provide any
 acceptable data format, the delivery MUST be terminated/cancelled. 
 
 "application/x-diaspora+xml". If a delivery agent is unable to provide any
 acceptable data format, the delivery MUST be terminated/cancelled. 
 

+Foreign Messages
+****************
+
+Messages MAY be imported from other networks and systems which have no 
+knowledge of salmon signatures. The salmon signature in this case MUST be the
+exact string 'NOTSIGNED' to indicate that the author (From address) cannot be 
+validated using salmon verification. This message MUST be relayed by a Sender
+who can provide a valid salmon signature of the message. Delivery systems MAY
+reject foreign messages.  
+
+

 
 **********************
 * Zid authentication *
 
 **********************
 * Zid authentication *