[taler-exchange] branch master updated (9e206f53 -> 59b12d2d)

[gnunet]

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

grothoff pushed a change to branch master
in repository exchange.

    from 9e206f53 H_wire -> h_wire (#6032)
     new 1f8d6e1a pp to tos
     new 59b12d2d fix #6015

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


Summary of changes:
 contrib/pp/Makefile.am          | 2 +-
 contrib/pp/en/0.txt             | 4 +++-
 doc/prebuilt                    | 2 +-
 src/include/taler_error_codes.h | 7 +++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/contrib/pp/Makefile.am b/contrib/pp/Makefile.am
index 15b1b4ae..21326200 100644
--- a/contrib/pp/Makefile.am
+++ b/contrib/pp/Makefile.am
@@ -1,6 +1,6 @@
 
 # English (en)
-ppendir=$(pkgdatadir)/tos/en
+ppendir=$(pkgdatadir)/pp/en
 
 ppen_DATA = \
   en/0.txt \
diff --git a/contrib/pp/en/0.txt b/contrib/pp/en/0.txt
index 760c1b8b..02dcc793 100644
--- a/contrib/pp/en/0.txt
+++ b/contrib/pp/en/0.txt
@@ -35,7 +35,9 @@ We do our best to not collect any Personal Information from 
Taler Wallet users.
 HOW WE COLLECT AND PROCESS INFORMATION
 ======================================
 
-We may process your information for the following reasons:* to transfer money 
as specified by our users (Taler transactions);
+We may process your information for the following reasons:
+
+* to transfer money as specified by our users (Taler transactions);
 
 * to assist government entities in linking income to the underlying
 
diff --git a/doc/prebuilt b/doc/prebuilt
index 934a6a18..ca53235c 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit 934a6a18301e81c4fd1b3a8cda2dc13dca4741cc
+Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5
diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h
index 1fbae7af..8183e334 100644
--- a/src/include/taler_error_codes.h
+++ b/src/include/taler_error_codes.h
@@ -1432,6 +1432,13 @@ enum TALER_ErrorCode
    */
   TALER_EC_PROPOSAL_STORE_DB_ERROR_ALREADY_EXISTS = 2508,
 
+  /**
+   * The order provided to the backend uses an amount
+   * in a currency that does not match the backend's
+   * configuration.
+   * Returned as a bad request.
+   */
+  TALER_EC_PROPOSAL_ORDER_BAD_CURRENCY = 2509,
 
   /**
    * The frontend gave an unknown order id to issue the refund to.

-- 
To stop receiving notification emails like this one, please contact
address@hidden.