[GNUnet-SVN] [gnunet] branch master updated: ksk-uri

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new d4ad60616 ksk-uri
     new b3b5bd067 Merge branch 'master' of gnunet.org:gnunet
d4ad60616 is described below

commit d4ad60616c3424dc78728458c2e568d31e1190d5
Author: Nils Gillmann <address@hidden>
AuthorDate: Mon Jun 18 06:56:09 2018 +0000

    ksk-uri
    
    Signed-off-by: Nils Gillmann <address@hidden>
---
 doc/documentation/chapters/user.texi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/documentation/chapters/user.texi 
b/doc/documentation/chapters/user.texi
index 422619f84..8ad81fbee 100644
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -1363,6 +1363,7 @@ This section describes the four different URI types in 
detail.
 Most URIs include some hash values. Hashes are encoded using
 base32hex (RFC 2938).
 
address@hidden chk-uri
 @node Content Hash Key (chk)
 @subsubsection Content Hash Key (chk)
 @c %**end of header
@@ -1379,6 +1380,7 @@ shape of the tree), KEYHASH is the key used to decrypt 
the file
 is the query used to request the top-level block (also the hash
 of the encrypted block).
 
address@hidden loc-uri
 @node Location identifiers (loc)
 @subsubsection Location identifiers (loc)
 @c %**end of header
@@ -1394,6 +1396,7 @@ base32hex), SIG is the RSA signature (in GNUnet format in
 base32hex) and EXPTIME specifies when the signature expires
 (in milliseconds after 1970).
 
address@hidden ksk-uri
 @node Keyword queries (ksk)
 @subsubsection Keyword queries (ksk)
 @c %**end of header
@@ -1405,7 +1408,10 @@ using the typical URI-encoding (using hex values) from 
HTTP.
 "+" can be used to specify multiple keywords (which are then
 logically "OR"-ed in the search, results matching both keywords
 are given a higher rank): "gnunet://fs/ksk/KEYWORD1+KEYWORD2".
+ksk-URIs must not begin or end with the plus ('+') character.
+Furthermore they must not contain '++'.
 
address@hidden sks-uri
 @node Namespace content (sks)
 @subsubsection Namespace content (sks)
 @c %**end of header

-- 
To stop receiving notification emails like this one, please contact
address@hidden