[taler-docs] 02/03: Merge branch 'master' of git+ssh://git.taler.net/docs

[gnunet]

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

grothoff pushed a commit to branch master
in repository docs.

commit 655e5eb6c386b5e5bdc1c9de0831c579af5b26fe
Merge: 1e36811 12a3571
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Nov 6 23:49:37 2020 +0100

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

 anastasis.rst                                      |  737 +++++-
 anastasis_reducer_backup.drawio                    |    2 +-
 anastasis_reducer_backup.png                       |  Bin 456110 -> 457361 
bytes
 anastasis_reducer_recovery.drawio                  |    2 +-
 anastasis_reducer_recovery.png                     |  Bin 382200 -> 384322 
bytes
 cf/captcha-payment.txt                             |    2 +-
 core/api-auditor.rst                               |    9 +-
 core/api-bank-access.rst                           |   12 +-
 core/api-bank-integration.rst                      |    8 +-
 core/api-common.rst                                |   26 +-
 core/api-error.rst                                 |    6 +-
 core/api-exchange.rst                              |  119 +-
 core/api-merchant.rst                              | 2479 +++++++++++---------
 core/api-sync.rst                                  |   40 +-
 core/api-wire.rst                                  |   42 +-
 .../002-wallet-exchange-management.rst             |    2 +-
 design-documents/003-tos-rendering.rst             |    2 +-
 design-documents/005-wallet-backup-sync.rst        |    6 +-
 design-documents/007-payment.rst                   |    5 +-
 design-documents/{fees.rst => 008-fees.rst}        |    6 +-
 design-documents/009-backup.rst                    |  118 +
 design-documents/index.rst                         |    2 +
 developers-manual.rst                              |    6 +-
 libeufin/api-nexus.rst                             |  108 +-
 libeufin/ebics.rst                                 |   10 +-
 libeufin/iso20022.rst                              |    2 +-
 manpages/taler-merchant-setup-reserve.1.rst        |    2 +-
 merchant-benchmark.conf                            |  123 +
 taler-auditor-manual.rst                           |    6 +-
 taler-bank-manual.rst                              |   13 +-
 taler-exchange-manual.rst                          |    4 +-
 taler-merchant-api-tutorial.rst                    |    6 +-
 taler-merchant-manual.rst                          |  525 +++--
 taler-nfc-guide.rst                                |    2 +-
 34 files changed, 2843 insertions(+), 1589 deletions(-)


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