[taler-docs] branch master updated (57e2059 -> 2724dc9)

[gnunet]

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

ttn pushed a change to branch master
in repository docs.

    from 57e2059  taler-config(1): add opt ‘-l’
     new b93a525  taler-merchant-httpd(1): add opts to synopsis
     new 6215fcf  taler-merchant-httpd(1): add opts ‘-L’, ‘-l’, ‘-T’
     new 2724dc9  dedent (seven instances)

The 3 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:
 manpages/taler-merchant-httpd.1.rst | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/manpages/taler-merchant-httpd.1.rst 
b/manpages/taler-merchant-httpd.1.rst
index 2de9df6..e1af5d6 100644
--- a/manpages/taler-merchant-httpd.1.rst
+++ b/manpages/taler-merchant-httpd.1.rst
@@ -12,8 +12,14 @@ taler-merchant-httpd(1)
 Synopsis
 ========
 
-**taler-merchant-httpd** [*options*]
-
+**taler-merchant-httpd**
+[**-C** | **––connection-close**]
+[**-c** *FILENAME* | **––config=**\ \ *FILENAME*]
+[**-h** | **––help**]
+[**-L** *LOGLEVEL* | **––loglevel=**\ ‌\ *LOGLEVEL*]
+[**-l** *FILENAME* | **––logfile=**\ ‌\ *FILENAME*]
+[**-T** *USEC* | **––timetravel**\ \ *USEC*]
+[**-v** | **––version**]
 
 Description
 ===========
@@ -27,19 +33,31 @@ Options
 =======
 
 **-C** \| **––connection-close**
-       Force each HTTP connection to be closed after each request
-       (useful in combination with -f to avoid having to wait for nc to
-       time out).
+   Force each HTTP connection to be closed after each request
+   (useful in combination with -f to avoid having to wait for nc to
+   time out).
 
 **-c** *FILENAME* \| **––config=**\ \ *FILENAME*
-       Use the configuration and other resources for the merchant to
-       operate from FILENAME.
+   Use the configuration and other resources for the merchant to
+   operate from FILENAME.
 
 **-h** \| **––help**
-       Print short help on options.
+   Print short help on options.
+
+**-L** *LOGLEVEL* \| **––loglevel=**\ ‌\ *LOGLEVEL*
+   Specifies the log level to use. Accepted values are: ``DEBUG``, ``INFO``,
+   ``WARNING``, ``ERROR``.
+
+**-l** *FILENAME* \| **––logfile=**\ ‌\ *FILENAME*
+   Send logging output to *FILENAME*.
+
+**-T** *USEC* \| **––timetravel=**\ \ *USEC*
+   Modify the system time by *USEC* microseconds.
+   *USEC* may be prefixed with ``+`` or ``-`` (e.g. ``-T +300``).
+   This option is intended for debugging/testing only.
 
 **-v** \| **––version**
-       Print version information.
+   Print version information.
 
 
 Signals

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