[taler-docs] branch master updated (ab070a8 -> be6e36f)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from ab070a8  Merge branch 'master' of git+ssh://git.taler.net/docs
     new 7282c11  add hyphen to ‘back-office’ (three instances)
     new 8ae045e  grammar: s/is/are/
     new d148144  factor ‘apt install taler-merchant’ + blurb
     new 1ffe136  change markup of ‘postgres’ from " to ``
     new bd2b776  add colon
     new 12f0ca0  add :doc: link to taler-merchant-dbinit(1)
     new 50edd69  change markup from " to `` (three instances)
     new fac81c9  change markup from " to ``
     new ce4e19b  change markup from " to `` (three instances)
     new be6e36f  change markup from " to ``

The 10 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:
 frags/apt-install-taler-merchant.rst | 13 ++++++++
 taler-merchant-manual.rst            | 59 ++++++++++++------------------------
 2 files changed, 32 insertions(+), 40 deletions(-)
 create mode 100644 frags/apt-install-taler-merchant.rst

diff --git a/frags/apt-install-taler-merchant.rst 
b/frags/apt-install-taler-merchant.rst
new file mode 100644
index 0000000..d9605f7
--- /dev/null
+++ b/frags/apt-install-taler-merchant.rst
@@ -0,0 +1,13 @@
+
+To install the Taler merchant backend, you can now simply run:
+
+.. code-block:: console
+
+   # 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.
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 8e2c7fa..f8e6e64 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -63,7 +63,7 @@ currencies such as USD or EUR. For testing purposes, Taler 
uses a
 special currency “KUDOS” and includes its own special bank.
 
 .. index:: frontend
-.. index:: back office
+.. index:: back-office
 .. index:: backend
 .. index:: DBMS
 .. index:: Postgres
@@ -78,13 +78,13 @@ components:
    assumed to exist at the merchant.
    The :ref:`Merchant API Tutorial <merchant-api-tutorial>` gives an
    introduction for how to integrate Taler with Web shop frontends.
--  A back office application that enables the shop operators to view
+-  A back-office application that enables the shop operators to view
    customer orders, match them to financial transfers, and possibly
    approve refunds if an order cannot be satisfied. This component is
    not included with Taler, but rather assumed to exist at the
    merchant. The :ref:`Merchant Backend API <merchant-api>` provides
    the API specification that should be reviewed to integrate such a
-   back office with the Taler backend.
+   back-office with the Taler backend.
 -  A Taler-specific payment backend which makes it easy for the frontend
    to process financial transactions with Taler. This manual primarily
    describes how to install and configure this backend.
@@ -106,7 +106,7 @@ Taler-specific financial information in a DBMS and 
communicates with the GNU
 Taler exchange over the Internet. The frontend accesses the backend via a
 RESTful API. As a result, the frontend never has to directly communicate with
 the exchange, and also does not deal with sensitive data. In particular, the
