From a2a0c56078f992aca95c10caf91e1a75c0dfc0bd Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Wed, 6 Jan 2021 18:08:04 -0500 Subject: fix typo: s/-o, --output/-l, --logfile/g --- manpages/taler-exchange-offline.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manpages/taler-exchange-offline.1.rst b/manpages/taler-exchange-offline.1.rst index 8d62ac5f..af50a209 100644 --- a/manpages/taler-exchange-offline.1.rst +++ b/manpages/taler-exchange-offline.1.rst @@ -15,7 +15,7 @@ Synopsis [**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] [**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] -[**-o** *FILE* | **––output=**\ ‌\ *FILE*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] [**-v** | **––version**] [subcommand ...] @@ -58,7 +58,7 @@ The general options for **taler-exchange-offline** are: Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, ``WARNING``, ``ERROR``. -**-o** *FILE* \| **––output=**\ ‌\ *FILE* +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* Where to write a denomination key signing request file to be given to the auditor. -- cgit v1.2.3 From dcd276a239de0a7861656883afb98474ca7c6d90 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Wed, 6 Jan 2021 19:50:12 -0500 Subject: update ‘-l’ option explanation accordingly w/ last commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-offline.1.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manpages/taler-exchange-offline.1.rst b/manpages/taler-exchange-offline.1.rst index af50a209..793a00fc 100644 --- a/manpages/taler-exchange-offline.1.rst +++ b/manpages/taler-exchange-offline.1.rst @@ -59,8 +59,7 @@ The general options for **taler-exchange-offline** are: ``WARNING``, ``ERROR``. **-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* - Where to write a denomination key signing request file to be given to - the auditor. + Send logging output to *FILENAME*. **-v** \| **––version** Print version information. -- cgit v1.2.3 From 68ebf60359906eda7d24c69fed0181692885dacd Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Wed, 6 Jan 2021 20:24:04 -0500 Subject: vet taler-exchange-transfer(1) options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - document options ‘-c’, ‘-L’, ‘-l’, ‘-T’ - add example for ‘-T’ --- manpages/taler-exchange-transfer.1.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/manpages/taler-exchange-transfer.1.rst b/manpages/taler-exchange-transfer.1.rst index 05ee8aca..c9b41930 100644 --- a/manpages/taler-exchange-transfer.1.rst +++ b/manpages/taler-exchange-transfer.1.rst @@ -12,7 +12,11 @@ Synopsis ======== **taler-exchange-transfer** +[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] +[**-T** *USEC* | **––timetravel**\ \ *USEC*] [**-t** | **––test**] [**-v** | **––version**] @@ -29,6 +33,18 @@ The transfers are prepared by the **taler-exchange-aggregator** and **taler-exch **-h** \| **––help** Print short help on options. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + +**-T** *USEC* \| **––timetravel=**\ \ *USEC* + Modify system time by given microsecond offset. + *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``). + This option is intended for debugging/testing only. + **-t** \| **––test** Run in test mode and exit when idle. -- cgit v1.2.3 From bcc90ef5324c292a4aa9d2d9a1162b29979aaade Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Wed, 6 Jan 2021 20:34:46 -0500 Subject: vet taler-exchange-wirewatch(1) options (partially) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - reorder options lexicographically - document options ‘-c’, ‘-L’, ‘-l’ TODO: Address discrepency between ‘-T’ in ‘--help’ output and in manpage. Likewise for ‘-t’. --- manpages/taler-exchange-wirewatch.1.rst | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/manpages/taler-exchange-wirewatch.1.rst b/manpages/taler-exchange-wirewatch.1.rst index 2cf56e87..4c15485b 100644 --- a/manpages/taler-exchange-wirewatch.1.rst +++ b/manpages/taler-exchange-wirewatch.1.rst @@ -12,10 +12,13 @@ Synopsis ======== **taler-exchange-wirewatch** -[**-t** *PLUGINNAME* | **––type=**\ ‌\ *PLUGINNAME*] +[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] -[**-T** | **––test**] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] [**-r** | **––reset**] +[**-T** | **––test**] +[**-t** *PLUGINNAME* | **––type=**\ ‌\ *PLUGINNAME*] [**-v** | **––version**] Description @@ -26,20 +29,31 @@ transactions into the Taler exchange database. Its options are as follows: -**-t** *PLUGINNAME* \| **––type=**\ ‌\ *PLUGINNAME* - Use the specified wire plugin and its configuration to talk to the - bank. +**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME* + Use the configuration and other resources for the exchange to operate + from *FILENAME*. **-h** \| **––help** Print short help on options. -**-T** \| **––test** - Run in test mode and exit when idle. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. **-r** \| **––reset** Ignore our own database and start with transactions from the beginning of time. +**-T** \| **––test** + Run in test mode and exit when idle. + +**-t** *PLUGINNAME* \| **––type=**\ ‌\ *PLUGINNAME* + Use the specified wire plugin and its configuration to talk to the + bank. + **-v** \| **––version** Print version information. -- cgit v1.2.3 From ffd1b6568e677ca9782ad0dc931879cb19be3a88 Mon Sep 17 00:00:00 2001 From: Stefan Kügel Date: Thu, 7 Jan 2021 22:17:22 +0100 Subject: Chapter 012 for the design documents added to TOC list --- design-documents/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/design-documents/index.rst b/design-documents/index.rst index 1c3b97d3..5df2fe97 100644 --- a/design-documents/index.rst +++ b/design-documents/index.rst @@ -21,3 +21,4 @@ and protocol. 009-backup 010-exchange-helpers 011-auditor-db-sync + 012-fee-schedule-metrics -- cgit v1.2.3 From fc0db62f065d6fe373c1cd883a368682449e128c Mon Sep 17 00:00:00 2001 From: Stefan Kügel Date: Thu, 7 Jan 2021 22:26:57 +0100 Subject: Design document on Fee schedule and metrics, different perspectives from Exchange operators, buyers and sellers, users and merchants --- design-documents/012-fee-schedule-metrics.rst | 181 ++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 design-documents/012-fee-schedule-metrics.rst diff --git a/design-documents/012-fee-schedule-metrics.rst b/design-documents/012-fee-schedule-metrics.rst new file mode 100644 index 00000000..256b697e --- /dev/null +++ b/design-documents/012-fee-schedule-metrics.rst @@ -0,0 +1,181 @@ +Fees schedule and fee metrics +###################################### + +.. warning:: + + This document is a draft. + +Summary +======= + +This chapter discusses considerations for fees from different points of view (Exchange operators, customer/users, and sellers/merchants. + +Introduction +============ + +Fees are necessary for covering costs that Exchange operators bear for offering their services established in-house or outsourced in a data center: Variable costs (e.g. electricity and wire fees for every wired transaction to bank accounts) and expenses of constant height for hardware, company assets, marketing and staff, and so forth. They will allocate these costs to customers. The Taler protocol therefore offers different types of fees for each type of transaction that may appear in the transaction cycle. There are six fee types available which can be chosen by the Exchange operator, defining their specific value within the limits given by the protocol. + +Any coin that has been generated or that is used (deposited) or refreshed can be charged with an applicable fee type. In addition to this, every wired amount of money can be charged with a wire fee. The six fee types are named as 'Withdrawal', 'Deposit', 'Refresh', 'Refund', 'Wire fee' and 'Closing'. The fee type 'Closing' is used for allocating costs that arise from an uncompleted withdrawal transaction when an amount of fiat money has to be wired back from the Exchange's escrow account to the bank account of origin. + +Fee types and their underlying metrics are not only due to cover real costs in the long run, but also to reward users for their economic behaviour, to prevent misuse, and to allow Exchange operators to gain certain income and most probably profits. Exchange operators are thus determining the combination of fee types and the height of each fee for every denomination of coins. Any chosen denomination (constant nominal value of coins preset by the operator by means of the Denomination key) will subsequently come along with a variety of fee types and their individually specified height. + + +1 Fee schedule +============== + +Whereas the Taler protocol determines types of fees, Exchange operators determine the upper and lower limits of fees using parameters. Once they have set the fee height per denomination, the algorithm of the Taler payment system will allocate costs automatically to every generated coin respectively to a wired amount. + +The fee structure and its underlying metrics are also bound to rules and expectations of financial regulatory authorities like the German Federal Financial Supervisory Authority (Bundesanstalt für Finanzdienstleistungsaufsicht BaFin). Changes to the fee structure are therefore eligible only when they are in accordance with national or international laws and directives. + +Fees chosen by Exchange operators have to be explained to the users by means of comprehensive Terms and conditions of services that rule out the different and heights of fees and how they are calculated. Costs for wired amounts within the banking system (IBAN transfers to the Exchange's escrow account for the withdrawal transaction) have to be covered by users, so additionally Terms and conditions of their banks may be effective, too. These Terms of banking services are not part of the Taler payment system, nevertheless Exchange operators should make users aware of this fact, that each wired transactions may cause costs on their expense. + +1.1 Obligations of Exchange operators +--------------------------------------- + +Exchange operators have to adhere to the fee schedule. Otherwise they can lose their interface access, have their certification revoked and, moreover, even become liable for damages. For each transaction type there is one specific fee type. Exchange operators set the height of fees. If a fee type is set to a value of 0, this fee type will not contribute to the operator's income from fees. + +Three fee types ('Wire fee', 'Closing' and 'Recoup') will cause costs for Exchange operators due to wire transfers to accounts wired by banks. Therefore, operators must find suitable ways to have these costs covered by customers. + +The 'Recoup' protocol does not allow Exchange operators to set any fee height, because reimbursing funds from an Exchange that is about to cease its activity must always be at zero costs for the users. Wiring fees in the case of 'Recoup' have to be entirely covered by Exchange operators instead. + +Setting all of the six fee types to 0 means would simply the payment system and make it more attractive to users. However, Exchange operators need effective counter-measures against possible misuse. Transactions that are abundantly often repeated by malicious users are driving costs, thus harming operators. Making these transactions costly to those who trigger them intentionally is the only way to solve this issue. + +For example, if the Exchange operator sets the 'Refresh' fee at the level of the specific costs incurred for this transaction type, malicious cost driving with refresh does at least not damage the exchange, but only charges those users who have their coins refreshed particularly frequently (see detailed below). + +Operators agree that their audit reports report income from fees to the auditors and, accordingly, to the supervisory authorities. Fees on coins at set the time they are issued and cannot be changed afterwards. According to the Taler protocol, fees on bank transfers can only be adjusted annually and are set by the operator for at least 2 years in the future. Thanks to this constant fee, merchants can better plan costs to be added and include them in their sales prices. + +Terms and conditions of every Exchange must also clearly indicate to the user that if they refuse to save copies of their Taler coins (with a backup tool like e.g. "Anastasis") they are risking a total loss of coin ownership. + +A private bank that hosts an Exchange and normally charges its customers for IBAN transfers has the option of waiving the applying fees for their customers when they are withdrawing from their own checking accounts into Taler wallets. + +1.2 Buyer's obligations +----------------------- + +Prior to making a first withdrawal from an Exchange users are required to read and confirm the Terms and conditions of the relevant Exchange. This step is mandatory when changes to Terms and conditions take place. Users accept Terms and conditions by confirming them in the mobile application or on the web. Terms and conditions also require users to accept possible losses of funds in wallets through 'Refresh' fees, which can be eventually charged by Exchange operators. + +All charge types and amounts are displayed to users prior to each withdrawal. Specific transaction-related transaction fees that users would have to pay are always displayed by the wallet as part of the interactive transaction process. Wire fees are also shown to the users. The fee type 'Wire fee' allows merchants (sellers) to split the charged amount when they deem an Exchange's wire fee to be too high and pass on the split charge to buyers and bear the remainder. The respective amount of the 'Wire fee' is set by the merchant using the variable wire_fee_amortization and will be automatically applied. + +In accordance with the Terms and conditions, the users agree not to make any claim for damages against the payment system or the Exchange operator due to losses incurred by them as a result of theft or self-inflicted failure to secure the coins in the Taler wallet. + +Furthermore, according to the Terms and conditions, users must accept that the IBAN transfer from the users' personal checking account to the Exchange's escrow account may incur costs depending on the contract with their banks. These costs are not related to the Taler payment system and cannot be influenced by it. + +1.3 Obligations of merchants/sellers +------------------------------------ + +Normally, a plurality of buyers' spending transactions is summed up to one aggregated amount of revenue and wired to the receiving checking account of the merchant. Merchants can set the frequency by which these aggregated amounts are wired. Every wire transfer imposes costs on the Exchange operator collected by the operator's bank for having the amount wired. Therefore, the Exchange operator will tend to charge the 'Wire fee' to the sellers for this transaction type, as the sellers are the ones causing the aggregated transfer and not the buyers. If from a seller's point of view an Exchange operator has set the 'Wire fee' too high, the seller can make use of the Taler Merchant software and determine the so-called amortization factor to add all or part of the 'Wire fee' to the amount payable by customers who deposit coins from their wallets funded via this Exchange. + +During the withdrawal process, the wallet shows to the buyer the complete fee schedule and indicates the 'Wire fee' in case this fee is really charged. However, if a seller takes over the wire fee charge instead of the customers, the customers' wallets will no longer show a wire fee for that seller. These sellers thus render the fee schedule clearer for their customers, but certainly will have the wire fee calculated with their sales prices. + +Given the case that sellers enter incorrect account data for their own checking account, they are solely liable for any resulting damage and not the Exchange operator. Sellers bear the risk of a loss of value or even a total loss of their revenue if they enter a wrong IBAN for the transfer of their revenue, although syntactically correct. Similarly, the sellers alone bear charges due to an incorrect receiving account number or other posting errors that they cause and for which manual routing becomes necessary (e.g. in the case of lapsed accounts). + +1.4 Technical framework conditions for the collection of fees +------------------------------------------------------------- + +Fees are charged per coin or per wire transfer. The number of coins at withdrawal usually increases logarithmically with the amount represented. Fees can be applied to both flow quantities (e.g. coins moved at withdrawal and deposit transactions) and static quantities (e.g. coins stored in wallets). The fees on coins may differ depending on the time of issuance of a coin and depending on the value of a coin. They are fixed for each coin with its time of issuance, so they cannot be changed subsequently during their validity by the Exchange operator. + +During the entire period of validity, all Denomination keys and the selected fee types shall remain valid. Each fee type is always managed as a variable in the exchange interface even if the amount is 0 units. + +The refresh transaction is automatically triggered by the wallet software 3 months before the end of the validity of a coin. Especially if Exchange operators charge refresh fees, they have to point out this automatic feature to the users in their Terms and conditions. + + +2 Fee types +=========== + +The Taler protocol offers the following fee types: + +1. 'Withdrawal': For each successful withdrawal from the checking account, per coin +2. 'Deposit': For spending, per coin +3. 'Refresh': Per coin for + a. Refresh transactions for receiving change + b. Refresh of coins at the end of their validity + c. Abort of transactions due to network failure + d. Refund +4. 'Refund': For refunds or in case of contract cancellation by seller, per coin +5. 'Wire fee': For aggregated amounts wired by the Exchange to the merchant's checking account, per wired transfer +6. 'Closing': In case that a withdrawal process could not be accomplished (the users' wallet did not withdraw the value from the reserve), per wired transfer from the Exchange's escrow account to the account of origin + + +2.1 Effects of fee types on Exchange operators, buyers and sellers +------------------------------------------------------------------ + +Each of the above fee types is now considered viewed from the perspective of the buyer, the exchange operator, and the seller: + +* 'Withdrawal' from the buyer's point of view: + +Anyone who wants to load Taler wallets with coins must initiate a wired transfer from the own checking account to the Exchange operator's escrow account to let the Exchange fund a reserve which can be subsequently withdrawn by the wallet. Costs for the wired transfer may be incurred according to the user's contract with the bank. In addition to these potentially incurred costs, the withdrawal fee could be charged for each coin withdrawn into the wallet. Even though many bank customers are already accustomed to wire transfer charges, the withdrawal fee acts like a loss of purchasing power even before intended transactions take place. Buyers are made aware this loss when being shown all types of fees at withdrawal. Once buyers become aware that they will have to pay the cost for each coin generated, they might prefer to have as few high-denomination coins as possible withdrawn into their wallets. + +* 'Withdrawal' from the Exchange operator's point of view: + +A fee on each coin generated would indeed hit all electronic coins withdrawn from an exchange operator and allocate costs necessary for their generation over all coins signed for the first time, but would not prevent abuse through other transactions like intentionally often triggered refresh or refund and would also discriminate against those users who withdraw and deposit many smaller denominations. Furthermore, buyers using coins with higher denominations could increase the exchange operator's costs by increasing refresh transactions. Overall, the cost increases are marginally small, though. + +* 'Withdrawal' from the seller's point of view: + +While withdrawal fees do not burden sellers, withdrawal fees are imposing a threshold for their customers (see argumentation above). Sellers would even prefer to include the costs of generating coins in their selling prices and hide it from customers. However, the coins generated for customers during the withdrawal process do not correspond with the sellers in any way. + +* 'Deposit' from the buyer's point of view: + +Although customers are triggering the deposit request to finalize their purchase, it is always the seller who has to bear the deposit fee per coin - but only up to a maximum value determined by the seller (using the variable default_max_deposit_fee). The remainder of the deposit fee exceeding this maximum value has to be paid by the respective buyer. Deposit fees could theoretically be used to distribute all costs that Exchange operators have to bear. This would mean that all costs will be allocated to all coins deposited for buying goods and services. Usually, buyers can easily understand that a fee is charged on deposited coins. This is why 'Deposit' should be taken into consideration as an important and easy to propagate fee, not only from a buyers' perspective, but also from the operators' point of view. + +* 'Deposit' from the Exchange operator's point of view: + +During deposit, the Exchange logic compares the public key of each coin with the keys stored in an array in the Exchange's Postgres database and examines each coin to determine whether it is redeemed for payment for the first time. This process consumes little energy and adds no additional cost. For Exchange operators, this marginally small cost factor can only become significant when there is a very high amount of deposit transactions to encounter (e.g. at large web-shops). Deposit fees, above all, represent the most important source of income for the Exchange operator and can easily be collected over all coins used. + +* 'Deposit' from the seller's point of view: + +If an Exchange operator charges relatively high deposit fees, sellers have a means to correlate the fee height. As pointed out before, a seller must bear deposit fees, but only up to the maximum determined by the variable default_max_deposit_fee, which every seller specifies individually. + +Deposit fees will also affect refund transactions, for example when a rebate is given by the seller to the customer. Only in the case of a complete withdrawal from the contract by the seller the refund transaction exempts the buyers from deposit fees. Then, the refund transaction incurs the refresh fee only that would be borne by the buyers. If the seller's refund is partly, only the seller's deposit fee is waived, which means from the buyer's perspective a partly refunded purchase with coins signed at an Exchange with high deposit fees is becoming less attractive. In other words: Deposit fees exceeding the seller's maximum value will be borne by the buyers, making the rebate worse from the buyers' perspective. + +Generally, sellers want to ensure that +(1) the exchange selected by the buyers complies with the regulatory requirements of the supervisory authorities (e.g. BaFin) and with anti-money laundering laws (AML), +(2) if paying is in EURO the exchange operates in the SEPA currency area, and +(3) the fees of the selected exchange are within the limits of what the seller sets using its maximum deposit fee values (and wire fee maximum values as described below). + +* 'Refresh' from the buyer's point of view: + +Refresh fees are mostly caused by the generation of fresh coins as change for a coin of higher denomination that was redeemed for a smaller price that had to be paid: The payment amount was paid with a coin of a higher denomination, subsequently the wallet receives coins with denominations that add up to the difference. The refresh fee for the change booking is therefore only ever charged for one coin used and is marginally low from the buyer's point of view. Refresh also occurs together with refund transactions (a refresh transaction will always be triggered subsequently to discounting or a cancellation of purchase contracts). Less often are refresh transactions due to the expiration of coins or because of transaction aborts after network errors. The fee on refreshes is charged per coin and will be burdened to buyers. It is intended to deter costs incurred by the Exchange in the event of misuse. Buyers will marginally consider this fee as a small personal burden as a remedy to avoid possible abuse with refreshes triggered off in masses by a harmful party, as its absolute amount per coin is low. + +* 'Refresh' from the Exchange operator's point of view: + +As long as there is no abuse with refresh transactions, the Exchange operator has to consider whether to pass on the costs for refreshes directly to the buyers or to cover these costs with another type of fee. Using the refresh fee to cover costs subsequent to intentional abuse means that the originator of malicious refreshes charges all buyers of a targeted Exchange for their regular refresh bookings. While this does not prevent abuse itself, it only makes the transaction type 'Refresh' costly for those who frequently trigger refreshes. In the acute case of abuse, buyers are then charged fees, but the maliciously caused costs at least do not affect the specific Exchange, but all end users who receive signed coins from it. + +* 'Refresh' from the seller's point of view: + +Refresh transactions do not directly affect sellers, but the refund transaction does (see below here). + +* 'Refund' from the buyer's point of view: + +In contrast to the refresh fee type, the sellers - and not the buyers - are triggering the refund booking. If an Exchange charges the refund fee type, the already deposited coins of the buyers would be charged with this fee in case of a partial refund due to discounting after the conclusion of the purchase contract. Only in case of a full refund, the coins of the buyers will be relieved from deposit fees, but then they will be charged with the refresh fee, if the fee schedule of the Exchange chosen by the buyers levies the refresh fee. Normally, it lies within the seller's responsibility to give the reason for a discount or rebate. From the buyers' point of view, therefore, the sellers should legitimately bear this fee. + +* 'Refund' from the Exchange operator's point of view: + +Exchange operators cannot suppress refund postings because they must allow sellers to discount and cancel purchase contracts. A partial refund only partially relieves buyers of their deposit fees. Over time, customers are more likely to avoid such sellers who often have to discount after a contract is signed. Sellers who repeatedly trigger complete refunds, while exempting buyers' coins already deposited with the exchange from deposit fees, burden them with refresh fees. Should an Exchange operator then waive the refresh fee, it would incur costs. To avoid this, the Exchange operator must introduce or increase refresh fees, thereby charging all of its customers more by applying the refresh fee. From the point of view of the Exchange operator, the costs of both the partial and the complete refunds should have to be borne by the sellers, though, so that sellers should feel an incentive to avoid discounts or contract cancellation as far as possible, to fulfill the agreements on goods and services in accordance with the purchase contracts, and likewise to encourage their buyers to trigger returns and contract withdrawals less frequently (with all the economic and ecological effects that this entails, e.g. through frequent arbitrary returns of goods, the delivery and shipping costs, parcel handling and ecological damages that come along with this). + +* 'Refund' from the seller's point of view: + +As of today's implementation, in the event of a withdrawal from the purchase agreement, buyers bear the cost of the refund fee if the exchange charges it; in the event of a partial rebate, buyers bear the deposit fee for their used coins. Sellers are generally interested in keeping cancellations of contracts low and try to avoid unnecessary discount. + + +* 'Wire fee' from the buyer's point of view: + +This fee only directly affects buyers in the following case: the protocol allows sellers to partially pass on the cost of the fee to buyers if the exchange operator that signed buyers' coins set the wire fee fee above the value that each seller can (but is not required to) enter in its merchant backend with the max_wire_fee variable. The cost of the wire fee is factored into the sellers' prices. Sellers could pass on the relative cost benefits of the Taler payment system to their customers in the form of lower retail prices, but they are not forced to do so. + +* 'Wire fee' from the Exchange operator's point of view: + +The wire fee passes on the cost of SEPA postings from the escrow account to the seller accounts - from the exchange operator to the sellers. Buyers are only shown the wire fee if the seller does not pay it. Otherwise, customers don't realize what fee is being withheld from their spent coins at the exchange. For exchange operators, opting out of the wire fee would be tantamount to giving sellers carte blanche to trigger a collective booking of their sales revenue as often as possible. If, on the other hand, the exchange operator requires the wire fee to be remitted to the seller accounts, this fee will cause the sellers to adjust the frequency of the omnibus entry as they need it for their business and want to afford the fee for it. As the frequency of this type of posting increases, so does the absolute cost to sellers. Buyers learn about the wire fee charge only in the event that an Exchange operator sets it higher than the value that a seller has entered in the max_wire_fee variable. + +* 'Wire fee' from the seller's point of view: + +Sellers want to recognize their sales as quickly and often as possible. Timely revenue recognition improves their liquidity and generates interest income if sales revenues are received earlier than payments to suppliers. They are therefore forced to weigh whether they would rather bear higher absolute costs due to the wire fee or forego liquidity. For some vendors, on the other hand, the volume of bookings determines the frequency of the collective booking so as not to overload the accounting and billing departments. In any case, the costs of the wire fee are included in the end-user prices. + +* 'Closing' from the buyer's point of view: + +The closing charge is triggered by users of the payment system if, after a successful SEPA transfer to an Exchange's escrow account, they do not have the reserve withdrawn to their personal wallet because they do not have the wallet connected to the Taler exchange within 14 days. Since they are the originators and incur costs to the Exchange for the re-transfer, they also have to pay the closing fee. This is done by remitting the original remitted top-up amount minus the cost of SEPA transfers and possibly manual routing. The fee is easy to enforce and meets with understanding from most users, because as a rule they will not be affected by this type of fee and can also quickly understand the GTC passage that the originators must bear the costs for self-inflicted non-withdrawal. + +* 'Closing' from the Exchange operator's point of view: + +Costs for the closing of a reserve are incurred by the Exchange operator due to irregular user behavior. However, it must not be left to bear these costs, but must charge them to the user who caused them. The closing fee is indispensable for exchange operators in order to prevent abuse through cost driving. Charging and retaining the fee always works smoothly because the exchange's escrow account has been booked with a bank transfer - and not with a SEPA direct debit, which could be cancelled by the user with malicious intent. + +* 'Closing' from the seller's point of view: + +The closing transaction does not affect sellers in any way. -- cgit v1.2.3 From 032e0bea38ccfa07b4e399910fd7f7d26388af98 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 16:56:56 -0500 Subject: use arg parm name in description --- manpages/taler-exchange-transfer.1.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manpages/taler-exchange-transfer.1.rst b/manpages/taler-exchange-transfer.1.rst index c9b41930..6821a5fc 100644 --- a/manpages/taler-exchange-transfer.1.rst +++ b/manpages/taler-exchange-transfer.1.rst @@ -41,7 +41,7 @@ The transfers are prepared by the **taler-exchange-aggregator** and **taler-exch Send logging output to *FILENAME*. **-T** *USEC* \| **––timetravel=**\ \ *USEC* - Modify system time by given microsecond offset. + Modify the system time by *USEC* microseconds. *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``). This option is intended for debugging/testing only. -- cgit v1.2.3 From c09c9793d0ff9bffca8d622eed14a88e9e16721d Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 17:02:15 -0500 Subject: taler-exchange-wirewatch(1): rewrite description for ‘-T’, ‘-t’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-wirewatch.1.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/manpages/taler-exchange-wirewatch.1.rst b/manpages/taler-exchange-wirewatch.1.rst index 4c15485b..541e05ec 100644 --- a/manpages/taler-exchange-wirewatch.1.rst +++ b/manpages/taler-exchange-wirewatch.1.rst @@ -47,12 +47,13 @@ Its options are as follows: Ignore our own database and start with transactions from the beginning of time. -**-T** \| **––test** - Run in test mode and exit when idle. +**-T** *USEC* \| **––timetravel=**\ \ *USEC* + Modify the system time by *USEC* microseconds. + *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``). + This option is intended for debugging/testing only. -**-t** *PLUGINNAME* \| **––type=**\ ‌\ *PLUGINNAME* - Use the specified wire plugin and its configuration to talk to the - bank. +**-t** \| **––test** + Run in test mode and exit when idle. **-v** \| **––version** Print version information. -- cgit v1.2.3 From ad6b165139cbe15250c9c91517a579bf2f572e9c Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 17:07:16 -0500 Subject: taler-exchange-aggregator(1): vet opts ‘-c’, ‘-L’, ‘-l’, ‘-T’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-aggregator.1.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/manpages/taler-exchange-aggregator.1.rst b/manpages/taler-exchange-aggregator.1.rst index b547cbab..814c5c11 100644 --- a/manpages/taler-exchange-aggregator.1.rst +++ b/manpages/taler-exchange-aggregator.1.rst @@ -12,7 +12,11 @@ Synopsis ======== **taler-exchange-aggregator** +[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] +[**-T** *USEC* | **––timetravel**\ \ *USEC*] [**-t** | **––test**] [**-v** | **––version**] @@ -30,6 +34,18 @@ done by **taler-exchange-transfer**. **-h** \| **––help** Print short help on options. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + +**-T** *USEC* \| **––timetravel=**\ \ *USEC* + Modify the system time by *USEC* microseconds. + *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``). + This option is intended for debugging/testing only. + **-t** \| **––test** Run in test mode and exit when idle. -- cgit v1.2.3 From 6930adafe06a6b124ab6b02112af2b998b467402 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 19:59:15 -0500 Subject: taler-exchange-benchmark(1): remove opt ‘-b’, ‘--bank-url’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-benchmark.1.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manpages/taler-exchange-benchmark.1.rst b/manpages/taler-exchange-benchmark.1.rst index 1694c353..b6291b7d 100644 --- a/manpages/taler-exchange-benchmark.1.rst +++ b/manpages/taler-exchange-benchmark.1.rst @@ -15,7 +15,6 @@ Synopsis **taler-exchange-benchmark** [**-c** *CONFIG_FILENAME* | **––config=**\ ‌\ *CONFIG_FILENAME*] -[**-b** *BANK_URL* | **––bank-url=**\ ‌\ *BANK_URL*] [**-f** | **––fakebank**] [**-K** | **––linger**] [**-n** *HOWMANY_COINS* | **––coins-number=**\ ‌\ *HOWMANY_COINS*] @@ -35,10 +34,6 @@ that table are always erased during a single benchmark run. **-c** *CONFIG_FILENAME* \| **––config=**\ ‌\ *CONFIG_FILENAME* (Mandatory) Use CONFIG_FILENAME. -**-b** *BANK_URL* \| **––bank-url=**\ ‌\ *BANK_URL* - (Mandatory) The URL where the fakebank listens at. Must match the - host component in the exchange’s escrow account “payto” URL. - **-f** \| **––fakebank** Launch a fakebank instead of the Python bank. Only meaningful if the mode is to launch more than just a client. Note that using the -- cgit v1.2.3 From 043bc4c72523b547e17d659bb33042c18db8a854 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:04:35 -0500 Subject: taler-exchange-benchmark(1): reorder options --- manpages/taler-exchange-benchmark.1.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manpages/taler-exchange-benchmark.1.rst b/manpages/taler-exchange-benchmark.1.rst index b6291b7d..e73ca6df 100644 --- a/manpages/taler-exchange-benchmark.1.rst +++ b/manpages/taler-exchange-benchmark.1.rst @@ -16,10 +16,10 @@ Synopsis **taler-exchange-benchmark** [**-c** *CONFIG_FILENAME* | **––config=**\ ‌\ *CONFIG_FILENAME*] [**-f** | **––fakebank**] +[**-h** | **––help**] [**-K** | **––linger**] -[**-n** *HOWMANY_COINS* | **––coins-number=**\ ‌\ *HOWMANY_COINS*] [**-l** *LOGLEVEL* | **––log-level=**\ ‌\ *LOGLEVEL*] -[**-h** | **––help**] +[**-n** *HOWMANY_COINS* | **––coins-number=**\ ‌\ *HOWMANY_COINS*] Description =========== @@ -41,9 +41,15 @@ that table are always erased during a single benchmark run. as the fakebank is stateless and thus previous database state would inherently cause trouble. +**-h** \| **––help** + Prints a compiled-in help text. + **-K** \| **––linger** Linger around until keypress after the benchmark is done. +**-l** *LOGLEVEL* \| **––log-level=**\ ‌\ *LOGLEVEL* + GNUnet-compatible log level, takes values “ERROR/WARNING/INFO/DEBUG” + **-n** *HOWMANY_COINS* \| **––coins-number=**\ ‌\ *HOWMANY_COINS* Defaults to 1. Specifies how many coins this benchmark should withdraw and spend. After being spent, each coin will be refreshed @@ -51,12 +57,6 @@ that table are always erased during a single benchmark run. future versions of this tool should offer this parameter as a CLI option. -**-l** *LOGLEVEL* \| **––log-level=**\ ‌\ *LOGLEVEL* - GNUnet-compatible log level, takes values “ERROR/WARNING/INFO/DEBUG” - -**-h** \| **––help** - Prints a compiled-in help text. - See Also ======== -- cgit v1.2.3 From 4d120dd8a1a273d4cab1549f0990797a697401dd Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:05:51 -0500 Subject: taler-exchange-benchmark(1): fix typo: use ‘-L’ for ‘--log-level’; rewrite its description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-benchmark.1.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manpages/taler-exchange-benchmark.1.rst b/manpages/taler-exchange-benchmark.1.rst index e73ca6df..e674e4f6 100644 --- a/manpages/taler-exchange-benchmark.1.rst +++ b/manpages/taler-exchange-benchmark.1.rst @@ -18,7 +18,7 @@ Synopsis [**-f** | **––fakebank**] [**-h** | **––help**] [**-K** | **––linger**] -[**-l** *LOGLEVEL* | **––log-level=**\ ‌\ *LOGLEVEL*] +[**-L** *LOGLEVEL* | **––log-level=**\ ‌\ *LOGLEVEL*] [**-n** *HOWMANY_COINS* | **––coins-number=**\ ‌\ *HOWMANY_COINS*] Description @@ -47,8 +47,9 @@ that table are always erased during a single benchmark run. **-K** \| **––linger** Linger around until keypress after the benchmark is done. -**-l** *LOGLEVEL* \| **––log-level=**\ ‌\ *LOGLEVEL* - GNUnet-compatible log level, takes values “ERROR/WARNING/INFO/DEBUG” +**-L** *LOGLEVEL* \| **––log-level=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. **-n** *HOWMANY_COINS* \| **––coins-number=**\ ‌\ *HOWMANY_COINS* Defaults to 1. Specifies how many coins this benchmark should -- cgit v1.2.3 From 0ee36d632dd41c79068ed65013ec5a44de768753 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:21:01 -0500 Subject: taler-exchange-benchmark(1): add opts ‘-F’, ‘-l’, ‘-m’, ‘-v’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-benchmark.1.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/manpages/taler-exchange-benchmark.1.rst b/manpages/taler-exchange-benchmark.1.rst index e674e4f6..9847b091 100644 --- a/manpages/taler-exchange-benchmark.1.rst +++ b/manpages/taler-exchange-benchmark.1.rst @@ -15,11 +15,15 @@ Synopsis **taler-exchange-benchmark** [**-c** *CONFIG_FILENAME* | **––config=**\ ‌\ *CONFIG_FILENAME*] +[**-F** | **––reserves-first**] [**-f** | **––fakebank**] [**-h** | **––help**] [**-K** | **––linger**] [**-L** *LOGLEVEL* | **––log-level=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] +[**-m** *MODE* | **––mode=**\ \ *MODE*] [**-n** *HOWMANY_COINS* | **––coins-number=**\ ‌\ *HOWMANY_COINS*] +[**-v** | **––version**] Description =========== @@ -34,6 +38,9 @@ that table are always erased during a single benchmark run. **-c** *CONFIG_FILENAME* \| **––config=**\ ‌\ *CONFIG_FILENAME* (Mandatory) Use CONFIG_FILENAME. +**-F** \| **––reserves-first** + Create all reserves first, before starting normal operations. + **-f** \| **––fakebank** Launch a fakebank instead of the Python bank. Only meaningful if the mode is to launch more than just a client. Note that using the @@ -51,6 +58,12 @@ that table are always erased during a single benchmark run. Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, ``WARNING``, ``ERROR``. +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + +**-m** *MODE* \| **––mode=**\ \ *MODE* + Mode of operation. Accepted values are: ``exchange``, ``clients``, ``both``. + **-n** *HOWMANY_COINS* \| **––coins-number=**\ ‌\ *HOWMANY_COINS* Defaults to 1. Specifies how many coins this benchmark should withdraw and spend. After being spent, each coin will be refreshed @@ -58,6 +71,9 @@ that table are always erased during a single benchmark run. future versions of this tool should offer this parameter as a CLI option. +**-v** \| **––version** + Print version information. + See Also ======== -- cgit v1.2.3 From c51f0355716ae1546a6050cb57a08e5e7c23b7b2 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:23:57 -0500 Subject: taler-exchange-benchmark(1): update description of opt ‘-n’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-benchmark.1.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manpages/taler-exchange-benchmark.1.rst b/manpages/taler-exchange-benchmark.1.rst index 9847b091..792ada3a 100644 --- a/manpages/taler-exchange-benchmark.1.rst +++ b/manpages/taler-exchange-benchmark.1.rst @@ -67,9 +67,7 @@ that table are always erased during a single benchmark run. **-n** *HOWMANY_COINS* \| **––coins-number=**\ ‌\ *HOWMANY_COINS* Defaults to 1. Specifies how many coins this benchmark should withdraw and spend. After being spent, each coin will be refreshed - with a REFRESH_PROBABILITY probability, which is (hardcoded as) 0.1; - future versions of this tool should offer this parameter as a CLI - option. + with a probability RATE (see option ``--refresh-rate``). **-v** \| **––version** Print version information. -- cgit v1.2.3 From af35eb7493613eaaae5f7f53f985eabec3a61120 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:31:43 -0500 Subject: taler-exchange-benchmark(1): add opts ‘-p’, ‘-R’, ‘-r’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-benchmark.1.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/manpages/taler-exchange-benchmark.1.rst b/manpages/taler-exchange-benchmark.1.rst index 792ada3a..92efee4f 100644 --- a/manpages/taler-exchange-benchmark.1.rst +++ b/manpages/taler-exchange-benchmark.1.rst @@ -23,6 +23,9 @@ Synopsis [**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] [**-m** *MODE* | **––mode=**\ \ *MODE*] [**-n** *HOWMANY_COINS* | **––coins-number=**\ ‌\ *HOWMANY_COINS*] +[**-p** *NPROCS* | **––parallelism=**\ \ *NPROCS*] +[**-R** *RATE* | **––refresh-rate=**\ \ *RATE*] +[**-r** *N* | **––reserves=**\ \ *N*] [**-v** | **––version**] Description @@ -69,6 +72,15 @@ that table are always erased during a single benchmark run. withdraw and spend. After being spent, each coin will be refreshed with a probability RATE (see option ``--refresh-rate``). +**-p** *NPROCS* \| **––parallelism=**\ \ *NPROCS* + Run with *NPROCS* client processes. + +**-R** *RATE* \| **––refresh-rate=**\ \ *RATE* + Defaults to 10. Probability of refresh per coin (0-100). + +**-r** *N* \| **––reserves=**\ \ *N* + Create *N* reserves per client. + **-v** \| **––version** Print version information. -- cgit v1.2.3 From 2af8cd63a31c04e30e19f1b38db5688e6ebd4f31 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:39:39 -0500 Subject: taler-exchange-closer(1): add opts ‘-c’, ‘-L’, ‘-l’, ‘-T’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-closer.1.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/manpages/taler-exchange-closer.1.rst b/manpages/taler-exchange-closer.1.rst index 22f5aec3..7f316368 100644 --- a/manpages/taler-exchange-closer.1.rst +++ b/manpages/taler-exchange-closer.1.rst @@ -12,7 +12,11 @@ Synopsis ======== **taler-exchange-closer** +[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] +[**-T** *USEC* | **––timetravel=**\ \ *USEC*] [**-t** | **––test**] [**-v** | **––version**] @@ -31,6 +35,18 @@ to the originating bank account to be scheduled. **-h** \| **––help** Print short help on options. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + +**-T** *USEC* \| **––timetravel=**\ \ *USEC* + Modify the system time by *USEC* microseconds. + *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``). + This option is intended for debugging/testing only. + **-t** \| **––test** Run in test mode and exit when idle. -- cgit v1.2.3 From 6e4ceb088a7f00e977abf74c7aa991d2d41b046a Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:49:36 -0500 Subject: taler-exchange-dbinit(1): add opts ‘-c’, ‘-L’, ‘-l’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-dbinit.1.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/manpages/taler-exchange-dbinit.1.rst b/manpages/taler-exchange-dbinit.1.rst index dfbbfe4f..c1fdf344 100644 --- a/manpages/taler-exchange-dbinit.1.rst +++ b/manpages/taler-exchange-dbinit.1.rst @@ -13,8 +13,11 @@ Synopsis ======== **taler-exchange-dbinit** +[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] [**-g** | **––gc**] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] [**-r** | **––reset**] [**-v** | **––version**] @@ -38,6 +41,13 @@ Its options are as follows: Garbage collect database. Deletes all unnecessary data in the database. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + **-r** \| **––reset** Drop tables. Dangerous, will delete all existing data in the database before creating the tables. -- cgit v1.2.3 From d273a2efdf8a3c954a4e62bb2c4fb3bc5352214c Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:49:58 -0500 Subject: taler-exchange-dbinit(1): reorder opts --- manpages/taler-exchange-dbinit.1.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manpages/taler-exchange-dbinit.1.rst b/manpages/taler-exchange-dbinit.1.rst index c1fdf344..914c376c 100644 --- a/manpages/taler-exchange-dbinit.1.rst +++ b/manpages/taler-exchange-dbinit.1.rst @@ -14,8 +14,8 @@ Synopsis **taler-exchange-dbinit** [**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] -[**-h** | **––help**] [**-g** | **––gc**] +[**-h** | **––help**] [**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] [**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] [**-r** | **––reset**] @@ -34,13 +34,13 @@ Its options are as follows: Use the configuration and other resources for the exchange to operate from *FILENAME*. -**-h** \| **––help** - Print short help on options. - **-g** \| **––gc** Garbage collect database. Deletes all unnecessary data in the database. +**-h** \| **––help** + Print short help on options. + **-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, ``WARNING``, ``ERROR``. -- cgit v1.2.3 From 4be3c0f42804decc59467f7fd0572449a4388f9d Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 20:55:15 -0500 Subject: taler-exchange-httpd(1): reorder opts --- manpages/taler-exchange-httpd.1.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manpages/taler-exchange-httpd.1.rst b/manpages/taler-exchange-httpd.1.rst index fdbe6d0e..986fd438 100644 --- a/manpages/taler-exchange-httpd.1.rst +++ b/manpages/taler-exchange-httpd.1.rst @@ -43,12 +43,6 @@ Its options are as follows: Use the configuration and other resources for the merchant to operate from FILENAME. -**-h** \| **––help** - Print short help on options. - -**-v** \| **––version** - Print version information. - **-f** *FILENAME* \| **––file-input=**\ ‌\ *FILENAME* This option is only available if the exchange was compiled with the configure option ––enable-developer-mode. It is used for generating @@ -66,14 +60,20 @@ Its options are as follows: to test taler-exchange-httpd against many different possible inputs in a controlled way. -**-t** *SECONDS* \| **––timeout=**\ ‌\ *SECONDS* - Specifies the number of SECONDS after which the HTTPD should close - (idle) HTTP connections. +**-h** \| **––help** + Print short help on options. **-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* Specifies the log level to use. Accepted values are: DEBUG, INFO, WARNING, ERROR. +**-t** *SECONDS* \| **––timeout=**\ ‌\ *SECONDS* + Specifies the number of SECONDS after which the HTTPD should close + (idle) HTTP connections. + +**-v** \| **––version** + Print version information. + SIGNALS ======= -- cgit v1.2.3 From ffe066c746b09dcf6156bfb51f22741847c60393 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 21:02:06 -0500 Subject: taler-exchange-httpd(1): add opts ‘-a’, ‘-l’, ‘-n’, ‘-T’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-httpd.1.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/manpages/taler-exchange-httpd.1.rst b/manpages/taler-exchange-httpd.1.rst index 986fd438..9bdc1cd9 100644 --- a/manpages/taler-exchange-httpd.1.rst +++ b/manpages/taler-exchange-httpd.1.rst @@ -12,11 +12,15 @@ Synopsis ======== **taler-exchange-httpd** +[**-a** | **––allow-timetravel**] [**-C** | **––connection-close**] [**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-f** *FILENAME* | **––file-input=**\ ‌\ *FILENAME*] [**-h** | **––help**] [**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] +[**-n** *N* | **––num-threads=**\ \ *N*] +[**-T** *USEC* | **––timetravel=**\ \ *USEC*] [**-t** *SECONDS* | **––timeout=**\ ‌\ *SECONDS*] [**-v** | **––version**] @@ -67,6 +71,17 @@ Its options are as follows: Specifies the log level to use. Accepted values are: DEBUG, INFO, WARNING, ERROR. +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + +**-n** *N* \| **––num-threads=**\ \ *N* + Use *N* threads in the thread pool. + +**-T** *USEC* \| **––timetravel=**\ \ *USEC* + Modify the system time by *USEC* microseconds. + *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``). + This option is intended for debugging/testing only. + **-t** *SECONDS* \| **––timeout=**\ ‌\ *SECONDS* Specifies the number of SECONDS after which the HTTPD should close (idle) HTTP connections. -- cgit v1.2.3 From f8589ac3be114342d605b1ba80307988358d5a7e Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 21:02:37 -0500 Subject: taler-exchange-httpd(1): mark up ‘DEBUG’, ‘INFO’, ‘WARNING’, ‘ERROR’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-exchange-httpd.1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manpages/taler-exchange-httpd.1.rst b/manpages/taler-exchange-httpd.1.rst index 9bdc1cd9..6da60d1b 100644 --- a/manpages/taler-exchange-httpd.1.rst +++ b/manpages/taler-exchange-httpd.1.rst @@ -68,8 +68,8 @@ Its options are as follows: Print short help on options. **-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* - Specifies the log level to use. Accepted values are: DEBUG, INFO, - WARNING, ERROR. + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. **-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* Send logging output to *FILENAME*. -- cgit v1.2.3 From 50596028f928ca571b4b5380eea262608e2197dd Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 21:13:25 -0500 Subject: taler-auditor-dbinit(1): reorder opts --- manpages/taler-auditor-dbinit.1.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manpages/taler-auditor-dbinit.1.rst b/manpages/taler-auditor-dbinit.1.rst index 34159dcb..a6b6e079 100644 --- a/manpages/taler-auditor-dbinit.1.rst +++ b/manpages/taler-auditor-dbinit.1.rst @@ -13,8 +13,8 @@ Synopsis ======== **taler-auditor-dbinit** -[**-h** | **––help**] [**-g** | **––gc**] +[**-h** | **––help**] [**-R** | **––reset**] [**-r** | **––restart**] [**-v** | **––version**] @@ -32,13 +32,13 @@ Its options are as follows: Use the configuration and other resources for the exchange to operate from *FILENAME*. -**-h** \| **––help** - Print short help on options. - **-g** \| **––gc** Garbage collect database. Deletes all unnecessary data in the database. +**-h** \| **––help** + Print short help on options. + **-R** \| **––reset** Drop tables. Dangerous, will delete all existing data in the database. -- cgit v1.2.3 From 604eb369f556a95f182c844c5ab0544623ef5d24 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 21:15:38 -0500 Subject: taler-auditor-dbinit(1): add opts ‘-c’, ‘-L’, ‘-l’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-auditor-dbinit.1.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/manpages/taler-auditor-dbinit.1.rst b/manpages/taler-auditor-dbinit.1.rst index a6b6e079..af3ee947 100644 --- a/manpages/taler-auditor-dbinit.1.rst +++ b/manpages/taler-auditor-dbinit.1.rst @@ -13,8 +13,11 @@ Synopsis ======== **taler-auditor-dbinit** +[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-g** | **––gc**] [**-h** | **––help**] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] [**-R** | **––reset**] [**-r** | **––restart**] [**-v** | **––version**] @@ -39,6 +42,13 @@ Its options are as follows: **-h** \| **––help** Print short help on options. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + **-R** \| **––reset** Drop tables. Dangerous, will delete all existing data in the database. -- cgit v1.2.3 From 829487bae4cabead0467b6b3106844318209c43b Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 21:19:53 -0500 Subject: taler-auditor-exchange(1): reorder opts --- manpages/taler-auditor-exchange.1.rst | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/manpages/taler-auditor-exchange.1.rst b/manpages/taler-auditor-exchange.1.rst index 51549ec9..334079b3 100644 --- a/manpages/taler-auditor-exchange.1.rst +++ b/manpages/taler-auditor-exchange.1.rst @@ -13,8 +13,8 @@ Synopsis **taler-auditor-exchange** [**-h** | **––help**] -[**-r** | **––remove**] [**-m** *MASTERKEY* | **––exchange-key=**\ ‌\ *MASTERKEY*] +[**-r** | **––remove**] [**-u** *EXCHANGE_URL* | **––auditor-url=**\ ‌\ *EXCHANGE_URL*] Description @@ -27,22 +27,21 @@ denomination keys with taler-auditor-sign or trying to audit it with taler-auditor or taler-wire-auditor. Afterwards the exchange will be visible via the /exchanges API of the taler-auditor-httpd. -**-m** *MASTERKEY* \| **––exchange-key=**\ ‌\ *MASTERKEY* - Public key of the exchange in Crockford base32 encoding, for example - as generated by gnunet-ecc -p. - **-h** \| **––help** Print short help on options. -**-u** *EXCHANGE_URL* \| **––auditor-url=**\ ‌\ *EXCHANGE_URL* - URL of the exchange. The exchange’s HTTP API must be available at - this address. +**-m** *MASTERKEY* \| **––exchange-key=**\ ‌\ *MASTERKEY* + Public key of the exchange in Crockford base32 encoding, for example + as generated by gnunet-ecc -p. **-r** \| **––remove** Instead of adding the exchange, remove it. Note that this will drop ALL data associated with that exchange, including existing auditing information. So use with extreme care! +**-u** *EXCHANGE_URL* \| **––auditor-url=**\ ‌\ *EXCHANGE_URL* + URL of the exchange. The exchange’s HTTP API must be available at + this address. Diagnostics =========== -- cgit v1.2.3 From 5fce254f5b634d55d53a929a449b60cb98d76a3a Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 21:22:20 -0500 Subject: taler-auditor-exchange(1): add opts ‘-c’, ‘-v’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-auditor-exchange.1.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/manpages/taler-auditor-exchange.1.rst b/manpages/taler-auditor-exchange.1.rst index 334079b3..14603f4e 100644 --- a/manpages/taler-auditor-exchange.1.rst +++ b/manpages/taler-auditor-exchange.1.rst @@ -12,10 +12,12 @@ Synopsis ======== **taler-auditor-exchange** +[**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] [**-m** *MASTERKEY* | **––exchange-key=**\ ‌\ *MASTERKEY*] [**-r** | **––remove**] [**-u** *EXCHANGE_URL* | **––auditor-url=**\ ‌\ *EXCHANGE_URL*] +[**-v** | **––version**] Description =========== @@ -27,6 +29,10 @@ denomination keys with taler-auditor-sign or trying to audit it with taler-auditor or taler-wire-auditor. Afterwards the exchange will be visible via the /exchanges API of the taler-auditor-httpd. +**-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME* + Use the configuration and other resources for the exchange to operate + from *FILENAME*. + **-h** \| **––help** Print short help on options. @@ -43,6 +49,9 @@ visible via the /exchanges API of the taler-auditor-httpd. URL of the exchange. The exchange’s HTTP API must be available at this address. +**-v** \| **––version** + Print version information. + Diagnostics =========== -- cgit v1.2.3 From 42cae95c567ab4b7d5380cc33cdb2a68ab7fb63d Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 21:27:51 -0500 Subject: taler-auditor-offline(1): fix typo: s/-o, --output/-l, --logfile/g --- manpages/taler-auditor-offline.1.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/manpages/taler-auditor-offline.1.rst b/manpages/taler-auditor-offline.1.rst index 75f4f731..7c10f35a 100644 --- a/manpages/taler-auditor-offline.1.rst +++ b/manpages/taler-auditor-offline.1.rst @@ -15,7 +15,7 @@ Synopsis [**-c** *FILENAME* | **––config=**\ ‌\ *FILENAME*] [**-h** | **––help**] [**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] -[**-o** *FILE* | **––output=**\ ‌\ *FILE*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] [**-v** | **––version**] [subcommand ...] @@ -61,9 +61,8 @@ The general options for **taler-auditor-offline** are: Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, ``WARNING``, ``ERROR``. -**-o** *FILE* \| **––output=**\ ‌\ *FILE* - Where to write a denomination key signing request file to be given to - the auditor. +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. **-v** \| **––version** Print version information. -- cgit v1.2.3 From 57e2059c0f900a3352408b965c7866da80bf1dec Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 22:16:32 -0500 Subject: taler-config(1): add opt ‘-l’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-config.1.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manpages/taler-config.1.rst b/manpages/taler-config.1.rst index de4a589d..b5eedd79 100644 --- a/manpages/taler-config.1.rst +++ b/manpages/taler-config.1.rst @@ -17,6 +17,7 @@ Synopsis [**-f** | **––filename**] [**-h** | **––help**] [**-L** *loglevel* | **––loglevel=**\ \ *loglevel*] +[**-l** *filename* | **––logfile=**\ ‌\ *filename*] [**-o** *option* | **––option=**\ \ *option*] [**-S** | **––list-sections**] [**-s** *section* | **––section=**\ \ *section*] @@ -52,6 +53,9 @@ Description Use *LOGLEVEL* for logging. Valid values are ``DEBUG``, ``INFO``, ``WARNING``, and ``ERROR``. +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + **-o** *OPTION* \| **––option=**\ \ *OPTION* Which configuration option should be accessed or edited. Required to set a value. If not given, all values of a given section will be printed in the -- cgit v1.2.3 From b93a525fb0f5e950405974df90afbbe2c835d802 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 22:53:00 -0500 Subject: taler-merchant-httpd(1): add opts to synopsis --- manpages/taler-merchant-httpd.1.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manpages/taler-merchant-httpd.1.rst b/manpages/taler-merchant-httpd.1.rst index 2de9df6d..f373d381 100644 --- a/manpages/taler-merchant-httpd.1.rst +++ b/manpages/taler-merchant-httpd.1.rst @@ -12,8 +12,11 @@ taler-merchant-httpd(1) Synopsis ======== -**taler-merchant-httpd** [*options*] - +**taler-merchant-httpd** +[**-C** | **––connection-close**] +[**-c** *FILENAME* | **––config=**\ \ *FILENAME*] +[**-h** | **––help**] +[**-v** | **––version**] Description =========== -- cgit v1.2.3 From 6215fcf08bbb9feb81e3c9871c13990ce6bd04cb Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 22:54:49 -0500 Subject: taler-merchant-httpd(1): add opts ‘-L’, ‘-l’, ‘-T’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-merchant-httpd.1.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/manpages/taler-merchant-httpd.1.rst b/manpages/taler-merchant-httpd.1.rst index f373d381..7d02300a 100644 --- a/manpages/taler-merchant-httpd.1.rst +++ b/manpages/taler-merchant-httpd.1.rst @@ -16,6 +16,9 @@ Synopsis [**-C** | **––connection-close**] [**-c** *FILENAME* | **––config=**\ \ *FILENAME*] [**-h** | **––help**] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] +[**-T** *USEC* | **––timetravel**\ \ *USEC*] [**-v** | **––version**] Description @@ -41,6 +44,18 @@ Options **-h** \| **––help** Print short help on options. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + +**-T** *USEC* \| **––timetravel=**\ \ *USEC* + Modify the system time by *USEC* microseconds. + *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``). + This option is intended for debugging/testing only. + **-v** \| **––version** Print version information. -- cgit v1.2.3 From 2724dc93e0885352f9a732fba528d614a94f21f1 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 22:55:28 -0500 Subject: dedent (seven instances) --- manpages/taler-merchant-httpd.1.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manpages/taler-merchant-httpd.1.rst b/manpages/taler-merchant-httpd.1.rst index 7d02300a..e1af5d69 100644 --- a/manpages/taler-merchant-httpd.1.rst +++ b/manpages/taler-merchant-httpd.1.rst @@ -33,16 +33,16 @@ Options ======= **-C** \| **––connection-close** - Force each HTTP connection to be closed after each request - (useful in combination with -f to avoid having to wait for nc to - time out). + Force each HTTP connection to be closed after each request + (useful in combination with -f to avoid having to wait for nc to + time out). **-c** *FILENAME* \| **––config=**\ \ *FILENAME* - Use the configuration and other resources for the merchant to - operate from FILENAME. + Use the configuration and other resources for the merchant to + operate from FILENAME. **-h** \| **––help** - Print short help on options. + Print short help on options. **-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, @@ -57,7 +57,7 @@ Options This option is intended for debugging/testing only. **-v** \| **––version** - Print version information. + Print version information. Signals -- cgit v1.2.3 From b9028a4520984eed6b734627b3716ab9a82a55b4 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 23:00:35 -0500 Subject: dedent (22 instances) --- manpages/taler-merchant-setup-reserve.1.rst | 44 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/manpages/taler-merchant-setup-reserve.1.rst b/manpages/taler-merchant-setup-reserve.1.rst index 5559d3fe..9cfaba63 100644 --- a/manpages/taler-merchant-setup-reserve.1.rst +++ b/manpages/taler-merchant-setup-reserve.1.rst @@ -28,54 +28,54 @@ Options ======= **-a** *VALUE* \| **––amount=**\ \ *VALUE* - Amount to be transferred to the reserve. Mandatory. + Amount to be transferred to the reserve. Mandatory. **-A** *USERNAME:PASSWORD* \| **––auth=**\ \ *USERNAME:PASSWORD* - Use USERNAME and PASSWORD for HTTP client authentication. The ":" must be present as a separator. Note that this form of authentication has nothing to do with the TLS client certificate authentication supported with the "-C", "-k" and "-p" options. The PASSWORD given to this option is given to the server! Optional. + Use USERNAME and PASSWORD for HTTP client authentication. The ":" must be present as a separator. Note that this form of authentication has nothing to do with the TLS client certificate authentication supported with the "-C", "-k" and "-p" options. The PASSWORD given to this option is given to the server! Optional. **-C** *CERTFILE* \| **––cert=**\ \ *CERTFILE* - The specified CERTFILE contains a TLS client certificate to be used to authenticate the client. Optional. See also "-t". + The specified CERTFILE contains a TLS client certificate to be used to authenticate the client. Optional. See also "-t". **-e** *URL* \| **––exchange-url=**\ \ *URL* - Use URL for the exchange base URL. This is the exchange where - the reserve will be created. The currency used in the amount - specification must be offered by this exchange. Mandatory. + Use URL for the exchange base URL. This is the exchange where + the reserve will be created. The currency used in the amount + specification must be offered by this exchange. Mandatory. **-k** *KEYFILE* \| **––key=**\ \ *KEYFILE* - The specified KEYFILE contains a TLS client private key to be used to authenticate the client. Optional. See also "-p" and "-C". + The specified KEYFILE contains a TLS client private key to be used to authenticate the client. Optional. See also "-p" and "-C". **-m** *URL* \| **––merchant-url=**\ \ *URL* - Use URL as the merchant base URL. Should include the path to - the instance if the reserve is to be created for a non-default instance. - Mandatory. + Use URL as the merchant base URL. Should include the path to + the instance if the reserve is to be created for a non-default instance. + Mandatory. **-p** *KEYFILEPASSPHRASE* \| **––pass=**\ \ *KEYFILEPASSPHRASE* - The specified KEYFILEPASSPHRASE is to be used to decrypt the KEYFILE. Optional. See also "-k". Not to be confused with "-A". The KEYFILEPASSPHRASE given here is only used locally to decrypt the KEYFILE. + The specified KEYFILEPASSPHRASE is to be used to decrypt the KEYFILE. Optional. See also "-k". Not to be confused with "-A". The KEYFILEPASSPHRASE given here is only used locally to decrypt the KEYFILE. **-t** *CERTTYPE* \| **––type=**\ \ *CERTTYPE* - The specified CERTFILE contains a TLS client certificate of CERTTYPE. Default is "PEM". Optional. See also "-C". + The specified CERTFILE contains a TLS client certificate of CERTTYPE. Default is "PEM". Optional. See also "-C". **-w** *METHOD* \| **––wire-method=**\ \ *METHOD* - Which wire method should be used. Needed to select the wire - transfer method of the exchange. The method must be supported - by the exchange. Typical values would be "iban" or "x-taler-bank". - Mandatory. + Which wire method should be used. Needed to select the wire + transfer method of the exchange. The method must be supported + by the exchange. Typical values would be "iban" or "x-taler-bank". + Mandatory. **-c** *FILENAME* \| **––config=**\ \ *FILENAME* - Use the configuration and other resources for the merchant to - operate from FILENAME. + Use the configuration and other resources for the merchant to + operate from FILENAME. **-h** \| **––help** - Print short help on options. + Print short help on options. **-v** \| **––version** - Print version information. + Print version information. **-l** *LF* \| **––logfile=**\ \ *LF* - Sends logs to file whose path is LF. + Sends logs to file whose path is LF. **-L** *LOGLEVEL* \| **––log=**\ \ *LOGLEVEL* - Use loglevel LOGLEVEL. + Use loglevel LOGLEVEL. See Also -- cgit v1.2.3 From d21153975cee1b3f7cc33e45d7fa1548c5e09c60 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 23:11:26 -0500 Subject: taler-merchant-setup-reserve(1): rewrite opts descriptions - omit "Optional." - move "Mandatory." to first sentence - refill - mark up arg names --- manpages/taler-merchant-setup-reserve.1.rst | 51 ++++++++++++++++++----------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/manpages/taler-merchant-setup-reserve.1.rst b/manpages/taler-merchant-setup-reserve.1.rst index 9cfaba63..317c340c 100644 --- a/manpages/taler-merchant-setup-reserve.1.rst +++ b/manpages/taler-merchant-setup-reserve.1.rst @@ -27,43 +27,56 @@ from the exchange needed to fill the reserve. Options ======= -**-a** *VALUE* \| **––amount=**\ \ *VALUE* - Amount to be transferred to the reserve. Mandatory. - **-A** *USERNAME:PASSWORD* \| **––auth=**\ \ *USERNAME:PASSWORD* - Use USERNAME and PASSWORD for HTTP client authentication. The ":" must be present as a separator. Note that this form of authentication has nothing to do with the TLS client certificate authentication supported with the "-C", "-k" and "-p" options. The PASSWORD given to this option is given to the server! Optional. + Use ``USERNAME`` and ``PASSWORD`` for HTTP client authentication. + The ":" must be present as a separator. + Note that this form of authentication has nothing to do with the TLS client + certificate authentication supported with the ``-C``, ``-k`` and ``-p`` options. + The ``PASSWORD`` given to this option is given to the server! + +**-a** *VALUE* \| **––amount=**\ \ *VALUE* + Mandatory. + Amount to be transferred to the reserve. **-C** *CERTFILE* \| **––cert=**\ \ *CERTFILE* - The specified CERTFILE contains a TLS client certificate to be used to authenticate the client. Optional. See also "-t". + The specified ``CERTFILE`` contains a TLS client certificate to be used to + authenticate the client. See also ``-t``. **-e** *URL* \| **––exchange-url=**\ \ *URL* - Use URL for the exchange base URL. This is the exchange where - the reserve will be created. The currency used in the amount - specification must be offered by this exchange. Mandatory. + Mandatory. + Use ``URL`` for the exchange base URL. + This is the exchange where the reserve will be created. + The currency used in the amount specification must be offered by this exchange. **-k** *KEYFILE* \| **––key=**\ \ *KEYFILE* - The specified KEYFILE contains a TLS client private key to be used to authenticate the client. Optional. See also "-p" and "-C". + The specified ``KEYFILE`` contains a TLS client private key to be used to + authenticate the client. See also ``-p`` and ``-C``. **-m** *URL* \| **––merchant-url=**\ \ *URL* - Use URL as the merchant base URL. Should include the path to - the instance if the reserve is to be created for a non-default instance. Mandatory. + Use ``URL`` as the merchant base URL. + Should include the path to the instance if the reserve is to be + created for a non-default instance. **-p** *KEYFILEPASSPHRASE* \| **––pass=**\ \ *KEYFILEPASSPHRASE* - The specified KEYFILEPASSPHRASE is to be used to decrypt the KEYFILE. Optional. See also "-k". Not to be confused with "-A". The KEYFILEPASSPHRASE given here is only used locally to decrypt the KEYFILE. + The specified ``KEYFILEPASSPHRASE`` is to be used to decrypt the KEYFILE. + See also ``-k``. Not to be confused with ``-A``. + The ``KEYFILEPASSPHRASE`` given here is only used locally to decrypt the KEYFILE. **-t** *CERTTYPE* \| **––type=**\ \ *CERTTYPE* - The specified CERTFILE contains a TLS client certificate of CERTTYPE. Default is "PEM". Optional. See also "-C". + The specified CERTFILE contains a TLS client certificate of ``CERTTYPE``. + Default is ``PEM``. See also ``-C``. **-w** *METHOD* \| **––wire-method=**\ \ *METHOD* - Which wire method should be used. Needed to select the wire - transfer method of the exchange. The method must be supported - by the exchange. Typical values would be "iban" or "x-taler-bank". Mandatory. + Which wire method should be used. + Needed to select the wire transfer method of the exchange. + The method must be supported by the exchange. + Typical values would be ``iban`` or ``x-taler-bank``. **-c** *FILENAME* \| **––config=**\ \ *FILENAME* Use the configuration and other resources for the merchant to - operate from FILENAME. + operate from ``FILENAME``. **-h** \| **––help** Print short help on options. @@ -72,10 +85,10 @@ Options Print version information. **-l** *LF* \| **––logfile=**\ \ *LF* - Sends logs to file whose path is LF. + Sends logs to file whose path is ``LF``. **-L** *LOGLEVEL* \| **––log=**\ \ *LOGLEVEL* - Use loglevel LOGLEVEL. + Use loglevel ``LOGLEVEL``. See Also -- cgit v1.2.3 From 6151248f51126e844998e636e8ba0ff6476835a0 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 23:12:29 -0500 Subject: taler-merchant-setup-reserve(1): replace opts desc for ‘-L’, ‘-l’ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manpages/taler-merchant-setup-reserve.1.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manpages/taler-merchant-setup-reserve.1.rst b/manpages/taler-merchant-setup-reserve.1.rst index 317c340c..dddc63fd 100644 --- a/manpages/taler-merchant-setup-reserve.1.rst +++ b/manpages/taler-merchant-setup-reserve.1.rst @@ -84,11 +84,12 @@ Options **-v** \| **––version** Print version information. -**-l** *LF* \| **––logfile=**\ \ *LF* - Sends logs to file whose path is ``LF``. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. -**-L** *LOGLEVEL* \| **––log=**\ \ *LOGLEVEL* - Use loglevel ``LOGLEVEL``. +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. See Also -- cgit v1.2.3 From 988f6e07708f8147db1254a2a621a729f3c8b61b Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 23:13:50 -0500 Subject: taler-merchant-setup-reserve(1): reorder opts descriptions --- manpages/taler-merchant-setup-reserve.1.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/manpages/taler-merchant-setup-reserve.1.rst b/manpages/taler-merchant-setup-reserve.1.rst index dddc63fd..c871051e 100644 --- a/manpages/taler-merchant-setup-reserve.1.rst +++ b/manpages/taler-merchant-setup-reserve.1.rst @@ -42,16 +42,30 @@ Options The specified ``CERTFILE`` contains a TLS client certificate to be used to authenticate the client. See also ``-t``. +**-c** *FILENAME* \| **––config=**\ \ *FILENAME* + Use the configuration and other resources for the merchant to + operate from ``FILENAME``. + **-e** *URL* \| **––exchange-url=**\ \ *URL* Mandatory. Use ``URL`` for the exchange base URL. This is the exchange where the reserve will be created. The currency used in the amount specification must be offered by this exchange. +**-h** \| **––help** + Print short help on options. + **-k** *KEYFILE* \| **––key=**\ \ *KEYFILE* The specified ``KEYFILE`` contains a TLS client private key to be used to authenticate the client. See also ``-p`` and ``-C``. +**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* + Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, + ``WARNING``, ``ERROR``. + +**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* + Send logging output to *FILENAME*. + **-m** *URL* \| **––merchant-url=**\ \ *URL* Mandatory. Use ``URL`` as the merchant base URL. @@ -74,23 +88,9 @@ Options The method must be supported by the exchange. Typical values would be ``iban`` or ``x-taler-bank``. -**-c** *FILENAME* \| **––config=**\ \ *FILENAME* - Use the configuration and other resources for the merchant to - operate from ``FILENAME``. - -**-h** \| **––help** - Print short help on options. - **-v** \| **––version** Print version information. -**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL* - Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``, - ``WARNING``, ``ERROR``. - -**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME* - Send logging output to *FILENAME*. - See Also ======== -- cgit v1.2.3 From 4a85c3d1f5f1515ba0d91553a033ed1cad149bfc Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 23:17:43 -0500 Subject: taler-merchant-setup-reserve(1): add opts to synopsis --- manpages/taler-merchant-setup-reserve.1.rst | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/manpages/taler-merchant-setup-reserve.1.rst b/manpages/taler-merchant-setup-reserve.1.rst index c871051e..3351ccc2 100644 --- a/manpages/taler-merchant-setup-reserve.1.rst +++ b/manpages/taler-merchant-setup-reserve.1.rst @@ -13,7 +13,21 @@ taler-merchant-setup-reserve(1) Synopsis ======== -**taler-merchant-setup-reserve** [*options*] +**taler-merchant-setup-reserve** +[**-A** *USERNAME:PASSWORD* | **––auth=**\ \ *USERNAME:PASSWORD*] +[**-a** *VALUE* | **––amount=**\ \ *VALUE*] +[**-C** *CERTFILE* | **––cert=**\ \ *CERTFILE*] +[**-c** *FILENAME* | **––config=**\ \ *FILENAME*] +[**-e** *URL* | **––exchange-url=**\ \ *URL*] +[**-h** | **––help**] +[**-k** *KEYFILE* | **––key=**\ \ *KEYFILE*] +[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*] +[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*] +[**-m** *URL* | **––merchant-url=**\ \ *URL*] +[**-p** *KEYFILEPASSPHRASE* | **––pass=**\ \ *KEYFILEPASSPHRASE*] +[**-t** *CERTTYPE* | **––type=**\ \ *CERTTYPE*] +[**-w** *METHOD* | **––wire-method=**\ \ *METHOD*] +[**-v** | **––version**] Description -- cgit v1.2.3 From 5b681de5758b6e18d6b355487edcd6fa88595975 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 7 Jan 2021 23:31:58 -0500 Subject: fix typo: s/command line/command-line/ (15 instances) --- manpages/taler-auditor-dbinit.1.rst | 2 +- manpages/taler-auditor-exchange.1.rst | 2 +- manpages/taler-auditor.1.rst | 2 +- manpages/taler-bank-transfer.1.rst | 2 +- manpages/taler-exchange-aggregator.1.rst | 2 +- manpages/taler-exchange-benchmark.1.rst | 2 +- manpages/taler-exchange-closer.1.rst | 2 +- manpages/taler-exchange-dbinit.1.rst | 2 +- manpages/taler-exchange-httpd.1.rst | 2 +- manpages/taler-exchange-transfer.1.rst | 2 +- manpages/taler-exchange-wirewatch.1.rst | 2 +- manpages/taler-merchant-benchmark.1.rst | 2 +- manpages/taler-merchant-httpd.1.rst | 2 +- manpages/taler-merchant-setup-reserve.1.rst | 2 +- manpages/taler-wallet-cli.1.rst | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/manpages/taler-auditor-dbinit.1.rst b/manpages/taler-auditor-dbinit.1.rst index af3ee947..44d7aeb0 100644 --- a/manpages/taler-auditor-dbinit.1.rst +++ b/manpages/taler-auditor-dbinit.1.rst @@ -25,7 +25,7 @@ Synopsis Description =========== -**taler-exchange-dbinit** is a command line tool to initialize the Taler +**taler-exchange-dbinit** is a command-line tool to initialize the Taler exchange database. It creates the necessary tables and indices for the Taler exchange to operate. diff --git a/manpages/taler-auditor-exchange.1.rst b/manpages/taler-auditor-exchange.1.rst index 14603f4e..6a13c802 100644 --- a/manpages/taler-auditor-exchange.1.rst +++ b/manpages/taler-auditor-exchange.1.rst @@ -22,7 +22,7 @@ Synopsis Description =========== -**taler-auditor-exchange** is a command line tool to be used by an +**taler-auditor-exchange** is a command-line tool to be used by an auditor to add or remove an exchange from the list of exchange’s audited by the auditor. You must add an exchange to that list before signing denomination keys with taler-auditor-sign or trying to audit it with diff --git a/manpages/taler-auditor.1.rst b/manpages/taler-auditor.1.rst index 576a304e..c4b82376 100644 --- a/manpages/taler-auditor.1.rst +++ b/manpages/taler-auditor.1.rst @@ -20,7 +20,7 @@ Synopsis Description =========== -**taler-auditor** is a command line tool to be used by an auditor to +**taler-auditor** is a command-line tool to be used by an auditor to audit an exchange’s database and calculate the current financial state of the exchange (including revenue, amount expected in escrow and risk exposure). The audit is incremental. The first audit must be performed diff --git a/manpages/taler-bank-transfer.1.rst b/manpages/taler-bank-transfer.1.rst index a734abba..e37d596a 100644 --- a/manpages/taler-bank-transfer.1.rst +++ b/manpages/taler-bank-transfer.1.rst @@ -30,7 +30,7 @@ Synopsis Description =========== -**taler-bank-transfer** is a command line tool to trigger bank transfers or +**taler-bank-transfer** is a command-line tool to trigger bank transfers or inspect wire transfers for exchange accounts using the wire API. The tool is expected to be used during testing or for diagnostics. diff --git a/manpages/taler-exchange-aggregator.1.rst b/manpages/taler-exchange-aggregator.1.rst index 814c5c11..710a833b 100644 --- a/manpages/taler-exchange-aggregator.1.rst +++ b/manpages/taler-exchange-aggregator.1.rst @@ -23,7 +23,7 @@ Synopsis Description =========== -**taler-exchange-aggregator** is a command line tool to run aggregate deposits +**taler-exchange-aggregator** is a command-line tool to run aggregate deposits to the same merchant into larger wire transfers. The actual transfers are then done by **taler-exchange-transfer**. diff --git a/manpages/taler-exchange-benchmark.1.rst b/manpages/taler-exchange-benchmark.1.rst index 92efee4f..81b8e614 100644 --- a/manpages/taler-exchange-benchmark.1.rst +++ b/manpages/taler-exchange-benchmark.1.rst @@ -31,7 +31,7 @@ Synopsis Description =========== -**taler-exchange-benchmark** is a command line tool to measure the time +**taler-exchange-benchmark** is a command-line tool to measure the time spent to serve withdrawals/deposits/refreshes. It usually needs a dedicate configuration file where all the services - the exchange and the (fake)bank - listen to URLs not subject to any reverse proxy, as say diff --git a/manpages/taler-exchange-closer.1.rst b/manpages/taler-exchange-closer.1.rst index 7f316368..82fc41d1 100644 --- a/manpages/taler-exchange-closer.1.rst +++ b/manpages/taler-exchange-closer.1.rst @@ -23,7 +23,7 @@ Synopsis Description =========== -**taler-exchange-closer** is a command line tool to run close +**taler-exchange-closer** is a command-line tool to run close reserves that have been idle for too long, causing transfers to the originating bank account to be scheduled. diff --git a/manpages/taler-exchange-dbinit.1.rst b/manpages/taler-exchange-dbinit.1.rst index 914c376c..8221b8e8 100644 --- a/manpages/taler-exchange-dbinit.1.rst +++ b/manpages/taler-exchange-dbinit.1.rst @@ -24,7 +24,7 @@ Synopsis Description =========== -**taler-exchange-dbinit** is a command line tool to initialize the Taler +**taler-exchange-dbinit** is a command-line tool to initialize the Taler exchange database. It creates the necessary tables and indices for the Taler exchange to operate. diff --git a/manpages/taler-exchange-httpd.1.rst b/manpages/taler-exchange-httpd.1.rst index 6da60d1b..d8462a6c 100644 --- a/manpages/taler-exchange-httpd.1.rst +++ b/manpages/taler-exchange-httpd.1.rst @@ -27,7 +27,7 @@ Synopsis Description =========== -**taler-exchange-httpd** is a command line tool to run the Taler +**taler-exchange-httpd** is a command-line tool to run the Taler exchange (HTTP server). The required configuration, keys and database must exist before running this command. diff --git a/manpages/taler-exchange-transfer.1.rst b/manpages/taler-exchange-transfer.1.rst index 6821a5fc..743d2cce 100644 --- a/manpages/taler-exchange-transfer.1.rst +++ b/manpages/taler-exchange-transfer.1.rst @@ -23,7 +23,7 @@ Synopsis Description =========== -**taler-exchange-transfer** is a command line tool to actually execute scheduled wire transfers (using the bank/wire gateway). +**taler-exchange-transfer** is a command-line tool to actually execute scheduled wire transfers (using the bank/wire gateway). The transfers are prepared by the **taler-exchange-aggregator** and **taler-exchange-closer** tools. **-c** *FILENAME* \| **––config=**\ ‌\ *FILENAME* diff --git a/manpages/taler-exchange-wirewatch.1.rst b/manpages/taler-exchange-wirewatch.1.rst index 541e05ec..605ff54b 100644 --- a/manpages/taler-exchange-wirewatch.1.rst +++ b/manpages/taler-exchange-wirewatch.1.rst @@ -24,7 +24,7 @@ Synopsis Description =========== -**taler-exchange-wirewatch** is a command line tool to import wire +**taler-exchange-wirewatch** is a command-line tool to import wire transactions into the Taler exchange database. Its options are as follows: diff --git a/manpages/taler-merchant-benchmark.1.rst b/manpages/taler-merchant-benchmark.1.rst index 4f44503a..45f966dd 100644 --- a/manpages/taler-merchant-benchmark.1.rst +++ b/manpages/taler-merchant-benchmark.1.rst @@ -19,7 +19,7 @@ Synopsis Description =========== -**taler-merchant-benchmark** is a command line tool to populate your +**taler-merchant-benchmark** is a command-line tool to populate your merchant database with payments for benchmarking. diff --git a/manpages/taler-merchant-httpd.1.rst b/manpages/taler-merchant-httpd.1.rst index e1af5d69..df175598 100644 --- a/manpages/taler-merchant-httpd.1.rst +++ b/manpages/taler-merchant-httpd.1.rst @@ -24,7 +24,7 @@ Synopsis Description =========== -taler-merchant-httpd is a command line tool to run the Taler merchant +taler-merchant-httpd is a command-line tool to run the Taler merchant (HTTP backend). The required configuration and database must exist before running this command. diff --git a/manpages/taler-merchant-setup-reserve.1.rst b/manpages/taler-merchant-setup-reserve.1.rst index 3351ccc2..321af52a 100644 --- a/manpages/taler-merchant-setup-reserve.1.rst +++ b/manpages/taler-merchant-setup-reserve.1.rst @@ -33,7 +33,7 @@ Synopsis Description =========== -**taler-merchant-setup-reserve** is a command line tool to setup a reserve +**taler-merchant-setup-reserve** is a command-line tool to setup a reserve (creating the private reserve key) and obtaining the wire transfer information from the exchange needed to fill the reserve. diff --git a/manpages/taler-wallet-cli.1.rst b/manpages/taler-wallet-cli.1.rst index 8e7d3be0..d109470b 100644 --- a/manpages/taler-wallet-cli.1.rst +++ b/manpages/taler-wallet-cli.1.rst @@ -21,7 +21,7 @@ Synopsis Description =========== -**taler-wallet-cli** is a command line tool to be used by developers +**taler-wallet-cli** is a command-line tool to be used by developers for testing. **-h** | **––help** -- cgit v1.2.3 From cda1f042dc3ae65010928be5b61cd94c3b345612 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 8 Jan 2021 00:52:43 -0500 Subject: diction: s/you must first ensure to/first ensure that you/ --- frags/installing-debian.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frags/installing-debian.rst b/frags/installing-debian.rst index 1842ca5d..b357cdae 100644 --- a/frags/installing-debian.rst +++ b/frags/installing-debian.rst @@ -1,4 +1,4 @@ -To install the GNU Taler Debian packages, you must first ensure to have +To install the GNU Taler Debian packages, first ensure that you have the right Debian distribution. At this time, the packages are build for Sid, which means you should use a system which at least includes unstable packages in its source list. We recommend using APT pinning -- cgit v1.2.3 From f5916bbea03cf8c48b6240a2e487a1398fc1bbca Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 8 Jan 2021 00:53:00 -0500 Subject: fix typo: s/build/built/ --- frags/installing-debian.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frags/installing-debian.rst b/frags/installing-debian.rst index b357cdae..3c6cac6e 100644 --- a/frags/installing-debian.rst +++ b/frags/installing-debian.rst @@ -1,5 +1,5 @@ To install the GNU Taler Debian packages, first ensure that you have -the right Debian distribution. At this time, the packages are build for +the right Debian distribution. At this time, the packages are built for Sid, which means you should use a system which at least includes unstable packages in its source list. We recommend using APT pinning to limit unstable packages to those explicitly requested. To do this, -- cgit v1.2.3 From 87b7911b3dae45e83c3765613b26279a7fda3cad Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 8 Jan 2021 01:09:05 -0500 Subject: change markup of ‘input.json’ from * to `` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taler-auditor-manual.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taler-auditor-manual.rst b/taler-auditor-manual.rst index 6b040dbb..e506bda6 100644 --- a/taler-auditor-manual.rst +++ b/taler-auditor-manual.rst @@ -404,7 +404,7 @@ systems and may require them to establish a trustworthy connection. The details how the auditor communicates with the exchange operator are a business process that is outside of the scope of this document. -Note that the *input.json* does not contain any confidential data. However, +Note that the ``input.json`` does not contain any confidential data. However, signing the wrong keys would be fatal in that it may allow an illegitimate exchange to convince users that it is a trustworthy operator and subsequently betray the user's trust that is anchored in the existence of a trustworthy -- cgit v1.2.3