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

4 files changed, 27 insertions, 4 deletions

diff --git a/developers-manual.rst b/developers-manual.rst
index 306e3e0..681ef4e 100644
--- a/developers-manual.rst
+++ b/developers-manual.rst
@@ -1153,7 +1153,7 @@ Terms to Use
 Auditor
   Regulatory entity that certifies exchanges and oversees their operation.
 
-Exchange Provider
+Exchange Operator
   The entity/service that gives out digital cash in exchange for some
   other means of payment.
 
@@ -1211,6 +1211,10 @@ use when talking to end users or even system administrators.
   bank
     traditional financial service provider who offers wire :term:`transfers <transfer>` between accounts
 
+  buyer
+    individual in control of a Taler :term:`wallet`, usually using it to
+    :term:`spend` the :term:`coins` on :term:`contracts` (see also :term:`customer`).
+
   close
   closes
   closed
@@ -1221,8 +1225,7 @@ use when talking to end users or even system administrators.
     for closing
 
   customer
-    individual in control of a Taler :term:`wallet`, usually using it to
-    :term:`spend` the :term:`coins` on :term:`contracts`.
+    individual that directs the buyer (perhaps the same individual) to make a purchase
 
   coin
   coins
@@ -1276,7 +1279,7 @@ use when talking to end users or even system administrators.
     link multiple transactions of coin's owner if the coin is not refreshed
 
   exchange
-    Taler's payment service provider.  Issues electronic coins during
+    Taler's payment service operator.  Issues electronic coins during
     withdrawal and redeems them when they are deposited by merchants
 
   expired
@@ -1461,6 +1464,10 @@ use when talking to end users or even system administrators.
   transaction
     method by which ownership is exclusively transferred from one entity
 
+  user
+    any individual using the Taler payment system
+    (see :term:`customer`, :term:`buyer`, :term:`merchant`).
+
   version
     Taler uses various forms of versioning. There is a database
     schema version (stored itself in the database, see \*-0000.sql) describing
diff --git a/taler-auditor-manual.rst b/taler-auditor-manual.rst
index 66e3d05..8988fab 100644
--- a/taler-auditor-manual.rst
+++ b/taler-auditor-manual.rst
@@ -431,6 +431,9 @@ If the auditor has been correctly added, the exchange’s ``/keys``
 response will contain an entry in the ``auditors`` array mentioning the
 auditor’s URL.
 
+Commands, like ``taler-auditor-offline``, that support the ``-l LOGFILE``
+command-line option, send logging output to standard error by default.
+
 
 .. _AuditorDatabaseInitialization:
 
diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst
index c1354d3..419dd52 100644
--- a/taler-exchange-manual.rst
+++ b/taler-exchange-manual.rst
@@ -356,6 +356,15 @@ The exchange works with four types of keys:
 
 -  master key (kept offline)
 
+   To create a master public key:
+
+   .. code-block:: console
+
+      $ gnunet-ecc --generate-keys=1 FILENAME
+      $ gnunet-ecc --print-public-key FILENAME
+
+   FIXME: Add link to ``gnunet-ecc`` manpage.
+
 -  sign keys (signs normal messages from the exchange)
 
 -  denomination keys (signs electronic coins, see section Coins)
@@ -443,6 +452,8 @@ operation, permissions to ``CREATE`` or ``ALTER`` tables are not required by
 any of the Taler exchange processes and thus should not be granted.
 For more information, see :doc:`manpages/taler-exchange-dbinit.1`.
 
+Commands, like ``taler-exchange-dbinit``, that support the ``-l LOGFILE``
+command-line option, send logging output to standard error by default.
 
 .. _Coins-denomination-keys:
 
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 3871905..e038d60 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -618,6 +618,8 @@ that you may have to temporarily GRANT those rights again when you update the
 merchant backend.  For details on how to REVOKE or GRANT these rights, consult
 the Postgres documentation.
 
+Commands, like ``taler-merchant-dbinit``, that support the ``-l LOGFILE``
+command-line option, send logging output to standard error by default.
 
 
 .. index: MASTER_KEY