[GNUnet-SVN] [gnunet-rest-api] 03/03: changed config chapter title + added second POST request

[gnunet]

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

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

commit 1f95c367033f9ad338ed86a24d921b1c77b1f617
Merge: 77142e4 eb8f5ba
Author: Alexia Pagkopoulou <address@hidden>
AuthorDate: Tue Aug 20 13:14:22 2019 +0200

    changed config chapter title + added second POST request

 source/conf.py                       |  12 +--
 source/config.rst                    |  13 +++
 source/gns.rst                       |   4 +-
 source/identity.rst                  |  19 +++--
 source/index.rst                     |   5 +-
 source/namestore.rst                 |  85 +++++--------------
 source/peerinfo.rst                  |   4 +-
 source/{identity.rst => reclaim.rst} | 153 +++++++++++++++--------------------
 8 files changed, 119 insertions(+), 176 deletions(-)

diff --cc source/config.rst
index a45e2cd,e5e6dc9..2dbf86e
--- a/source/config.rst
+++ b/source/config.rst
@@@ -1,5 -1,5 +1,10 @@@
++<<<<<<< HEAD
 +Configuration
 +=============
++=======
+ Config API Service
+ ==================
++>>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
  
  Definition
  ~~~~~~~~~~
@@@ -84,8 -84,8 +89,13 @@@ GET Request
  
+--------------------+---------------------------------------------------------------+
  
  
++<<<<<<< HEAD
 +POST Requests
 +-------------
++=======
+ POST Request
+ ------------
++>>>>>>> eb8f5ba9234fa0a034d4102e294b35f8549e2816
  
  
+--------------------+---------------------------------------------------------------+
  |**Title**           | Creates/modifies options in the config                 
       |
@@@ -103,24 -103,6 +113,27 @@@
  |**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.