[taler-merchant] branch master updated (e7ab678e -> 05a99aa2)

[gnunet]

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

grothoff pushed a change to branch master
in repository merchant.

    from e7ab678e make sure that bootstrap succeeds despite failing commands
     new 65679c33 more doxygen fixes
     new 5f723081 more doxygen fixes
     new 05a99aa2 more doxygen fixes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/doxygen/taler.doxy               |  1 -
 src/backend/taler-merchant-httpd.h   |  2 +-
 src/include/taler_merchant_service.h | 19 ++++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy
index fc7b0e82..d950911d 100644
--- a/doc/doxygen/taler.doxy
+++ b/doc/doxygen/taler.doxy
@@ -177,7 +177,6 @@ VERBATIM_HEADERS       = YES
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 3
 IGNORE_PREFIX          = TALER_
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
diff --git a/src/backend/taler-merchant-httpd.h 
b/src/backend/taler-merchant-httpd.h
index 4144d648..b7737bb2 100644
--- a/src/backend/taler-merchant-httpd.h
+++ b/src/backend/taler-merchant-httpd.h
@@ -269,7 +269,7 @@ struct TMH_RequestHandler
  * we keep in the "connection_cls" of MHD when handling
  * a request.
  *
- * @param ctxt the context to clean up.
+ * @param ctx the context to clean up.
  */
 typedef void
 (*TMH_ContextCleanup)(void *ctx);
diff --git a/src/include/taler_merchant_service.h 
b/src/include/taler_merchant_service.h
index 471da35a..e1155ec9 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -1607,7 +1607,7 @@ struct TALER_MERCHANT_OrderWalletGetHandle;
  * @param refund_pending #GNUNET_YES if there are refunds waiting to be
  *        obtained, #GNUNET_NO if all refunds have been obtained, 
#GNUNET_SYSERR
  *        on error.
- * @param refunded_amount amount that was refunded, NULL if there
+ * @param refund_amount amount that was refunded, NULL if there
  *        was no refund
  * @param taler_pay_uri the URI that instructs the wallets to process
  *                      the payment
@@ -2543,8 +2543,7 @@ struct TALER_MERCHANT_OrderRefundHandle;
  * Callback to process a POST /orders/ID/refund request
  *
  * @param cls closure
- * @param http_status HTTP status code for this request
- * @param ec taler-specific error code
+ * @param hr HTTP response details this request
  * @param taler_refund_uri the refund uri offered to the wallet
  * @param h_contract hash of the contract a Browser may need to authorize
  *        obtaining the HTTP response.
@@ -2639,8 +2638,10 @@ struct TALER_MERCHANT_RefundDetail
  * Callback to process a (public) POST /orders/ID/refund request
  *
  * @param cls closure
- * @param http_status HTTP status code for this request
- * @param ec taler-specific error code
+ * @param hr HTTP response details
+ * @param merchant_pub public key of the merchant signing the @a refunds
+ * @param refunds array with details about the refunds obtained
+ * @param refunds_length length of the @a refunds array
  */
 typedef void
 (*TALER_MERCHANT_WalletRefundCallback) (
@@ -3390,9 +3391,13 @@ struct TALER_MERCHANT_PickupDetail
  *
  * @param cls closure
  * @param hr HTTP response details
+ * @param total_authorized how many tips were authorized under this tip
+ * @param total_picked_up how many tips have been picked up
+ * @param reason what was the reason given for the tip
  * @param expiration when the tip will expire
- * @param exchange_url exchange from which the coins should be withdrawn
- * @param amount_remaining total amount still available for the tip
+ * @param reserve_pub which reserve is funding this tip
+ * @param pickups_length length of the @a pickups array
+ * @param pickups array of pickup operations performed for this tip
  */
 typedef void
 (*TALER_MERCHANT_TipMerchantGetCallback) (

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.