[taler-docs] branch master updated (5b85c92 -> 7fee156)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 5b85c92  write "PostgreSQL" like so
     new b76894b  add :doc: link to Operator Manual (taler-exchange-manual)
     new 3cb7376  remove spurious space
     new 0db1510  expand "N:" to "NB:"
     new 4081e11  s/the/this/
     new eef269c  s/advertised/advertized/
     new 7fee156  s/advertise/advertize/ (four files)

The 6 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:
 core/api-exchange.rst                 |  4 ++--
 core/api-merchant.rst                 |  4 ++--
 manpages/taler-exchange-offline.1.rst |  4 ++--
 taler-exchange-setup-guide.rst        | 12 ++++++------
 taler-merchant-manual.rst             |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index c42858b..e427e42 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -1050,10 +1050,10 @@ exchange.
 
 .. note::
 
-   Eventually the exchange will need to advertise a policy for how long it will
+   Eventually the exchange will need to advertize a policy for how long it will
    keep transaction histories for inactive or even fully drained reserves.  We
    will therefore need some additional handler similar to ``/keys`` to
-   advertise those terms of service.
+   advertize those terms of service.
 
 
 .. http:post:: /reserves/$RESERVE_PUB/status
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 5395fe1..cb59314 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -49,7 +49,7 @@ this base URL are divided into to categories:
   to the merchant internally, and must not be exposed on the
   Internet.
 * Management endpoints (under ``/management/*``) are also private and dedicated
-  to CRUD operation over instances and reset authentication settings over all 
+  to CRUD operation over instances and reset authentication settings over all
   instances. Only accessible with the default instance authentication token
 
 Examples:
@@ -2420,7 +2420,7 @@ Backend: Giving tips
 
 Tips are a way for websites to give small amounts of e-cash to visitors (for
 example as a financial reward for providing information or watching
-advertisements).  Tips are non-contractual: neither merchant nor consumer
+advertizements).  Tips are non-contractual: neither merchant nor consumer
 have any contractual information about the other party as a result of the
 tip.
 
diff --git a/manpages/taler-exchange-offline.1.rst 
b/manpages/taler-exchange-offline.1.rst
index b1beaf2..4641b41 100644
--- a/manpages/taler-exchange-offline.1.rst
+++ b/manpages/taler-exchange-offline.1.rst
@@ -218,12 +218,12 @@ enable-account
 --------------
 
 This subcommand
-informs an exchange that it should advertise a bank account as belonging to
+informs an exchange that it should advertize a bank account as belonging to
 the exchange on its ``/wire`` endpoint.  Note that this does *not* ensure that
 the exchange will use this bank account for incoming or outgoing wire
 transfers! For this, the **taler-exchange-transfer** and
 **taler-exchange-wirewatch** tools must be configured.  Furthermore, the bank
-account information advertised could theoretically differ from that which
+account information advertized could theoretically differ from that which
 these tool actually use, for example if the public bank account is only a
 front for the actual internal business accounts.
 
diff --git a/taler-exchange-setup-guide.rst b/taler-exchange-setup-guide.rst
index c880b40..68ae6f2 100644
--- a/taler-exchange-setup-guide.rst
+++ b/taler-exchange-setup-guide.rst
@@ -21,7 +21,7 @@ GNU Taler Exchange Setup Guide
 
 This setup guide walks a system administrator through all steps required to
 install an exchange and check that it is functional.  For more background,
-please read the Operator Manual.
+please read the :doc:`Operator Manual <taler-exchange-manual>`.
 
 
 System Requirements
@@ -32,7 +32,7 @@ This guide assumes that you are running Ubuntu 20.04 (Focal 
Fossa).
 We recommend the setup of offline signing keys to be done on a second machine 
that
 does not have internet access.
 
-In the guide, we mark commands that are supposed to be executed on the online
+In this guide, we mark commands that are supposed to be executed on the online
 exchange machine as ``[root@exchange-online]#`` / ``[$user@exchange-online]$`` 
and commands for the offline
 machine as ``[root@exchange-offline]#`` / ``[$user@exchange-offline]$``.  It 
is possible to do the entire setup
 on one machine, but we do not recommend this for security reasons.
@@ -93,7 +93,7 @@ signing key to your list of trusted keys and update the 
package index:
 
 ..
   FIXME: this happens after the update.
-  N: Skipping acquire of configured file 'main/binary-i386/Packages' as 
repository 'https://deb.taler.net/apt/ubuntu focal-fossa InRelease' doesn't 
support architecture 'i386'.
+  NB: Skipping acquire of configured file 'main/binary-i386/Packages' as 
repository 'https://deb.taler.net/apt/ubuntu focal-fossa InRelease' doesn't 
support architecture 'i386'.
 
 Finally, the required packages can be installed:
 
@@ -505,7 +505,7 @@ accounts.
 
 The following three commands create a schedule for submitting payments hourly,
 fetching transactions (intra-day reports) every 5 minutes, and (inter-day 
statements)
-once at 11pm every day :
+once at 11pm every day:
 
 .. code-block:: console
 
@@ -832,7 +832,7 @@ The exchange HTTP service can now be started:
    At this point, the exchange service is not yet fully operational.
 
 
-To check whether the exchange is running correctly under the advertised
+To check whether the exchange is running correctly under the advertized
 base URL, run:
 
 .. code-block:: shell-session
@@ -936,6 +936,6 @@ FIXMEs
 * When multiple TWGs are configured, which one will be used by the 
taler-exchange-transfer? CG: ALL!
 * On Ubuntu focal fossa, I get the following warning on "apt update", are we 
doing something wrong?
 
-  N: Skipping acquire of configured file 'main/binary-i386/Packages' as
+  NB: Skipping acquire of configured file 'main/binary-i386/Packages' as
   repository 'https://deb.taler.net/apt/ubuntu focal-fossa InRelease' doesn't
   support architecture 'i386'.
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index c8f3e53..9a3c94f 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -234,7 +234,7 @@ Tipping
 
 Taler does not only allow a Website to be paid, but also to make voluntary,
 non-contractual payments to visitors, called *tips*.  Such tips could be
-granted as a reward for filling in surveys or watching advertisements. For
+granted as a reward for filling in surveys or watching advertizements. For
 tips, there is no contract, tips are always voluntary actions by the Web
 site that do not arise from a contractual obligation.  Before a Web site
 can create tips, it must establish a reserve.  Once a reserve has been

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