merge of 'a7c66fdbd876dc741e1f16fccc43acb062bc4cc0'

and 'e128f93e1c700e303df3a0d655519dd6d1e83d7d'
This commit is contained in:
str4d
2014-06-26 00:48:14 +00:00
2 changed files with 13 additions and 8 deletions

View File

@@ -120,9 +120,10 @@ received through other forms are answered with an error message) :
[option=value]*
DESTINATION specifies what destination should be used for
sending and receiving messages/streams. It has to be a suitable
private base64 destination key. If the destination is
specified as TRANSIENT, the SAM bridge creates a new destination.
sending and receiving messages/streams. It is the base 64 encoding of
the concatenation of the destination, private key, and signing private key.
If the destination is specified as TRANSIENT,
the SAM bridge creates a new destination.
{$nickname} is the choice of the client. No whitespace is allowed.