[taler-docs] branch master updated (610eb5c -> 97b8feb)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 610eb5c  use ‘.. code-block:: python’ (six instances)
     new 70c5955  use ‘.. code-block:: apacheconf’ (three instances)
     new 97b8feb  use ‘.. code-block:: nginx’ (three instances)

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:
 taler-merchant-manual.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 9cf52dc..8e9ff04 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -939,7 +939,7 @@ Nginx
 
 For Nginx, a possible basic reverse proxy configuration would be:
 
-   ::
+.. code-block:: nginx
 
       proxy_pass http://unix:/some/path/here.sock;
       proxy_redirect off;
@@ -967,7 +967,7 @@ In Apache, make sure you have "mod_proxy", "mod_proxy_http" 
and
 Then configure your Apache reverse proxy like this (you may change the
 endpoint):
 
-    ::
+.. code-block:: apacheconf
 
        <Location "/">
        ProxyPass "unix:/some/path/here.sock|http://example.com/";
@@ -1005,7 +1005,7 @@ Nginx
 For Nginx, you can implement token-based merchant backend authentication as
 follows:
 
-    ::
+.. code-block:: nginx
 
       location ~ /private/ {
           if ($http_authorization !~ "(?i)ApiKey SECURITYTOKEN") {
@@ -1024,7 +1024,7 @@ If you are running different instances on the same 
backend, you
 likely will want to specify different access control tokens for
 each instance:
 
-    ::
+.. code-block:: nginx
 
       location ~ ^/instances/foo/private/ {
           if ($http_authorization !~ "(?i)ApiKey FOOTOKEN") {
@@ -1059,7 +1059,7 @@ For Apache, you should first enable "mod_rewrite":
 
 Then, you can restrict to an access control token using:
 
-    ::
+.. code-block:: apacheconf
 
        <Location "/">
        RewriteEngine On
@@ -1079,7 +1079,7 @@ If you are running different instances on the same 
backend, you
 likely will want to specify different access control tokens for
 each instance:
 
-    ::
+.. code-block:: apacheconf
 
        <Location "/instances/foo/">
        RewriteEngine On

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