From 9a52a7192aae7b17111dd6369b001b8c89c909cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Hurtado?= <hector.hurtado@bbva.com>
Date: Mon, 16 Dec 2019 10:42:30 +0100
Subject: [PATCH] Resolve conflicts

---
 docs/source/concepts/resource_tree.rst | 48 ++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/docs/source/concepts/resource_tree.rst b/docs/source/concepts/resource_tree.rst
index 3790daf..118f50b 100644
--- a/docs/source/concepts/resource_tree.rst
+++ b/docs/source/concepts/resource_tree.rst
@@ -151,6 +151,12 @@ then, when handling the request:
 
 Contains the value of the URL parameter ``name``
 
+
+.. note::
+
+   In the reference implementation only the first parameter's value can be accessed in the case of multiple values coming in the request.
+
+
 Sample Usage
 ^^^^^^^^^^^^
 
@@ -173,6 +179,12 @@ then, when handling the request:
 
 Contains the value of the HTTP header ``name`` of the incoming request.
 
+
+.. note::
+
+   In the reference implementation only the first header's value can be accessed in the case of multiple values coming in the request.
+
+
 Sample Usage
 ^^^^^^^^^^^^
 
@@ -217,6 +229,15 @@ then, when handling the request:
 
 Contains the value of the field ``name`` of the incoming request.
 
+
+.. note::
+
+   In the reference implementation there are some caveats:
+
+   * Only the first form field's value can be accessed in the case of multiple values coming in the request.
+   * In order to get access to the form data a correct 'Content-Type' header must be present in the request ('application/x-www-form-urlencoded' or 'multipart/form-data')
+
+
 Sample Usage
 ^^^^^^^^^^^^
 
@@ -239,6 +260,12 @@ then, when handling the request:
 
 Contains the name of the file uploaded through the incoming request.
 
+
+.. note::
+
+   In the reference implementation to get access to the multipart data a correct Content-Type header must be present in the request (multipart/form-data or multipart/mixed).
+
+
 Sample Usage
 ^^^^^^^^^^^^
 
@@ -261,6 +288,12 @@ then, when handling the request:
 
 Contents of the file that is being uploaded in the incoming request.
 
+
+.. note::
+
+   In the reference implementation to get access to the multipart data a correct Content-Type header must be present in the request (multipart/form-data or multipart/mixed).
+
+
 Sample Usage
 ^^^^^^^^^^^^
 
@@ -305,6 +338,15 @@ then, when handling the request:
 
 Contains the status code given in the user response.
 
+
+.. note::
+
+  In the reference implementation there are some caveats:
+
+  * The status code value must be between 100 and 999.
+  * There is no way of writing reason phrase in the status line of the response.
+
+
 Sample Usage
 ^^^^^^^^^^^^
 
@@ -322,6 +364,12 @@ then the response will have the status code ``418 I am a Teapot``.
 
 Contains the value of the header ``name`` in the user response.
 
+
+.. note::
+
+   At this moment header values are only appended, there is no way of reset the values once set.
+
+
 Sample Usage
 ^^^^^^^^^^^^