address /deposit documentation for #6952

1 files changed, 17 insertions, 12 deletions

diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 19090067..38bd6459 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -2572,13 +2572,17 @@ proof to the seller for the escrow of sufficient fund.
   :http:statuscode:`409 Conflict`:
     The deposit operation has either failed because the coin has insufficient
     residual value, or because the same public key of the coin has been
-    previously used with a different denomination.  Which case it is
+    previously used with a different denomination.  It is also a conflict
+    to use the same coin multiple times (with different amounts) for the
+    same contract.  Which case it is
     can be decided by looking at the error code
-    (``TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS`` or
-    ``TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY``).
-    The fields of the response are the same in both cases.
+    (``TALER_EC_EXCHANGE_DEPOSIT_CONFLICTING_CONTRACT`` (same coin used in different ways),
+    ``TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS`` (balance insufficient) or
+    ``TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY``
+    (same coin public key, but different denomination)).
+    The fields of the response are still evolving (see bug 7267),
+    for now the format of the response is a `DepositDoubleSpendError`.
     The request should not be repeated again with this coin.
-    In this case, the response is a `DepositDoubleSpendError`.
   :http:statuscode:`410 Gone`:
     The requested denomination key is not yet or no longer valid.
     It either before the validity start, past the expiration or was revoked. The response is a
@@ -3201,15 +3205,16 @@ proof to the seller for the escrow of sufficient fund.
   :http:statuscode:`409 Conflict`:
     The deposit operation has either failed because a coin has insufficient
     residual value, or because the same public key of a coin has been
-    previously used with a different denomination.  Which case it is
+    previously used with a different denomination.
+    Which case it is
     can be decided by looking at the error code
-    (``TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS`` or
-    ``TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY``).
-    The fields of the response are the same in both cases.
+    (``TALER_EC_EXCHANGE_DEPOSIT_CONFLICTING_CONTRACT`` (same coin used in different ways),
+    ``TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS`` (balance insufficient) or
+    ``TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY``
+    (same coin public key, but different denomination)).
+    The fields of the response are still evolving (see bug 7267),
+    for now the format of the response is a `DepositDoubleSpendError`.
     The request should not be repeated again with this coin.
-    In this case, the response is a `DepositDoubleSpendError` with
-    an additional ``coin_pub`` field specifying the public key of the
-    coin that was double-spent.
   :http:statuscode:`410 Gone`:
     The requested denomination key is not yet or no longer valid.
     It either before the validity start, past the expiration or was revoked. The response is a