[GNUnet-SVN] [gnunet] branch master updated (a47f108a2 -> e5e809d2a)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from a47f108a2 Merge branch 'master' of gnunet.org:gnunet
     new dcfe14c11 Follow-up to be4754c02fdbefc4fbf5046973c7c1ab44f8e92f
     new e5e809d2a doc: developer

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/documentation/Makefile.am             |  1 -
 doc/documentation/chapters/developer.texi | 25 ++++++++++++++-----------
 doc/documentation/chapters/user.texi      |  1 -
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am
index 1bd25f773..37c7fa961 100644
--- a/doc/documentation/Makefile.am
+++ b/doc/documentation/Makefile.am
@@ -19,7 +19,6 @@ dist_infoimage_DATA =                                         
\
        images/gnunet-0-10-peerinfo.png                         \
        images/gnunet-gtk-0-10-identity.png                     \
        images/gnunet-fs-gtk-0-10-star-tab.png                  \
-       images/gnunet-gtk-0-10.png                              \
        images/gnunet-gtk-0-10-download-area.png                \
        images/gnunet-gtk-0-10-search-selected.png              \
        images/gnunet-gtk-0-10-fs-menu.png                      \
diff --git a/doc/documentation/chapters/developer.texi 
b/doc/documentation/chapters/developer.texi
index e95355302..6a895ed11 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -8381,7 +8381,7 @@ The REST service will automatically load all REST plugins 
on startup.
 
 @strong{Configuration}
 
-The rest service can be configured in various ways.
+The REST service can be configured in various ways.
 The reference config file can be found in 
 @file{src/rest/rest.conf}:
 @example
@@ -8392,8 +8392,11 @@ REST_ALLOW_ORIGIN=*
 REST_ALLOW_CREDENTIALS=true
 @end example
 
-The port as well as Cross-origin resource sharing (CORS) headers that
-are supposed to be advertised by the rest service are configurable.
+The port as well as
address@hidden resource sharing} (CORS)
address@hidden deffn
+headers that are supposed to be advertised by the rest service are
+configurable.
 
 @menu
 * Namespace considerations::
@@ -8403,14 +8406,15 @@ are supposed to be advertised by the rest service are 
configurable.
 @node Namespace considerations
 @subsection Namespace considerations
 
-The gnunet-rest-service will load all plugins that are installed.
+The @command{gnunet-rest-service} will load all plugins that are installed.
 As such it is important that the endpoint namespaces do not clash.
-For example, plugin X might expose the endpoint ``/xxx'' while plugin Y exposes
-endpoint ``/xxx/yyy''.
-This is a problem if plugins X is also supposed to handle a call to 
-``/xxx/yyy''.
-Currently, the REST service will not complain or warn about such clashes so
-please make sure that endpoints are unambiguous.
+
+For example, plugin X might expose the endpoint ``/xxx'' while plugin Y
+exposes endpoint ``/xxx/yyy''.
+This is a problem if plugin X is also supposed to handle a call
+to ``/xxx/yyy''.
+Currently the REST service will not complain or warn about such clashes,
+so please make sure that endpoints are unambiguous.
 
 @node Endpoint documentation
 @subsection Endpoint documentation
@@ -8418,4 +8422,3 @@ please make sure that endpoints are unambiguous.
 This is WIP. Endpoints should be documented appropriately.
 Perferably using annotations.
 
-
diff --git a/doc/documentation/chapters/user.texi 
b/doc/documentation/chapters/user.texi
index 91b983be2..e5ebf5371 100644
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -642,7 +642,6 @@ $ gnunet-conversation-gtk
 @menu
 * Testing your Audio Equipment::
 * GNS Zones::
-* Future Directions::
 @end menu
 
 @node Testing your Audio Equipment

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