[GNUnet-SVN] [gnunet-rest-api] branch master updated (eb8f5ba -> 1f95c36)

[gnunet]

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

pagkopoulou pushed a change to branch master
in repository gnunet-rest-api.

    from eb8f5ba  added config API doc
     new 2b56d58  added config API doc
     new 77142e4  changed config chapter title + added second post request
     new 1f95c36  changed config chapter title + added second POST request

The 3 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:
 source/config.rst | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/source/config.rst b/source/config.rst
index e5e6dc9..2dbf86e 100644
--- a/source/config.rst
+++ b/source/config.rst
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
+Configuration
+=============
+=======
 Config API Service
 ==================
+>>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
 
 Definition
 ~~~~~~~~~~
@@ -84,8 +89,13 @@ GET Requests
 
+--------------------+---------------------------------------------------------------+
 
 
+<<<<<<< HEAD
+POST Requests
+-------------
+=======
 POST Request
 ------------
+>>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
 
 
+--------------------+---------------------------------------------------------------+
 |**Title**           | Creates/modifies options in the config                  
      |
@@ -103,6 +113,27 @@ POST Request
 |**Error Response**  | | {"error":"*error_desc*"}                              
      |
 
+--------------------+---------------------------------------------------------------+
 
+<<<<<<< HEAD
+|
+
++--------------------+---------------------------------------------------------------+
+|**Title**           | Creates/modifies options in a specific section in the 
config  |
++--------------------+---------------------------------------------------------------+
+|**URL**             | :literal:`/config/'section'`                            
      |
++--------------------+---------------------------------------------------------------+
+|**Method**          | **POST**                                                
      |
++--------------------+---------------------------------------------------------------+
+|**URL Params**      | none                                                    
      |
++--------------------+---------------------------------------------------------------+
+|**Data Params**     | {"'option'": "'value'",...}                             
      |
++--------------------+---------------------------------------------------------------+
+|**Success Response**| Response Code: ``b) 200 OK``                            
      |
++--------------------+---------------------------------------------------------------+
+|**Error Response**  | | {"error":"*error_desc*"}                              
      |
++--------------------+---------------------------------------------------------------+
+
+=======
+>>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
 
 OPTIONS Request
 ---------------

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