[taler-merchant] 02/03: update submodule

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

commit bc6dea9c6544340a57e8f9cfd9d03b1df9023ac8
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Jan 21 16:11:29 2021 +0100

    update submodule
---
 .gitignore                     |  4 +-
 .gitmodules                    |  2 +-
 doc/prebuilt                   |  1 +
 doc/taler-merchant-benchmark.1 | 86 ------------------------------------------
 doc/taler-merchant-httpd.1     | 37 ------------------
 5 files changed, 5 insertions(+), 125 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4bae040d..6f11ac69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ 
src/testing/test_merchant_api_home/.local/share/taler/auditors/
 src/testing/test_merchant_api_twisted
 taler_merchant_config.h
 taler_merchant_config.h.in
-doc/*
 !doc/*.texi
 !doc/*.css
 !doc/*.1
@@ -76,3 +75,6 @@ 
src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/secm
 
src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/secm_tofus.pub
 
src/testing/test_merchant_api_home/.local/share/taler/taler-helper-crypto-eddsa/
 src/testing/test_merchant_api_home/.local/share/taler/taler-helper-crypto-rsa/
+doc/stamp-?
+doc/stamp-vti
+doc/mdate-sh
diff --git a/.gitmodules b/.gitmodules
index 6c91f295..91e0186e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "doc/prebuilt"]
        path = doc/prebuilt
-       url = https://git.taler.net/docs.git
+       url = git://git.taler.net/docs.git
        branch = prebuilt
diff --git a/doc/prebuilt b/doc/prebuilt
new file mode 160000
index 00000000..4739f144
--- /dev/null
+++ b/doc/prebuilt
@@ -0,0 +1 @@
+Subproject commit 4739f1447d0e8a6534c7fbdbc361d5d756d1875b
diff --git a/doc/taler-merchant-benchmark.1 b/doc/taler-merchant-benchmark.1
deleted file mode 100644
index 2dc3057a..00000000
--- a/doc/taler-merchant-benchmark.1
+++ /dev/null
@@ -1,86 +0,0 @@
-.TH TALER\-MERCHANT\-BENCHMARK 1 "Mar 5, 2019" "GNU Taler"
-
-.SH NAME
-taler\-merchant\-benchmark \- Generate Taler\-style fake payments.
-
-.SH SYNOPSIS
-.B taler\-merchant\-benchmark
-.RI [ subcommand ]
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-\fBtaler\-merchant\-benchmark\fP is a command line tool to populate your 
merchant database with fake Taler\-style payments.
-
-.SH SUBCOMMAND
-.B
-.SS ordinary
-Generate normal payments: all the payments are performed (by the default 
instance) and aggregated by the exchange.
-Takes the following options.
-
-.B
-.IP "\-p PN,  \-\-payments\-number=PN"
-Perform PN many payments, defaults to 1.
-
-.B
-.IP "\-t TN,  \-\-tracks\-number=TN"
-Perform TN many tracking operations, defaults to 1.
-
-.B
-.SS corner
-Drive the generator to create unusual situations, like for example leaving 
payments
-unaggregated, or using a non-default merchant instance.  Takes the following 
options.
-
-.B
-.IP "\-t TC, \-\-two\-coins=TC"
-Perform TC many payments that use two coins (normally, all the payments use 
only one coin).  TC defaults to 1.
-
-.B
-.IP "\-i AI, \-\-alt\-instance=AI"
-Use AI as the instance, instead of 'default' (which is the default instance 
used.)
-
-.B
-.IP "\-u UN, \-\-unaggregated\-number=UN"
-Generate UN payments that will be left unaggregated.  Note that subsequent 
invocations of the generator may pick
-those unaggregated payments and actually aggregated them.
-
-
-.SH COMMON OPTIONS
-
-.B
-.IP "\-k K, \-\-currency=K"
-Use currency K, mandatory.
-
-.B
-.IP "\-m URL, \-\-merchant\-url=URL"
-Use URL as the merchant base URL during the benchmark.  The URL is mainly used 
to download and pay for contracts.  Mandatory.
-
-.B
-.IP "\-b URL, \-\-bank\-url=URL"
-Use URL as the bank's base URL during the benchmark.  The URL is used to test 
whether the bank is up and running.  Mandatory.
-
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
-Use the configuration and other resources for the merchant to operate from 
FILENAME.
-
-.B
-.IP "\-h, \-\-help"
-Print short help on options.
-
-.B
-.IP "\-v, \-\-version"
-Print version information.
-
-.B
-.IP "\-l LF, \-\-logfile=LF"
-Sends logs to file whose path is LF.
-
-.B
-.IP "\-L LOGLEVEL, \-\-log=LOGLEVEL"
-Use loglevel LOGLEVEL.
-
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending 
electronic mail to <taler@gnu.org>
-
-.SH "SEE ALSO"
-\fBtaler\-merchant\-dbinit\fP(1), \fBtaler\-merchant\-tip\-enable\fP(1), 
\fBtaler.conf\fP(5)
diff --git a/doc/taler-merchant-httpd.1 b/doc/taler-merchant-httpd.1
deleted file mode 100644
index 7e345875..00000000
--- a/doc/taler-merchant-httpd.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH TALER\-MERCHANT\-HTTPD 1 "Nov 4, 2017" "GNU Taler"
-
-.SH NAME
-taler\-merchant\-httpd \- Run Taler merchant backend (with RESTful API)
-
-.SH SYNOPSIS
-.B taler\-merchant\-httpd
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-\fBtaler\-merchant\-httpd\fP is a command line tool to run the Taler merchant 
(HTTP backend).  The required configuration and database must exist before 
running this command.
-
-.SH OPTIONS
-.B
-.IP "\-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).
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
-Use the configuration and other resources for the merchant to operate from 
FILENAME.
-.B
-.IP "\-h, \-\-help"
-Print short help on options.
-.B
-.IP "\-v, \-\-version"
-Print version information.
-
-.SH SIGNALS
-.B
-.IP SIGTERM
-Sending a SIGTERM to the process will cause it to shutdown cleanly.
-
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending 
electronic mail to <taler@gnu.org>
-
-.SH "SEE ALSO"
-\fBtaler\-merchant\-dbinit\fP(1), \fBtaler\-merchant\-tip\-enable\fP(1), 
\fBtaler.conf\fP(5)

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