From 39446def395672b96642ad9b317fab09ee771be1 Mon Sep 17 00:00:00 2001
From: Daniel Roseman <daniel@roseman.org.uk>
Date: Fri, 3 Nov 2017 13:53:08 +0000
Subject: [PATCH] Clarify behaviour of `json` parameter.

`json` is ignored if `data` or `files` is not empty.
---
 docs/user/quickstart.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/user/quickstart.rst b/docs/user/quickstart.rst
index 6829d592..1a2c6fbf 100644
--- a/docs/user/quickstart.rst
+++ b/docs/user/quickstart.rst
@@ -281,6 +281,7 @@ the ``json`` parameter (added in version 2.4.2) and it will be encoded automatic
 
     >>> r = requests.post(url, json=payload)
 
+Note, the ``json`` parameter is ignored if either ``data`` or ``files`` is passed.
 
 POST a Multipart-Encoded File
 -----------------------------