From d103d7b1634bb24c73d51cb4f3fb4f24239dafde Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 20 Jul 2023 17:10:36 +0200 Subject: [PATCH] -new man page --- contrib/Makefile.am | 10 +++++----- contrib/{pp-v0.rst => exchange-pp-v0.rst} | 0 contrib/{tos-bfh-v0.rst => exchange-tos-bfh-v0.rst} | 0 contrib/{tos-v0.rst => exchange-tos-v0.rst} | 0 .../de/LC_MESSAGES/{tos-v0.po => exchange-tos-v0.po} | 0 contrib/taler-terms-generator.in | 2 +- doc/Makefile.am | 1 + doc/prebuilt | 2 +- src/exchange/exchange.conf | 8 ++++---- 9 files changed, 12 insertions(+), 11 deletions(-) rename contrib/{pp-v0.rst => exchange-pp-v0.rst} (100%) rename contrib/{tos-bfh-v0.rst => exchange-tos-bfh-v0.rst} (100%) rename contrib/{tos-v0.rst => exchange-tos-v0.rst} (100%) rename contrib/locale/de/LC_MESSAGES/{tos-v0.po => exchange-tos-v0.po} (100%) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index eb4c86b0a..3f84b22f1 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -13,11 +13,11 @@ dist_tmplpkgdata_DATA = \ persona-kyc-failed.en.must \ persona-provider-failure.en.must -termsdir=$(datadir)/taler/exchange/ +termsdir=$(datadir)/taler/terms/ terms_DATA = \ - tos-v0.rst \ - tos-bfh-v0.rst \ - pp-v0.rst + exchange-tos-v0.rst \ + exchange-tos-bfh-v0.rst \ + exchange-pp-v0.rst install-exec-local: pwd @@ -44,7 +44,7 @@ CLEANFILES = \ taler-terms-generator EXTRA_DIST = \ - locale/de/LC_MESSAGES/tos-v0.po \ + locale/de/LC_MESSAGES/exchange-tos-v0.po \ taler-bank-manage-testing \ taler-nexus-prepare \ taler-terms-generator.in \ diff --git a/contrib/pp-v0.rst b/contrib/exchange-pp-v0.rst similarity index 100% rename from contrib/pp-v0.rst rename to contrib/exchange-pp-v0.rst diff --git a/contrib/tos-bfh-v0.rst b/contrib/exchange-tos-bfh-v0.rst similarity index 100% rename from contrib/tos-bfh-v0.rst rename to contrib/exchange-tos-bfh-v0.rst diff --git a/contrib/tos-v0.rst b/contrib/exchange-tos-v0.rst similarity index 100% rename from contrib/tos-v0.rst rename to contrib/exchange-tos-v0.rst diff --git a/contrib/locale/de/LC_MESSAGES/tos-v0.po b/contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po similarity index 100% rename from contrib/locale/de/LC_MESSAGES/tos-v0.po rename to contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po diff --git a/contrib/taler-terms-generator.in b/contrib/taler-terms-generator.in index 1bf030c16..11f964f77 100755 --- a/contrib/taler-terms-generator.in +++ b/contrib/taler-terms-generator.in @@ -88,7 +88,7 @@ EOF # defaults AUTHOR="GNU Taler team" -VERSION="tos-v0" +VERSION="exchange-tos-v0" OUTPUT="%termsdir%" PAPER="a4" COPYRIGHT="2014-2023 Taler Systems SA (GPLv3+ or GFDL 1.3+)" diff --git a/doc/Makefile.am b/doc/Makefile.am index c94bd8aea..e3818d59d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -42,6 +42,7 @@ man_MANS = \ prebuilt/man/taler-helper-auditor-purses.1\ prebuilt/man/taler-helper-auditor-reserves.1\ prebuilt/man/taler-helper-auditor-wire.1 \ + prebuilt/man/taler-terms-generator.1 \ prebuilt/man/taler-unified-setup.1 info_TEXINFOS = \ diff --git a/doc/prebuilt b/doc/prebuilt index 6026efb59..47cd9e96c 160000 --- a/doc/prebuilt +++ b/doc/prebuilt @@ -1 +1 @@ -Subproject commit 6026efb59ef8c41e5b86e68332780d387fdaab0a +Subproject commit 47cd9e96ca2b3ff39db16e667fb9a63652970628 diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf index d3030a6bd..da357f642 100644 --- a/src/exchange/exchange.conf +++ b/src/exchange/exchange.conf @@ -120,13 +120,13 @@ WIREWATCH_IDLE_SLEEP_INTERVAL = 1 s SIGNKEY_LEGAL_DURATION = 2 years # Directory with our terms of service. -TERMS_DIR = $DATADIR/exchange/ +TERMS_DIR = $DATADIR/terms/ # Etag / filename for the terms of service. -TERMS_ETAG = tos-v0 +TERMS_ETAG = exchange-tos-v0 # Directory with our privacy policy. -PRIVACY_DIR = $DATADIR/exchange/ +PRIVACY_DIR = $DATADIR/terms/ # Etag / filename for the privacy policy. -PRIVACY_ETAG = pp-v0 +PRIVACY_ETAG = exchange-pp-v0