9 files changed, 10 insertions, 33 deletions
diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c
index 48483bde8..0cecf2e01 100644
--- a/src/auditor/report-lib.c
+++ b/src/auditor/report-lib.c
@@ -583,7 +583,7 @@ TALER_ARL_amount_subtract_ (struct TALER_Amount *diff,
  * @param filename where is the addition called
  * @param functionname name of the function where the addition is called
  * @param line line number of the addition
- * @return #TALER_ARL_SR_NEGATIVE if the result was negative (and @a diff is now invalid),
+ * @return #TALER_ARL_SR_INVALID_NEGATIVE if the result was negative (and @a diff is now invalid),
  *         #TALER_ARL_SR_ZERO if the result was zero,
  *         #TALER_ARL_SR_POSITIVE if the result is positive
  */
diff --git a/src/auditor/report-lib.h b/src/auditor/report-lib.h
index 0842f9154..04165ae4a 100644
--- a/src/auditor/report-lib.h
+++ b/src/auditor/report-lib.h
@@ -258,7 +258,7 @@ enum TALER_ARL_SubtractionResult
  * @param filename where is the addition called
  * @param functionname name of the function where the addition is called
  * @param line line number of the addition
- * @return #TALER_ARL_SR_NEGATIVE if the result was negative (and @a diff is now invalid),
+ * @return #TALER_ARL_SR_INVALID_NEGATIVE if the result was negative (and @a diff is now invalid),
  *         #TALER_ARL_SR_ZERO if the result was zero,
  *         #TALER_ARL_SR_POSITIVE if the result is positive
  */
@@ -280,7 +280,7 @@ TALER_ARL_amount_subtract_neg_ (struct TALER_Amount *diff,
  * @param[out] diff where to store (@a a1 - @a a2)
  * @param a1 amount to subtract from
  * @param a2 amount to subtract
- * @return #TALER_ARL_SR_NEGATIVE if the result was negative (and @a diff is now invalid),
+ * @return #TALER_ARL_SR_INVALID_NEGATIVE if the result was negative (and @a diff is now invalid),
  *         #TALER_ARL_SR_ZERO if the result was zero,
  *         #TALER_ARL_SR_POSITIVE if the result is positive
  */
diff --git a/src/auditor/taler-helper-auditor-deposits.c b/src/auditor/taler-helper-auditor-deposits.c
index 41cf406cb..b9c4ff8de 100644
--- a/src/auditor/taler-helper-auditor-deposits.c
+++ b/src/auditor/taler-helper-auditor-deposits.c
@@ -96,7 +96,7 @@ struct DepositConfirmationContext
  * @param cls our `struct DepositConfirmationContext`
  * @param serial_id row of the @a dc in the database
  * @param dc the deposit confirmation we know
- * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERROR to stop iterating
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop iterating
  */
 static int
 test_dc (void *cls,
diff --git a/src/bank-lib/taler-wire-gateway-client.c b/src/bank-lib/taler-wire-gateway-client.c
index 58fd57c79..c9e473378 100644
--- a/src/bank-lib/taler-wire-gateway-client.c
+++ b/src/bank-lib/taler-wire-gateway-client.c
@@ -14,7 +14,7 @@
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 */
 /**
- * @file taler-bank-transfer.c
+ * @file taler-wire-gateway-client.c
  * @brief Execute wire transfer.
  * @author Christian Grothoff
  */
diff --git a/src/include/taler_auditor_service.h b/src/include/taler_auditor_service.h
index e7f056e5f..d84ecd5eb 100644
--- a/src/include/taler_auditor_service.h
+++ b/src/include/taler_auditor_service.h
@@ -234,7 +234,7 @@ typedef void
  * @param auditor the auditor handle; the auditor must be ready to operate
  * @param h_wire hash of merchant wire details
  * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor)
- * @param timestamp timestamp when the contract was finalized, must not be too far in the future
+ * @param exchange_timestamp timestamp when the contract was finalized, must not be too far in the future
  * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline
  * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant
  * @param coin_pub coin’s public key
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 6584f1853..3da11b303 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -1339,26 +1339,6 @@ struct TALER_ReserveCloseConfirmationPS
 
 
 /**
- * Used by the merchant to confirm with a signature that the refund has
- * been successfully done. Even though the frontend doesn't usually do crypto,
- * this signature may turn useful in court.
- */
-struct TALER_MerchantRefundConfirmationPS
-{
-  /**
-   * Set to #TALER_SIGNATURE_MERCHANT_REFUND_OK.
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Hashed order id; in case frontend wants to check it.
-   * Hashed without the 0-termination.
-   */
-  struct GNUNET_HashCode h_order_id GNUNET_PACKED;
-
-};
-
-/**
  * Used by the merchant to confirm to the frontend that
  * the user did a payment replay with the current browser session.
  */
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 85ea5b010..74148b8f5 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -844,8 +844,7 @@ TALER_TESTING_run_bank (const char *config_filename,
  * responsible to create the exchange EBICS subscriber at
  * the nexus.
  *
- * @param bank_url base URL of the bank, used by `wget' to check
- *        that the bank was started right.
+ * @param bc bank configuration of the bank
  * @return the process, or NULL if the process could not
  *         be started.
  */
diff --git a/src/lib/exchange_api_withdraw2.c b/src/lib/exchange_api_withdraw2.c
index 25f669143..c51138d90 100644
--- a/src/lib/exchange_api_withdraw2.c
+++ b/src/lib/exchange_api_withdraw2.c
@@ -347,11 +347,8 @@ handle_reserve_withdraw_finished (void *cls,
  * same arguments in case of failures.
  *
  * @param exchange the exchange handle; the exchange must be ready to operate
- * @param pk kind of coin to create
- * @param reserve_sig signature from the reserve authorizing the withdrawal
- * @param reserve_pub public key of the reserve to withdraw from
- * @param ps secrets of the planchet
- *        caller must have committed this value to disk before the call (with @a pk)
+ * @param pd planchet details of the planchet to withdraw
+ * @param reserve_priv private key of the reserve to withdraw from
  * @param res_cb the callback to call when the final result for this request is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c
index b0b8035f3..5b11ad937 100644
--- a/src/testing/testing_api_helpers_bank.c
+++ b/src/testing/testing_api_helpers_bank.c
@@ -106,6 +106,7 @@ TALER_TESTING_has_in_name (const char *prog,
  * bank" function to do such tasks.  This function is also
  * responsible to create the exchange user at Nexus.
  *
+ * @param bc bank configuration of the bank
  * @return the pair of both service handles.  In case of
  *         errors, each element of the pair will be set to NULL.
  */