diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-01-21 15:37:55 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-01-21 15:37:55 +0100 |
| commit | 3e8fed0ea6505955fb2b65bd040a965d8c35d61a (patch) | |
| tree | 827f0621990c68ea10cf1e1c6868a1fc38745d0e | |
| parent | cd47c8e0afb66f2d9053082940f208347551b3a8 (diff) | |
| download | merchant-3e8fed0ea6505955fb2b65bd040a965d8c35d61a.tar.gz merchant-3e8fed0ea6505955fb2b65bd040a965d8c35d61a.tar.bz2 merchant-3e8fed0ea6505955fb2b65bd040a965d8c35d61a.zip | |
update submodules
| -rw-r--r-- | .gitmodules | 12 | ||||
| -rw-r--r-- | doc/Makefile.am | 28 |
2 files changed, 25 insertions, 15 deletions
diff --git a/.gitmodules b/.gitmodules index f2cf3660..6c91f295 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,4 @@ -[submodule "examples/blog/web-common"] - path = examples/blog/web-common - url = ../web-common.git - branch = master -[submodule "examples/shop/web-common"] - path = examples/shop/web-common - url = ../web-common.git - branch = master +[submodule "doc/prebuilt"] + path = doc/prebuilt + url = https://git.taler.net/docs.git + branch = prebuilt diff --git a/doc/Makefile.am b/doc/Makefile.am index 114a657b..c9c725f5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,12 +1,26 @@ SUBDIRS = . doxygen man_MANS = \ - taler-merchant-benchmark.1 \ - taler-merchant-httpd.1 + prebuilt/man/taler-merchant-dbinit.1\ + prebuilt/man/taler-merchant-httpd.1 \ + prebuilt/man/taler-merchant-setup-reserve.1\ + prebuilt/man/taler-merchant-benchmark.1 + +info_TEXINFOS = \ + prebuilt/texinfo/taler-merchant-api-tutorial.texi \ + prebuilt/texinfo/taler-merchant.texi -EXTRA_DIST = \ - $(man_MANS) -DISTCLEANFILES = \ - manual.cps \ - manual.dvi +EXTRA_DIST = \ + $(man_MANS) \ + $(info_TEXINFOS) \ + prebuilt/texinfo/taler-merchant-api-tutorial-figures/arch-api.png \ + prebuilt/texinfo/taler-merchant-api-tutorial-figures/auditor-db.png \ + prebuilt/texinfo/taler-merchant-api-tutorial-figures/exchange-db.png \ + prebuilt/texinfo/taler-merchant-api-tutorial-figures/merchant-db.png \ + prebuilt/texinfo/taler-merchant-api-tutorial-figures/replication.png \ + prebuilt/texinfo/taler-merchant-figures/arch-api.png \ + prebuilt/texinfo/taler-merchant-figures/auditor-db.png \ + prebuilt/texinfo/taler-merchant-figures/exchange-db.png \ + prebuilt/texinfo/taler-merchant-figures/merchant-db.png \ + prebuilt/texinfo/taler-merchant-figures/replication.png |