-merchant’s signing keys and bank account information is encapsulated within
+merchant’s signing keys and bank account information are encapsulated within
 the Taler backend.
 
 A typical deployment will additionally include a full-blown Web server (like
@@ -380,18 +380,7 @@ Installing the GNU Taler binary packages on Debian
 
 .. include:: frags/installing-debian.rst
 
-To install the Taler merchant backend, you can now simply run:
-
-.. code-block:: console
-
-   # 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.
+.. include:: frags/apt-install-taler-merchant.rst
 
 
 Installing the GNU Taler binary packages on Ubuntu
@@ -399,18 +388,7 @@ Installing the GNU Taler binary packages on Ubuntu
 
 .. include:: frags/installing-ubuntu.rst
 
-To install the Taler merchant backend, you can now simply run:
-
-.. code-block:: console
-
-   # 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.
+.. include:: frags/apt-install-taler-merchant.rst
 
 
 .. _Installing-Taler-on-Debian-GNU_002fLinux:
@@ -585,7 +563,7 @@ The option
       [MERCHANT]/DB
 
 specifies which DBMS is to be used. However, currently only the value
-"postgres" is supported. This is also the default.
+``postgres`` is supported. This is also the default.
 
 In addition to selecting the DBMS software, the backend requires
 DBMS-specific options to access the database.
@@ -600,7 +578,7 @@ This option specifies a postgres access path using the 
format
 ``postgres:///$DBNAME``, where ``$DBNAME`` is the name of the
 Postgres 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:
 
 .. code-block:: console
 
@@ -639,6 +617,7 @@ the Postgres documentation.
 
 Commands, like ``taler-merchant-dbinit``, that support the ``-l LOGFILE``
 command-line option, send logging output to standard error by default.
+See :doc:`manpages/taler-merchant-dbinit.1` for more information.
 
 
 .. index: MASTER_KEY
@@ -650,8 +629,8 @@ To add an exchange to the list of trusted payment service 
providers, you
 create a section with a name that starts with “MERCHANT-EXCHANGE-”. In that
 section, the following options need to be configured:
 
--  The “EXCHANGE_BASE_URL” option specifies the exchange’s base URL. For 
example,
-   to use the Taler demonstrator, specify:
+-  The ``EXCHANGE_BASE_URL`` option specifies the exchange’s base URL.
+   For example, to use the Taler demonstrator, specify:
 
    .. code-block:: console
 
@@ -659,7 +638,7 @@ section, the following options need to be configured:
           -o EXCHANGE_BASE_URL \
           -V https://exchange.demo.taler.net/
 
--  The “MASTER_KEY” option specifies the exchange’s master public key
+-  The ``MASTER_KEY`` option specifies the exchange’s master public key
    in base32 encoding. For the Taler demonstrator, use:
 
    .. code-block:: console
@@ -668,7 +647,7 @@ section, the following options need to be configured:
           -o MASTER_KEY \
           -V CQQZ9DY3MZ1ARMN5K1VKDETS04Y2QCKMMCFHZSWJWWVN82BTTH00
 
--  The “CURRENCY” option specifies the exchange’s currency.
+-  The ``CURRENCY`` option specifies the exchange’s currency.
    For the Taler demonstrator, use:
 
    .. code-block:: console
@@ -680,7 +659,7 @@ section, the following options need to be configured:
 Note that multiple exchanges can be added to the system by using different
 tokens in place of ``demo`` in the example above. Note that all of the
 exchanges must use the same currency: If the currency does not match the main
-currency from the "TALER" section, the exchange is ignored. If you need to
+currency from the ``TALER`` section, the exchange is ignored. If you need to
 support multiple currencies, you need to configure a backend per currency.
 
 
@@ -693,8 +672,8 @@ that all exchanges audited by this auditor will be trusted!)
 you create a section with a name that starts with “MERCHANT-AUDITOR-”. In
 that section, the following options need to be configured:
 
--  The “AUDITOR_BASE_URL” option specifies the auditor’s base URL. For example,
-   to use the Taler demonstrator's auditor, specify:
+-  The ``AUDITOR_BASE_URL`` option specifies the auditor’s base URL.
+   For example, to use the Taler demonstrator's auditor, specify:
 
    .. code-block:: console
 
@@ -702,7 +681,7 @@ that section, the following options need to be configured:
           -o AUDITOR_BASE_URL \
           -V https://exchange.demo.taler.net/
 
--  The “AUDITOR_KEY” option specifies the auditor's public key
+-  The ``AUDITOR_KEY`` option specifies the auditor's public key
    in base32 encoding. For the Taler demonstrator, use:
 
    .. code-block:: console
@@ -711,7 +690,7 @@ that section, the following options need to be configured:
           -o AUDITOR_KEY \
           -V FIXMEBADVALUENEEDTOGETTHERIGHTVALUEHEREEVENTUALLY000
 
--  The “CURRENCY” option specifies the auditor’s currency.
+-  The ``CURRENCY`` option specifies the auditor’s currency.
    For the Taler demonstrator, use:
 
    .. code-block:: console
@@ -769,7 +748,7 @@ Given the above configuration, the backend will use a 
database named
 
 The backend will deposit the coins it receives to the exchange at
 https://exchange.demo.taler.net/, which has the master key
-"FH1Y8ZMHCTPQ0YFSZECDH8C9407JR3YN0MF1706PTG24Q4NEWGV0".
+``FH1Y8ZMHCTPQ0YFSZECDH8C9407JR3YN0MF1706PTG24Q4NEWGV0``.
 
 Please note that ``doc/config.sh`` will walk you through all
 configuration steps, showing how to invoke ``taler-config`` for each of

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