[taler-docs] branch master updated (247fb8b -> 64ae10d)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 247fb8b  replace nginx fixme w/ config frag + blurb
     new ac91da3  move FIXME upward in text
     new 64ae10d  s/setup/set up/

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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 158311a..4a2cc01 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -959,11 +959,11 @@ Note that the above again assumes your domain name is 
``example.com`` and that
 you have TLS configured.  Note that you must add the ``https`` header unless
 your site is not available via TLS.
 
-The above configuration(s) are both incomplete. You must still additionally
-setup access control!
-
 FIXME: What about 40[34] swizzling?  (#6944)
 
+The above configuration(s) are both incomplete. You must still additionally
+set up access control!
+
 Access control
 --------------
 

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