Merge branch 'master' of git+ssh://git.taler.net/merchant

20 files changed, 0 insertions, 414 deletions

diff --git a/src/lib/merchant_api_get_orders.c b/src/lib/merchant_api_get_orders.c
index 2399cb45..11be14d9 100644
--- a/src/lib/merchant_api_get_orders.c
+++ b/src/lib/merchant_api_get_orders.c
@@ -231,24 +231,6 @@ TALER_MERCHANT_orders_get (
 }
 
 
-/**
- * Make a GET /orders request with filters.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param paid filter on payment status
- * @param refunded filter on refund status
- * @param wired filter on wire transfer status
- * @param date range limit by date
- * @param start_row range limit by order table row
- * @param delta range from which @a date and @a start_row apply, positive
- *              to return delta items after the given limit(s), negative to
- *              return delta items before the given limit(s)
- * @param timeout how long to wait (long polling) of zero results match the query
- * @param cb function to call with the backend's inventory information
- * @param cb_cls closure for @a cb
- * @return the request handle; NULL upon error
- */
 struct TALER_MERCHANT_OrdersGetHandle *
 TALER_MERCHANT_orders_get2 (
   struct GNUNET_CURL_Context *ctx,
diff --git a/src/lib/merchant_api_get_product.c b/src/lib/merchant_api_get_product.c
index be54d083..e1c50168 100644
--- a/src/lib/merchant_api_get_product.c
+++ b/src/lib/merchant_api_get_product.c
@@ -249,12 +249,6 @@ TALER_MERCHANT_product_get (
 }
 
 
-/**
- * Cancel GET /product/$ID request.  Must not be called by clients after
- * the callback was invoked.
- *
- * @param pgh request to cancel.
- */
 void
 TALER_MERCHANT_product_get_cancel (
   struct TALER_MERCHANT_ProductGetHandle *pgh)
diff --git a/src/lib/merchant_api_get_products.c b/src/lib/merchant_api_get_products.c
index 02e4aba3..7a743209 100644
--- a/src/lib/merchant_api_get_products.c
+++ b/src/lib/merchant_api_get_products.c
@@ -198,15 +198,6 @@ handle_get_products_finished (void *cls,
 }
 
 
-/**
- * Make a GET /products request.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param cb function to call with the backend's inventory information
- * @param cb_cls closure for @a cb
- * @return the request handle; NULL upon error
- */
 struct TALER_MERCHANT_ProductsGetHandle *
 TALER_MERCHANT_products_get (
   struct GNUNET_CURL_Context *ctx,
@@ -247,12 +238,6 @@ TALER_MERCHANT_products_get (
 }
 
 
-/**
- * Cancel /products request.  Must not be called by clients after
- * the callback was invoked.
- *
- * @param pgh request to cancel.
- */
 void
 TALER_MERCHANT_products_get_cancel (
   struct TALER_MERCHANT_ProductsGetHandle *pgh)
diff --git a/src/lib/merchant_api_get_reserve.c b/src/lib/merchant_api_get_reserve.c
index 8167d2a5..1145d57a 100644
--- a/src/lib/merchant_api_get_reserve.c
+++ b/src/lib/merchant_api_get_reserve.c
@@ -294,11 +294,6 @@ TALER_MERCHANT_reserve_get (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a GET /reserves/$RESERVE_ID request.
- *
- * @param rgh handle to the request to be canceled
- */
 void
 TALER_MERCHANT_reserve_get_cancel (
   struct TALER_MERCHANT_ReserveGetHandle *rgh)
diff --git a/src/lib/merchant_api_get_tips.c b/src/lib/merchant_api_get_tips.c
index f80dd295..eb174f0b 100644
--- a/src/lib/merchant_api_get_tips.c
+++ b/src/lib/merchant_api_get_tips.c
@@ -202,15 +202,6 @@ handle_get_tips_finished (void *cls,
 }
 
 
-/**
- * Make a GET /private/tips request.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param cb function to call with the backend's tip information
- * @param cb_cls closure for @a cb
- * @return the request handle; NULL upon error
- */
 struct TALER_MERCHANT_TipsGetHandle *
 TALER_MERCHANT_tips_get (
   struct GNUNET_CURL_Context *ctx,
@@ -228,18 +219,6 @@ TALER_MERCHANT_tips_get (
 }
 
 
-/**
- * Issue a GET /private/tips request with filters to the backend.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param include_expired whether to return all tips or only unexpired tips
- * @param limit number of results to return, negative for descending row id, positive for ascending
- * @param offset row id to start returning results from
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- * @return handle for this operation, NULL upon errors
- */
 struct TALER_MERCHANT_TipsGetHandle *
 TALER_MERCHANT_tips_get2 (struct GNUNET_CURL_Context *ctx,
                           const char *backend_url,
@@ -315,12 +294,6 @@ TALER_MERCHANT_tips_get2 (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel GET /private/tips request.  Must not be called by clients after
- * the callback was invoked.
- *
- * @param ogh request to cancel.
- */
 void
 TALER_MERCHANT_tips_get_cancel (
   struct TALER_MERCHANT_TipsGetHandle *tgh)
diff --git a/src/lib/merchant_api_lock_product.c b/src/lib/merchant_api_lock_product.c
index 8205d8c0..eb6b9c19 100644
--- a/src/lib/merchant_api_lock_product.c
+++ b/src/lib/merchant_api_lock_product.c
@@ -149,20 +149,6 @@ handle_lock_product_finished (void *cls,
 }
 
 
-/**
- * Make a POST /products/$ID/lock request to reserve a certain
- * amount of product in inventory to a reservation UUID.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param product_id identifier of the product
- * @param uuid UUID that identifies the client holding the lock
- * @param duration how long should the lock be held
- * @param quantity how much product should be locked
- * @param cb function to call with the backend's lock status
- * @param cb_cls closure for @a cb
- * @return the request handle; NULL upon error
- */
 struct TALER_MERCHANT_ProductLockHandle *
 TALER_MERCHANT_product_lock (
   struct GNUNET_CURL_Context *ctx,
diff --git a/src/lib/merchant_api_merchant_get_order.c b/src/lib/merchant_api_merchant_get_order.c
index e70a82cd..007d4195 100644
--- a/src/lib/merchant_api_merchant_get_order.c
+++ b/src/lib/merchant_api_merchant_get_order.c
@@ -441,25 +441,6 @@ handle_merchant_order_get_finished (void *cls,
 }
 
 
-/**
- * Checks the status of a payment.  Issue a GET /private/orders/$ID request to
- * the backend.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param order_id order id to identify the payment
- * @param session_id sesion id for the payment (or NULL if the check is not
- *                   bound to a session)
- * @param transfer if true, obtain the wire transfer status from the exhcange.
- *               Otherwise, the wire transfer status MAY be returned if it is available.
- * @param timeout timeout to use in long polling (how long may the server wait to reply
- *        before generating an unpaid response). Note that this is just provided to
- *        the server, we as client will block until the response comes back or until
- *        #TALER_MERCHANT_order_get_cancel() is called.
- * @param cb callback which will work the response gotten from the backend
- * @param cb_cls closure to pass to @a cb
- * @return handle for this operation, NULL upon errors
- */
 struct TALER_MERCHANT_OrderMerchantGetHandle *
 TALER_MERCHANT_merchant_order_get (struct GNUNET_CURL_Context *ctx,
                                    const char *backend_url,
@@ -566,11 +547,6 @@ TALER_MERCHANT_merchant_order_get (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a GET /private/orders/$ORDER request.
- *
- * @param omgh handle to the request to be canceled
- */
 void
 TALER_MERCHANT_merchant_order_get_cancel (
   struct TALER_MERCHANT_OrderMerchantGetHandle *omgh)
diff --git a/src/lib/merchant_api_merchant_get_tip.c b/src/lib/merchant_api_merchant_get_tip.c
index 025a7834..6efa1e54 100644
--- a/src/lib/merchant_api_merchant_get_tip.c
+++ b/src/lib/merchant_api_merchant_get_tip.c
@@ -248,17 +248,6 @@ handle_merchant_tip_get_finished (void *cls,
 }
 
 
-/**
- * Issue a GET /private/tips/$TIP_ID (private variant) request to the backend.
- * Returns information needed to pick up a tip.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param tip_id which tip should we query
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- * @return handle for this operation, NULL upon errors
- */
 struct TALER_MERCHANT_TipMerchantGetHandle *
 TALER_MERCHANT_merchant_tip_get (struct GNUNET_CURL_Context *ctx,
                                  const char *backend_url,
diff --git a/src/lib/merchant_api_patch_order_forget.c b/src/lib/merchant_api_patch_order_forget.c
index ea65be1a..a006c42d 100644
--- a/src/lib/merchant_api_patch_order_forget.c
+++ b/src/lib/merchant_api_patch_order_forget.c
@@ -138,19 +138,6 @@ handle_forget_finished (void *cls,
 }
 
 
-/**
- * Run a payment forget operation, which forgets certain fields in an order's
- * contract terms without changing the hash of the contract terms.
- *
- * @param ctx execution context.
- * @param merchant_url base URL of the merchant.
- * @param order_id order to forget.
- * @param fields_length length of @e fields.
- * @param fields the fields in the contract terms to forget.
- * @param cb the callback to call when a reply for this request is available.
- * @param cb_cls closure for @a cb.
- * @return a handle for this request.
- */
 struct TALER_MERCHANT_OrderForgetHandle *
 TALER_MERCHANT_order_forget (struct GNUNET_CURL_Context *ctx,
                              const char *merchant_url,
@@ -245,13 +232,6 @@ TALER_MERCHANT_order_forget (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a PATCH /orders/$ID/forget request.  Note that if you cancel a request
- * like this, you have no assurance that the request has not yet been
- * forwarded to the merchant.
- *
- * @param ofh the forget request handle
- */
 void
 TALER_MERCHANT_order_forget_cancel (struct
                                     TALER_MERCHANT_OrderForgetHandle *ofh)
diff --git a/src/lib/merchant_api_patch_product.c b/src/lib/merchant_api_patch_product.c
index 74a89fff..3a9be15a 100644
--- a/src/lib/merchant_api_patch_product.c
+++ b/src/lib/merchant_api_patch_product.c
@@ -149,35 +149,6 @@ handle_patch_product_finished (void *cls,
 }
 
 
-/**
- * Make a PATCH /products request to update product details in the
- * inventory.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param product_id identifier to use for the product; the product must exist,
- *                    or the transaction will fail with a #MHD_HTTP_NOT_FOUND
- *                    HTTP status code
- * @param description description of the product
- * @param description_i18n Map from IETF BCP 47 language tags to localized descriptions
- * @param unit unit in which the product is measured (liters, kilograms, packages, etc.)
- * @param price the price for one @a unit of the product, zero is used to imply that
- *              this product is not sold separately or that the price is not fixed and
- *              must be supplied by the front-end.  If non-zero, price must include
- *              applicable taxes.
- * @param image base64-encoded product image
- * @param taxes list of taxes paid by the merchant
- * @param total_stock in @a units, -1 to indicate "infinite" (i.e. electronic books),
- *               must be larger than previous values
- * @param total_lost in @a units, must be larger than previous values, and may
- *               not exceed total_stock minus total_sold; if it does, the transaction
- *               will fail with a #MHD_HTTP_CONFLICT HTTP status code
- * @param location where the product is in stock
- * @param next_restock when the next restocking is expected to happen
- * @param cb function to call with the backend's result
- * @param cb_cls closure for @a cb
- * @return the request handle; NULL upon error
- */
 struct TALER_MERCHANT_ProductPatchHandle *
 TALER_MERCHANT_product_patch (
   struct GNUNET_CURL_Context *ctx,
@@ -284,12 +255,6 @@ TALER_MERCHANT_product_patch (
 }
 
 
-/**
- * Cancel PATCH /products/$ID request.  Must not be called by clients after
- * the callback was invoked.
- *
- * @param pph request to cancel.
- */
 void
 TALER_MERCHANT_product_patch_cancel (
   struct TALER_MERCHANT_ProductPatchHandle *pph)
diff --git a/src/lib/merchant_api_post_order_abort.c b/src/lib/merchant_api_post_order_abort.c
index 162fe570..31c589bb 100644
--- a/src/lib/merchant_api_post_order_abort.c
+++ b/src/lib/merchant_api_post_order_abort.c
@@ -321,21 +321,6 @@ handle_abort_finished (void *cls,
 }
 
 
-/**
- * Run an abort operation, asking for refunds for coins
- * that were previously spend on a/pay that failed to go through.
- *
- * @param ctx execution context
- * @param merchant_url base URL of the merchant
- * @param order_id order to abort
- * @param h_contract hash of the contact of the merchant with the customer
- * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
- * @param num_coins number of coins used to pay
- * @param coins array of coins we use to pay
- * @param cb the callback to call when a reply for this request is available
- * @param cb_cls closure for @a pay_cb
- * @return a handle for this request
- */
 struct TALER_MERCHANT_OrderAbortHandle *
 TALER_MERCHANT_order_abort (struct GNUNET_CURL_Context *ctx,
                             const char *merchant_url,
@@ -452,12 +437,6 @@ TALER_MERCHANT_order_abort (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel an abort request.  This function cannot be used on a request handle
- * if a response is already served for it.
- *
- * @param oah the pay permission request handle
- */
 void
 TALER_MERCHANT_order_abort_cancel (struct TALER_MERCHANT_OrderAbortHandle *oah)
 {
diff --git a/src/lib/merchant_api_post_order_claim.c b/src/lib/merchant_api_post_order_claim.c
index 2fa6e87e..7b887847 100644
--- a/src/lib/merchant_api_post_order_claim.c
+++ b/src/lib/merchant_api_post_order_claim.c
@@ -165,21 +165,6 @@ handle_post_order_claim_finished (void *cls,
 }
 
 
-/**
- * Calls the POST /orders/$ID/claim API at the backend.  That is,
- * retrieve the final contract terms including the client nonce.
- *
- * This is a PUBLIC API for wallets.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param order_id order id used to perform the lookup
- * @param nonce nonce to use to claim the proposal
- * @param claim_token the token used to verify the claim
- * @param cb callback which will work the response gotten from the backend
- * @param cb_cls closure to pass to @a cb
- * @return handle for this handle, NULL upon errors
- */
 struct TALER_MERCHANT_OrderClaimHandle *
 TALER_MERCHANT_order_claim (struct GNUNET_CURL_Context *ctx,
                             const char *backend_url,
@@ -258,11 +243,6 @@ TALER_MERCHANT_order_claim (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a POST /orders/$ID/claim request.
- *
- * @param och handle to the request to be canceled
- */
 void
 TALER_MERCHANT_order_claim_cancel (struct TALER_MERCHANT_OrderClaimHandle *och)
 {
diff --git a/src/lib/merchant_api_post_order_pay.c b/src/lib/merchant_api_post_order_pay.c
index 05c798c1..a9abdfab 100644
--- a/src/lib/merchant_api_post_order_pay.c
+++ b/src/lib/merchant_api_post_order_pay.c
@@ -406,22 +406,6 @@ handle_pay_finished (void *cls,
 }
 
 
-/**
- * PAY a merchant.  API for frontends talking to backends. Here,
- * the frontend does not have the coin's private keys, but just
- * the public keys and signatures.  Note the subtle difference
- * in the type of @a coins compared to #TALER_MERCHANT_pay().
- *
- * @param ctx the execution loop context
- * @param merchant_url base URL of the merchant's backend
- * @param order_id order to pay
- * @param session_id session to pay for, or NULL for none
- * @param num_coins number of coins used to pay
- * @param coins array of coins we use to pay
- * @param pay_cb the callback to call when a reply for this request is available
- * @param pay_cb_cls closure for @a pay_cb
- * @return a handle for this request
- */
 struct TALER_MERCHANT_OrderPayHandle *
 TALER_MERCHANT_order_pay_frontend (
   struct GNUNET_CURL_Context *ctx,
@@ -592,31 +576,6 @@ TALER_MERCHANT_order_pay_frontend (
 }
 
 
-/**
- * Pay a merchant.  API for wallets that have the coin's private keys.
- * _NOTE_: this function does NOT calculate each coin amount in order
- * to match the contract total price.  This calculation is to be made
- * by the logic using this library.
- *
- * @param ctx the execution loop context
- * @param merchant_url base URL of the merchant's backend
- * @param session_id session to pay for, or NULL for none
- * @param h_contract_terms hashcode of the proposal being paid
- * @param amount total value of the contract to be paid to the merchant
- * @param max_fee maximum fee covered by the merchant (according to the contract)
- * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
- * @param merchant_sig signature from the merchant over the original contract
- * @param timestamp timestamp when the contract was finalized, must match approximately the current time of the merchant
- * @param refund_deadline date until which the merchant can issue a refund to the customer via the merchant (can be zero if refunds are not allowed)
- * @param pay_deadline maximum time limit to pay for this contract
- * @param h_wire hash of the merchant’s account details
- * @param order_id order id of the proposal being paid
- * @param num_coins number of coins used to pay
- * @param coins array of coins we use to pay
- * @param pay_cb the callback to call when a reply for this request is available
- * @param pay_cb_cls closure for @a pay_cb
- * @return a handle for this request
- */
 struct TALER_MERCHANT_OrderPayHandle *
 TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx,
                           const char *merchant_url,
@@ -717,12 +676,6 @@ TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a pay request.  This function cannot be used on a request handle if
- * a response is already served for it.
- *
- * @param oph the pay request handle
- */
 void
 TALER_MERCHANT_order_pay_cancel (struct TALER_MERCHANT_OrderPayHandle *oph)
 {
diff --git a/src/lib/merchant_api_post_orders.c b/src/lib/merchant_api_post_orders.c
index 7553dfa2..77b140df 100644
--- a/src/lib/merchant_api_post_orders.c
+++ b/src/lib/merchant_api_post_orders.c
@@ -180,20 +180,6 @@ handle_post_order_finished (void *cls,
 }
 
 
-/**
- * POST an order to the backend and receives the related proposal.
- *
- * @param ctx execution context
- * @param backend_url URL of the backend
- * @param order basic information about this purchase,
- *        to be extended by the backend
- * @param refund_delay how long can refunds happen for this order; 0 to use
- *             absolute value from contract (or not allow refunds).
- * @param cb the callback to call when a reply
- *        for this request is available
- * @param cb_cls closure for @a proposal_cb
- * @return a handle for this request, NULL on error
- */
 struct TALER_MERCHANT_PostOrdersOperation *
 TALER_MERCHANT_orders_post (struct GNUNET_CURL_Context *ctx,
                             const char *backend_url,
@@ -217,25 +203,6 @@ TALER_MERCHANT_orders_post (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * POST to /orders at the backend to setup an order and obtain
- * the order ID (which may have been set by the front-end).
- *
- * @param ctx execution context
- * @param backend_url URL of the backend
- * @param order basic information about this purchase, to be extended by the backend
- * @param refund_delay how long can refunds happen for this order; 0 to use
- *             absolute value from contract (or not allow refunds).
- * @param payment_target desired payment target identifier (to select merchant bank details)
- * @param inventory_products_length length of the @a inventory_products array
- * @param inventory_products products to add to the order from the inventory
- * @param lock_uuids_length length of the @a uuids array
- * @param uuids array of UUIDs with locks on @a inventory_products
- * @param create_token whether to create a claim token
- * @param cb the callback to call when a reply for this request is available
- * @param cb_cls closure for @a cb
- * @return a handle for this request, NULL on error
- */
 struct TALER_MERCHANT_PostOrdersOperation *
 TALER_MERCHANT_orders_post2 (
   struct GNUNET_CURL_Context *ctx,
@@ -361,12 +328,6 @@ TALER_MERCHANT_orders_post2 (
 }
 
 
-/**
- * Cancel a POST /proposal request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param po the proposal operation request handle
- */
 void
 TALER_MERCHANT_orders_post_cancel (
   struct TALER_MERCHANT_PostOrdersOperation *po)
diff --git a/src/lib/merchant_api_post_products.c b/src/lib/merchant_api_post_products.c
index c3666ec2..32d11b3e 100644
--- a/src/lib/merchant_api_post_products.c
+++ b/src/lib/merchant_api_post_products.c
@@ -151,30 +151,6 @@ handle_post_products_finished (void *cls,
 }
 
 
-/**
- * Make a POST /products request to add a product to the
- * inventory.
- *
- * @param ctx the context
- * @param backend_url HTTP base URL for the backend
- * @param product_id identifier to use for the product
- * @param description description of the product
- * @param description_i18n Map from IETF BCP 47 language tags to localized descriptions
- * @param unit unit in which the product is measured (liters, kilograms, packages, etc.)
- * @param price the price for one @a unit of the product, zero is used to imply that
- *              this product is not sold separately or that the price is not fixed and
- *              must be supplied by the front-end.  If non-zero, price must include
- *              applicable taxes.
- * @param image base64-encoded product image
- * @param taxes list of taxes paid by the merchant
- * @param total_stock in @a units, -1 to indicate "infinite" (i.e. electronic books)
- * @param address where the product is in stock
- * @param next_restock when the next restocking is expected to happen, 0 for unknown,
- *                     #GNUNET_TIME_UNIT_FOREVER_ABS for 'never'.
- * @param cb function to call with the backend's result
- * @param cb_cls closure for @a cb
- * @return the request handle; NULL upon error
- */
 struct TALER_MERCHANT_ProductsPostHandle *
 TALER_MERCHANT_products_post (
   struct GNUNET_CURL_Context *ctx,
diff --git a/src/lib/merchant_api_post_transfers.c b/src/lib/merchant_api_post_transfers.c
index c621b4ce..b8b5accb 100644
--- a/src/lib/merchant_api_post_transfers.c
+++ b/src/lib/merchant_api_post_transfers.c
@@ -302,12 +302,6 @@ TALER_MERCHANT_transfers_post (
 }
 
 
-/**
- * Cancel a POST /transfers request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param pth handle to the tracking operation being cancelled
- */
 void
 TALER_MERCHANT_transfers_post_cancel (
   struct TALER_MERCHANT_PostTransfersHandle *pth)
diff --git a/src/lib/merchant_api_tip_pickup.c b/src/lib/merchant_api_tip_pickup.c
index 24ab7eb3..9cd5fb52 100644
--- a/src/lib/merchant_api_tip_pickup.c
+++ b/src/lib/merchant_api_tip_pickup.c
@@ -167,19 +167,6 @@ pickup_done_cb (void *cls,
 }
 
 
-/**
- * Issue a /tip-pickup request to the backend.  Informs the backend
- * that a customer wants to pick up a tip.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param tip_id unique identifier for the tip
- * @param num_planches number of planchets provided in @a pds
- * @param pds array of planchet secrets to be signed into existence for the tip
- * @param pickup_cb callback which will work the response gotten from the backend
- * @param pickup_cb_cls closure to pass to @a pickup_cb
- * @return handle for this operation, NULL upon errors
- */
 struct TALER_MERCHANT_TipPickupHandle *
 TALER_MERCHANT_tip_pickup (struct GNUNET_CURL_Context *ctx,
                            const char *backend_url,
@@ -243,11 +230,6 @@ TALER_MERCHANT_tip_pickup (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a pending /tip-pickup request
- *
- * @param tp handle from the operation to cancel
- */
 void
 TALER_MERCHANT_tip_pickup_cancel (struct TALER_MERCHANT_TipPickupHandle *tp)
 {
diff --git a/src/lib/merchant_api_tip_pickup2.c b/src/lib/merchant_api_tip_pickup2.c
index ec916f87..8009687b 100644
--- a/src/lib/merchant_api_tip_pickup2.c
+++ b/src/lib/merchant_api_tip_pickup2.c
@@ -222,19 +222,6 @@ handle_tip_pickup_finished (void *cls,
 }
 
 
-/**
- * Issue a /tips/$ID/tip-pickup request to the backend.  Informs the backend
- * that a customer wants to pick up a tip.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param tip_id unique identifier for the tip
- * @param num_planches number of planchets provided in @a planchets
- * @param planchets array of planchets to be signed into existence for the tip
- * @param pickup_cb callback which will work the response gotten from the backend
- * @param pickup_cb_cls closure to pass to @a pickup_cb
- * @return handle for this operation, NULL upon errors
- */
 struct TALER_MERCHANT_TipPickup2Handle *
 TALER_MERCHANT_tip_pickup2 (struct GNUNET_CURL_Context *ctx,
                             const char *backend_url,
@@ -350,12 +337,6 @@ TALER_MERCHANT_tip_pickup2 (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a /tips/$TIP_ID/pickup request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param tpo handle to the tracking operation being cancelled
- */
 void
 TALER_MERCHANT_tip_pickup2_cancel (
   struct TALER_MERCHANT_TipPickup2Handle *tpo)
diff --git a/src/lib/merchant_api_wallet_get_order.c b/src/lib/merchant_api_wallet_get_order.c
index bc3ba8c8..3e115850 100644
--- a/src/lib/merchant_api_wallet_get_order.c
+++ b/src/lib/merchant_api_wallet_get_order.c
@@ -214,29 +214,6 @@ handle_wallet_get_order_finished (void *cls,
 }
 
 
-/**
- * Checks the status of a payment.  Issue a GET /orders/$ID request to the
- * backend.  The @a h_contract serves as identification of the wallet and is
- * used to authorize the request.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param order_id order id to identify the payment
- * @param h_contract hash of the contract to authenticate the wallet
- * @param timeout timeout to use in long polling (how long may the server wait to reply
- *        before generating an unpaid response). Note that this is just provided to
- *        the server, we as client will block until the response comes back or until
- *        #TALER_MERCHANT_order_get_cancel() is called.
- * @param session_id for which session should the payment status be checked
- * @param min_refund long poll for the service to approve a refund exceeding this value;
- *        use NULL to not wait for any refund (only for payment). Only makes sense
- *        with a non-zero @a timeout. Can be NULL.
- * @param await_refund_obtained long poll for the order's refunds to be
- *        picked up by the wallet.
- * @param cb callback which will work the response gotten from the backend
- * @param cb_cls closure to pass to @a cb
- * @return handle for this operation, NULL upon errors
- */
 struct TALER_MERCHANT_OrderWalletGetHandle *
 TALER_MERCHANT_wallet_order_get (struct GNUNET_CURL_Context *ctx,
                                  const char *backend_url,
@@ -367,11 +344,6 @@ TALER_MERCHANT_wallet_order_get (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a GET /orders/$ID request.
- *
- * @param owgh handle to the request to be canceled
- */
 void
 TALER_MERCHANT_wallet_order_get_cancel (
   struct TALER_MERCHANT_OrderWalletGetHandle *owgh)
diff --git a/src/lib/merchant_api_wallet_get_tip.c b/src/lib/merchant_api_wallet_get_tip.c
index a6035dc2..0b953963 100644
--- a/src/lib/merchant_api_wallet_get_tip.c
+++ b/src/lib/merchant_api_wallet_get_tip.c
@@ -155,17 +155,6 @@ handle_wallet_tip_get_finished (void *cls,
 }
 
 
-/**
- * Issue a GET /tips/$TIP_ID request to the backend.  Informs the backend
- * that a customer wants to pick up a tip.
- *
- * @param ctx execution context
- * @param backend_url base URL of the merchant backend
- * @param tip_id which tip should we query
- * @param cb function to call with the result
- * @param cb_cls closure for @a cb
- * @return handle for this operation, NULL upon errors
- */
 struct TALER_MERCHANT_TipWalletGetHandle *
 TALER_MERCHANT_wallet_tip_get (struct GNUNET_CURL_Context *ctx,
                                const char *backend_url,
@@ -225,12 +214,6 @@ TALER_MERCHANT_wallet_tip_get (struct GNUNET_CURL_Context *ctx,
 }
 
 
-/**
- * Cancel a GET /tips/$TIP_ID request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param tqo handle to the operation being cancelled
- */
 void
 TALER_MERCHANT_wallet_tip_get_cancel (
   struct TALER_MERCHANT_TipWalletGetHandle *tgh)