update installation manuals|

6 files changed, 39 insertions, 17 deletions

diff --git a/frags/apt-install-taler-merchant.rst b/frags/apt-install-taler-merchant.rst
index 9d98d9ca..1593dcfd 100644
--- a/frags/apt-install-taler-merchant.rst
+++ b/frags/apt-install-taler-merchant.rst
@@ -3,11 +3,12 @@ To install the Taler merchant backend, you can now simply run:
 
 .. code-block:: console
 
-   # apt install dbconfig-pgsql taler-merchant
+   # apt install taler-merchant
 
 Note that the package does not complete the integration of the backend with
 the HTTP reverse proxy (typically with TLS certificates).  A configuration
 fragment for Nginx or Apache will be placed in
 ``/etc/{apache,nginx}/conf-available/taler-merchant.conf``.  You must
-furthermore still configure the instances, and may need to extend the fragment
-with access control restrictions for non-default instances.
+furthermore still configure the database and the instances, and may need to
+extend the fragment with access control restrictions for non-default
+instances.
diff --git a/frags/installing-debian.rst b/frags/installing-debian.rst
index ceb2043d..681db637 100644
--- a/frags/installing-debian.rst
+++ b/frags/installing-debian.rst
@@ -15,7 +15,7 @@ into your keyring and update the package lists:
 
 .. code-block:: console
 
-   # wget -P /etc/apt/keyrings/ \
+   # wget -O /etc/apt/keyrings/taler-systems.gpg \
        https://taler.net/taler-systems.gpg
    # apt update
 
diff --git a/frags/installing-ubuntu.rst b/frags/installing-ubuntu.rst
index c44e18bf..4700e44a 100644
--- a/frags/installing-ubuntu.rst
+++ b/frags/installing-ubuntu.rst
@@ -16,7 +16,7 @@ into your keyring and update the package lists:
 
 .. code-block:: console
 
-   # wget -P /etc/apt/keyrings/ \
+   # wget -O /etc/apt/keyrings/taler-systems.gpg \
        https://taler.net/taler-systems.gpg
    # apt update
 
diff --git a/taler-challenger-manual.rst b/taler-challenger-manual.rst
index 78c723cf..ae7eb047 100644
--- a/taler-challenger-manual.rst
+++ b/taler-challenger-manual.rst
@@ -247,6 +247,16 @@ The access credentials for the Challenger database are configured in
 ``/etc/challenger/challenger.conf``.  Currently, only PostgreSQL is
 supported as a database backend.
 
+.. note::
+
+   The **challenger-dbconfig** tool can be used to automate the database
+   setup. When using the Debian/Ubuntu packages, the user should already have
+   been created, so you can just run the tool without any arguments and should
+   have a working database configuration.  Subsequently, you should still run
+   **taler-challenger-dbinit** as the ``challenger-httpd`` user to
+   initialize the database schema.
+
+
 To create a database for Challenger on the local system, run:
 
 .. code-block:: shell-session
@@ -279,7 +289,7 @@ to be initialized with the following command:
 
 .. code-block:: shell-session
 
-  [root@exchange-online]# sudo -u challenger-httpd challenger
+  [root@exchange-online]# sudo -u challenger-httpd challenger-dbinit
 
   ..note::
 
@@ -475,7 +485,7 @@ The Challenger database can be re-initialized using:
 
 .. code-block:: console
 
-   $ taler-exchange-dbinit --reset
+   $ challenger-dbinit --reset
 
 However, running this command will result in all data in the database
 being lost.
diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst
index e9815f9c..eea09104 100644
--- a/taler-exchange-manual.rst
+++ b/taler-exchange-manual.rst
@@ -544,6 +544,16 @@ These users are all in the taler-exchange-db group, and the
 ``exchange-db.secret.conf`` should already be only readable by users in
 this group.
 
+.. note::
+
+   The **taler-exchange-dbconfig** tool can be used to automate the database
+   setup. When using the Debian/Ubuntu packages, the users should already have
+   been created, so you can just run the tool without any arguments and should
+   have a working database configuration.  Subsequently, you should still run
+   **taler-exchange-dbinit** (as the ``taler-exchange-httpd`` user) to
+   initialize the database schema and then grant access to
+   the other users (see below).
+
 To create a database for the Taler exchange on the local system, run:
 
 .. code-block:: shell-session
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 87ae0d38..d32c8969 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -515,11 +515,13 @@ DBMS-specific options to access the database.
 
 .. note::
 
-   When using the Debian/Ubuntu packages, the database should already
-   be configured in the ``/etc/taler/secrets/merchant-db.secret.conf``
-   configuration file.  The ``talermerchant`` database should also already
-   be configured, so you should be able to skip everything in this section
-   when using our binary packages.
+   The **taler-merchant-dbconfig** tool can be used to automate the database
+   setup. When using the Debian/Ubuntu packages, the user should already have
+   been created, so you can just run the tool without any arguments and should
+   have a working database configuration.  Subsequently, you should still run
+   **taler-merchant-dbinit** as the ``taler-merchant-httpd`` user to
+   initialize the database schema.
+
 
 For the ``postgres`` backend, you need to specify:
 
@@ -531,7 +533,8 @@ For the ``postgres`` backend, you need to specify:
 This option specifies a PostgreSQL access path, typicallly using the format
 ``postgres:///$DBNAME``, where ``$DBNAME`` is the name of the PostgreSQL
 database you want to use. Suppose ``$USER`` is the name of the user who will
-run the backend process. Then, you need to first run:
+run the backend process (usually ``taler-merchant-httpd``). Then, you need to
+first run:
 
 .. code-block:: console
 
@@ -549,7 +552,7 @@ to create the backend’s database. Here, ``$DBNAME`` must match the
 database name given in the configuration file.
 
 Now you should be able to create the tables and indices. To do this, run as
-``$USER``:
+``$USER`` (usually ``taler-merchant-httpd``):
 
 .. code-block:: console
 
@@ -765,9 +768,7 @@ interface create a file ``instance.json`` with an
      "address": { "country" : "zz" },
      "auth": { "method" : "external"} ,
      "jurisdiction": { "country" : "zz" },
-     "default_max_wire_fee": "KUDOS:1",
-     "default_wire_fee_amortization": 100,
-     "default_max_deposit_fee": "KUDOS:1",
+     "use_stefan": true,
      "default_wire_transfer_delay": { "d_ms" : 1209600000 },
      "default_pay_delay": { "d_ms" : 1209600000 }
    }