1 files changed, 28 insertions, 10 deletions
diff --git a/manpages/taler-merchant-httpd.1.rst b/manpages/taler-merchant-httpd.1.rst
index 2de9df6d..df175598 100644
--- a/manpages/taler-merchant-httpd.1.rst
+++ b/manpages/taler-merchant-httpd.1.rst
@@ -12,13 +12,19 @@ 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
 ===========
 
-taler-merchant-httpd is a command line tool to run the Taler merchant
+taler-merchant-httpd is a command-line tool to run the Taler merchant
 (HTTP backend).  The required configuration and database must exist
 before running this command.
 
@@ -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