From 389b5de09dc3720c22ac86d5cad4c1495fc5be58 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 18 Sep 2019 19:45:10 +0200 Subject: use pre-built man and texinfo from docs.git --- .gitignore | 1 + .gitmodules | 4 + bootstrap | 1 + doc/Makefile.am | 32 +++--- doc/coding-style.txt | 65 ----------- doc/highlight.pack.js | 2 - doc/prebuilt | 1 + doc/taler-auditor-exchange.1 | 45 -------- doc/taler-auditor-sign.1 | 46 -------- doc/taler-auditor.1 | 43 ------- doc/taler-bank-transfer.1 | 55 --------- doc/taler-config-generate.1 | 74 ------------ doc/taler-exchange-aggregator.1 | 37 ------ doc/taler-exchange-benchmark.1 | 44 ------- doc/taler-exchange-dbinit.1 | 47 -------- doc/taler-exchange-httpd.1 | 92 --------------- doc/taler-exchange-keycheck.1 | 39 ------- doc/taler-exchange-keyup.1 | 55 --------- doc/taler-exchange-wire.1 | 34 ------ doc/taler-exchange-wirewatch.1 | 41 ------- doc/taler.conf.5 | 248 ---------------------------------------- 21 files changed, 24 insertions(+), 982 deletions(-) delete mode 100644 doc/coding-style.txt delete mode 100644 doc/highlight.pack.js create mode 160000 doc/prebuilt delete mode 100644 doc/taler-auditor-exchange.1 delete mode 100644 doc/taler-auditor-sign.1 delete mode 100644 doc/taler-auditor.1 delete mode 100644 doc/taler-bank-transfer.1 delete mode 100644 doc/taler-config-generate.1 delete mode 100644 doc/taler-exchange-aggregator.1 delete mode 100644 doc/taler-exchange-benchmark.1 delete mode 100644 doc/taler-exchange-dbinit.1 delete mode 100644 doc/taler-exchange-httpd.1 delete mode 100644 doc/taler-exchange-keycheck.1 delete mode 100644 doc/taler-exchange-keyup.1 delete mode 100644 doc/taler-exchange-wire.1 delete mode 100644 doc/taler-exchange-wirewatch.1 delete mode 100644 doc/taler.conf.5 diff --git a/.gitignore b/.gitignore index c472f73fa..9827d74a6 100644 --- a/.gitignore +++ b/.gitignore @@ -101,6 +101,7 @@ doc/manual/manual.pg doc/manual/manual.toc doc/manual/manual.tp doc/manual/manual.vr +doc/prebuilt/* contrib/taler-exchange.tag doxygen-doc/ src/lib/test_exchange_api_keys_cherry_picking diff --git a/.gitmodules b/.gitmodules index 7625aa983..de5e33058 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "doc/api"] path = doc/api url = git@git.taler.net:api +[submodule "doc/prebuilt"] + path = doc/prebuilt + url = https://git.taler.net/docs.git + branch = prebuilt diff --git a/bootstrap b/bootstrap index 4e7cc0537..6d01a1ffa 100755 --- a/bootstrap +++ b/bootstrap @@ -1,2 +1,3 @@ #!/bin/sh autoreconf -if +git submodule update --init diff --git a/doc/Makefile.am b/doc/Makefile.am index c864bfb53..3c844e5c5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -3,21 +3,23 @@ SUBDIRS = . man_MANS = \ - taler-auditor.1 \ - taler-auditor-exchange.1 \ - taler-auditor-sign.1 \ - taler-bank-transfer.1 \ - taler-config-generate.1 \ - taler-exchange-aggregator.1 \ - taler-exchange-dbinit.1 \ - taler-exchange-httpd.1 \ - taler-exchange-keyup.1 \ - taler-exchange-keycheck.1 \ - taler-exchange-wire.1 \ - taler-exchange-wirewatch.1 \ - taler-exchange-benchmark.1 \ - taler.conf.5 + prebuilt/man/taler-auditor.1 \ + prebuilt/man/taler-auditor-exchange.1 \ + prebuilt/man/taler-auditor-sign.1 \ + prebuilt/man/taler-bank-transfer.1 \ + prebuilt/man/taler-config-generate.1 \ + prebuilt/man/taler-exchange-aggregator.1 \ + prebuilt/man/taler-exchange-dbinit.1 \ + prebuilt/man/taler-exchange-httpd.1 \ + prebuilt/man/taler-exchange-keyup.1 \ + prebuilt/man/taler-exchange-keycheck.1 \ + prebuilt/man/taler-exchange-wire.1 \ + prebuilt/man/taler-exchange-wirewatch.1 \ + prebuilt/man/taler-exchange-benchmark.1 \ + prebuilt/man/taler.conf.5 + +info_TEXINFOS = \ + prebuilt/texinfo/taler-exchange.texi EXTRA_DIST = \ - coding-style.txt \ $(man_MANS) diff --git a/doc/coding-style.txt b/doc/coding-style.txt deleted file mode 100644 index fe7bfed12..000000000 --- a/doc/coding-style.txt +++ /dev/null @@ -1,65 +0,0 @@ -These are the general coding style rules for Taler. - -* Baseline rules are to follow GNU guidelines, modified or extended - by the GNUnet style: https://gnunet.org/style - -Naming conventions: -=================== - -* include files (very similar to GNUnet): - + if installed, must start with "taler_" (exception: platform.h), - and MUST live in src/include/ - + if NOT installed, must NOT start with "taler_" and - MUST NOT live in src/include/ and - SHOULD NOT be included from outside of their own directory - + end in "_lib" for "simple" libraries - + end in "_plugin" for plugins - + end in "_service" for libraries accessing a service, i.e. the exchange - -* binaries: - + taler-exchange-xxx: exchange programs - + taler-merchant-xxx: merchant programs (demos) - + taler-wallet-xxx: wallet programs - + plugins should be libtaler_plugin_xxx_yyy.so: plugin yyy for API xxx - + libtalerxxx: library for API xxx - -* logging - + tools use their full name in GNUNET_log_setup - (i.e. 'taler-exchange-keyup') and log using plain 'GNUNET_log'. - + pure libraries (without associated service) use 'GNUNET_log_from' - with the component set to their library name (without lib or '.so'), - which should also be their directory name (i.e. 'util') - + plugin libraries (without associated service) use 'GNUNET_log_from' - with the component set to their type and plugin name (without lib or '.so'), - which should also be their directory name (i.e. 'exchangedb-postgres') - + libraries with associated service) use 'GNUNET_log_from' - with the name of the service, which should also be their - directory name (i.e. 'exchange') - -* configuration - + same rules as for GNUnet - -* exported symbols - + must start with TALER_[SUBSYSTEMNAME]_ where SUBSYSTEMNAME - MUST match the subdirectory of src/ in which the symbol is defined - + from libtalerutil start just with TALER_, without subsystemname - + if scope is ONE binary and symbols are not in a shared library, - use binary-specific prefix (such as TMH = taler-exchange-httpd) for - globals, possibly followed by the subsystem (TMH_DB_xxx). - -* structs: - + structs that are 'packed' and do not contain pointers and are - thus suitable for hashing or similar operations are distinguished - by adding a "P" at the end of the name. (NEW) Note that this - convention does not hold for the GNUnet-structs (yet). - + structs that are used with a purpose for signatures, additionally - get an "S" at the end of the name. - -* private (library-internal) symbols (including structs and macros) - + must not start with TALER_ or any other prefix - -* testcases - + must be called "test_module-under-test_case-description.c" - -* performance tests - + must be called "perf_module-under-test_case-description.c" diff --git a/doc/highlight.pack.js b/doc/highlight.pack.js deleted file mode 100644 index b2f9ff270..000000000 --- a/doc/highlight.pack.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */ -!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(//g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset"}function u(e){s+=""}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"
":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});hljs.registerLanguage("nginx",function(e){var r={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},b={eW:!0,l:"[a-z/_]+",k:{literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,r],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[r]},{cN:"regexp",c:[e.BE,r],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},r]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s+{",rB:!0,e:"{",c:[{cN:"section",b:e.UIR}],r:0},{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"attribute",b:e.UIR,starts:b}],r:0}],i:"[^\\s\\}]"}});hljs.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},_={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},i=/[a-zA-Z@][a-zA-Z0-9_]*/,n="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:_,l:i,i:""}]}]},{cN:"class",b:"("+n.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:n,l:i,c:[e.UTM]},{b:"\\."+e.UIR,r:0}]}});hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});hljs.registerLanguage("javascript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},a={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:t,c:[]},c={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,c,a,e.RM];var s=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx"],k:t,c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,c,e.CLCM,e.CBCM,a,{b:/[{,]\s*/,r:0,c:[{b:r+"\\s*:",rB:!0,r:0,c:[{cN:"attr",b:r,r:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+r+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:r},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:s}]}]},{b://,sL:"xml",c:[{b:/<\w+\s*\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:[{b:/<\w+\s*\/>/,skip:!0},"self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:r}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:s}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}});hljs.registerLanguage("python",function(e){var r={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},b={cN:"meta",b:/^(>>>|\.\.\.) /},c={cN:"subst",b:/\{/,e:/\}/,k:r,i:/#/},a={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[b],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[b],r:10},{b:/(fr|rf|f)'''/,e:/'''/,c:[b,c]},{b:/(fr|rf|f)"""/,e:/"""/,c:[b,c]},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},{b:/(fr|rf|f)'/,e:/'/,c:[c]},{b:/(fr|rf|f)"/,e:/"/,c:[c]},e.ASM,e.QSM]},s={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},i={cN:"params",b:/\(/,e:/\)/,c:["self",b,s,a]};return c.c=[a,s,b],{aliases:["py","gyp"],k:r,i:/(<\/|->|\?)|=>/,c:[b,s,a,e.HCM,{v:[{cN:"function",bK:"def"},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,i,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"|$)",e:">",k:{name:"style"},c:[t],starts:{e:"",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"|$)",e:">",k:{name:"script"},c:[t],starts:{e:"",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}| )",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},i={cN:"meta",b:/<\?(php)?|\?>/},t={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},a={v:[e.BNM,e.CNM]};return{aliases:["php3","php4","php5","php6"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[i]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},i,{cN:"keyword",b:/\$this\b/},c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,t,a]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},t,a]}});hljs.registerLanguage("tex",function(c){var e={cN:"tag",b:/\\/,r:0,c:[{cN:"name",v:[{b:/[a-zA-Zа-яА-я]+[*]?/},{b:/[^a-zA-Zа-яА-я0-9]/}],starts:{eW:!0,r:0,c:[{cN:"string",v:[{b:/\[/,e:/\]/},{b:/\{/,e:/\}/}]},{b:/\s*=\s*/,eW:!0,r:0,c:[{cN:"number",b:/-?\d*\.?\d+(pt|pc|mm|cm|in|dd|cc|ex|em)?/}]}]}}]};return{c:[e,{cN:"formula",c:[e],r:0,v:[{b:/\$\$/,e:/\$\$/},{b:/\$/,e:/\$/}]},c.C("%","$",{r:0})]}});hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=[e.BE,r,n],o=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:i,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,r:5,c:[e.TM]},{b:"-\\w\\b",r:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=o,s.c=o,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:o}});hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:e.IR},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:["self",e.CLCM,e.CBCM]}]}]}],r:0},{cN:"function",b:"function",e:/[\{;]/,eE:!0,k:r,c:["self",e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/%/,r:0},{bK:"constructor",e:/\{/,eE:!0,c:["self",{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:[e.CLCM,e.CBCM],i:/["'\(]/}]},{b:/module\./,k:{built_in:"module"},r:0},{bK:"module",e:/\{/,eE:!0},{bK:"interface",e:/\{/,eE:!0,k:"interface extends"},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{cN:"meta",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("java",function(e){var a="[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",t=a+"(<"+a+"(\\s*,\\s*"+a+")*>)?",r="false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",s="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",c={cN:"number",b:s,r:0};return{aliases:["jsp"],k:r,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:r,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},c,{cN:"meta",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("cpp",function(t){var e={cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"},r={cN:"string",v:[{b:'(u8?|U)?L?"',e:'"',i:"\\n",c:[t.BE]},{b:'(u8?|U)?R"',e:'"',c:[t.BE]},{b:"'\\\\?.",e:"'",i:"."}]},s={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],r:0},i={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,r:0},t.inherit(r,{cN:"meta-string"}),{cN:"meta-string",b:/<[^\n>]*>/,e:/$/,i:"\\n"},t.CLCM,t.CBCM]},a=t.IR+"\\s*\\(",c={keyword:"int float while private char catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and or not",built_in:"std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr",literal:"true false nullptr NULL"},n=[e,t.CLCM,t.CBCM,s,r];return{aliases:["c","cc","h","c++","h++","hpp"],k:c,i:"",k:c,c:["self",e]},{b:t.IR+"::",k:c},{v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:c,c:n.concat([{b:/\(/,e:/\)/,k:c,c:n.concat(["self"]),r:0}]),r:0},{cN:"function",b:"("+t.IR+"[\\*&\\s]+)+"+a,rB:!0,e:/[{;=]/,eE:!0,k:c,i:/[^\w\s\*&]/,c:[{b:a,rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:c,r:0,c:[t.CLCM,t.CBCM,r,s,e]},t.CLCM,t.CBCM,i]},{cN:"class",bK:"class struct",e:/[{;:]/,c:[{b://,c:["self"]},t.TM]}]),exports:{preprocessor:i,strings:r,k:c}}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});hljs.registerLanguage("http",function(e){var t="HTTP/[0-9\\.]+";return{aliases:["https"],i:"\\S",c:[{b:"^"+t,e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{b:"^[A-Z]+ (.*?) "+t+"$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0},{b:t},{cN:"keyword",b:"[A-Z]+"}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{e:"$",r:0}},{b:"\\n\\n",starts:{sL:[],eW:!0}}]}});hljs.registerLanguage("cs",function(e){var i={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long nameof object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let on orderby partial remove select set value var where yield",literal:"null false true"},t={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},r=e.inherit(t,{i:/\n/}),a={cN:"subst",b:"{",e:"}",k:i},c=e.inherit(a,{i:/\n/}),n={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,c]},s={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},a]},o=e.inherit(s,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},c]});a.c=[s,n,t,e.ASM,e.QSM,e.CNM,e.CBCM],c.c=[o,n,r,e.ASM,e.QSM,e.CNM,e.inherit(e.CBCM,{i:/\n/})];var l={v:[s,n,t,e.ASM,e.QSM]},b=e.IR+"(<"+e.IR+"(\\s*,\\s*"+e.IR+")*>)?(\\[\\])?";return{aliases:["csharp"],k:i,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",r:0},{b:""},{b:""}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},l,e.CNM,{bK:"class interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{cN:"meta",b:"^\\s*\\[",eB:!0,e:"\\]",eE:!0,c:[{cN:"meta-string",b:/"/,e:/"/}]},{bK:"new return throw await else",r:0},{cN:"function",b:"("+b+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:i,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:i,r:0,c:[l,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}});hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},i=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+n},{sL:"javascript",eB:!0,eE:!0,v:[{b:"```",e:"```"},{b:"`",e:"`"}]}];r.c=i;var s=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(i)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:i.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[s,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[s]},s]},{b:n+":",e:":",rB:!0,rE:!0,r:0}])}});hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*#]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias allocate allow alter always analyze ancillary and any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second section securefile security seed segment select self sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text varchar varying void"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t]},e.CBCM,t]}});hljs.registerLanguage("apache",function(e){var r={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"section",b:""},{cN:"attribute",b:/\w+/,r:0,k:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"meta",b:"\\s\\[",e:"\\]$"},{cN:"variable",b:"[\\$%]\\{",e:"\\}",c:["self",r]},r,e.QSM]}}],i:/\S/}}); \ No newline at end of file diff --git a/doc/prebuilt b/doc/prebuilt new file mode 160000 index 000000000..ca53235cc --- /dev/null +++ b/doc/prebuilt @@ -0,0 +1 @@ +Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5 diff --git a/doc/taler-auditor-exchange.1 b/doc/taler-auditor-exchange.1 deleted file mode 100644 index d038c37e0..000000000 --- a/doc/taler-auditor-exchange.1 +++ /dev/null @@ -1,45 +0,0 @@ -.Dd November 3, 2018 -.Dd TALER-AUDITOR-EXCHANGE 1 -.Os -.Sh NAME -.Nm taler-auditor-exchange -.Nd -add or remove exchange from auditor's list -.Sh SYNOPSIS -.Nm -.Op Fl h | \-help -.Op Fl r | \-remove -.Op Fl m Ar MASTERKEY | Fl \-exchange-key= Ns Ar MASTERKEY -.Op Fl u Ar EXCHANGE_URL | Fl \-auditor-url= Ns Ar EXCHANGE_URL -.Sh DESCRIPTION -.Nm -is a command line tool to be used by an auditor to add or remove an exchange from the list of exchange's audited by the auditor. -You must add an exchange to that list before signing denomination keys with taler-auditor-sign or trying to audit it with taler-auditor or taler-wire-auditor. -Afterwards the exchange will be visible via the /exchanges API of the taler-auditor-httpd. -.Bl -tag -width Ds -.It Fl m Ar MASTERKEY | Fl \-exchange-key= Ns Ar MASTERKEY -Public key of the exchange in Crockford base32 encoding, for example as generated by gnunet-ecc -p. -.It Fl h | \-help -Print short help on options. -.It Fl u Ar EXCHANGE_URL | Fl \-auditor-url= Ns Ar EXCHANGE_URL -URL of the exchange. -The exchange's HTTP API must be available at this address. -.It Fl r | \-remove -Instead of adding the exchange, remove it. -Note that this will drop ALL data associated with that exchange, including existing auditing information. -So use with extreme care! -.Sh SEE ALSO -.Xr gnunet-ecc 1 , -.Xr taler-auditor-sign 1 , -.Xr taler.conf 5 -.Sh BUGS -We should optionally verify the correctness of this exchange's base URL and that it matches the master public key (note that the exchange may still be offline, so it should be possible to bypass such a verfication step). -Furthermore, if we do verification, as a (less secure) convenience option, we should make -.Fl -m -optional and obtain it from the base URL. -.Pp -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-auditor-sign.1 b/doc/taler-auditor-sign.1 deleted file mode 100644 index 659dabca9..000000000 --- a/doc/taler-auditor-sign.1 +++ /dev/null @@ -1,46 +0,0 @@ -.Dd -.Dt TALER\-AUDITOR\-SIGN 1 "Mar 15, 2016" "GNU Taler" -.Os -.Sh NAME -.Nm taler\-auditor\-sign -.Nd -Sign exchange denomination as auditor. -.Sh SYNOPSIS -.Nm -.Op Fl a Ar FILE | Fl \-auditor-key= Ns Ar FILE -.Op Fl h | \-help -.Op Fl m Ar KEY | Fl \-exchange-key= Ns Ar KEY -.Op Fl u Ar URL | Fl \-auditor-url= Ns Ar URL -.Op Fl r Ar FILE | Fl \-exchange-request= Ns Ar FILE -.Op Fl o Ar FILE | Fl \-output= Ns Ar FILE -.Sh DESCRIPTION -.Nm -is a command line tool to be used by an auditor to sign that he is aware of certain keys being used by a exchange. -Using this signature, the auditor affirms that he will verify that the exchange is properly accounting for those coins. -.Pp -The exchange for which keys were signed must have been added to the auditor using taler\-auditor\-exchange first! -.Bl -tag -width Ds -.It Fl a Ar FILE | Fl \-auditor-key= Ns Ar FILE -Location of the private EdDSA auditor key. -If it does not exist, it will be created. -.It Fl h | \-help -Print short help on options. -.It Fl m Ar KEY | Fl \-exchange-key= Ns Ar KEY -Public key of the exchange in Crockford base32 encoding, for example as generated by gnunet-ecc -p. -.It Fl u Ar URL | Fl \-auditor-url= Ns Ar URL -URL of the auditor. -Provides informative link for the user to learn more about the auditor. -.It Fl r Ar FILE | Fl \-exchange-request= Ns Ar FILE -File with the exchange's denomination key signing request as generated by taler-exchange-keyup -o. -.It Fl o Ar FILE | Fl \-output= Ns Ar FILE -File where the auditor should write the EdDSA signature. -.Sh SEE ALSO -.Xr gnunet-ecc 1 , -.Xr taler-auditor-exchange 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler.conf 5 -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-auditor.1 b/doc/taler-auditor.1 deleted file mode 100644 index c0b82d64d..000000000 --- a/doc/taler-auditor.1 +++ /dev/null @@ -1,43 +0,0 @@ -.Dd March 20, 2017 -.Dt TALER-AUDITOR 1 -.Os -.Sh NAME -.Nm taler-auditor -.Nd -Audit exchange -.Sh SYNOPSIS -.Nm -.Op Fl h | \-help -.Op Fl m Ar MASTER_KEY | Fl \-exchange-key= Ns Ar MASTER_KEY -.Op Fl r | \-reset -.Sh DESCRIPTION -.Nm -is a command line tool to be used by an auditor to audit an exchange's database and calculate the current financial state of the exchange (including revenue, amount expected in escrow and risk exposure). -The audit is incremental. -The first audit must be performed with the -.Fl r -option to initialize the tables. -The tool reports inconsistencies in the balance or incorrect cryptographic signatures found in the database. -It does NOT check with the bank to see that the incoming and outgoing wire transfers that the bank claims to have matches the exchange's database. -Its options are as follows. -.Bl -tag -wdith Ds -.It Fl h | \-help -Print short help on options. -.It Fl m Ar KEY | Fl \-exchange-key= Ns Ar KEY -Public master key of the exchange in Crockford base32 encoding, for example as generated by gnunet-ecc -p. -If this option is missing, taler-auditor will use the MASTER_PUBLIC_KEY value from the "exchange" section of the configuration. -.It Fl r | \-reset -Reset the audit, starts everything from the beginning. -Useful for testing and required for the first audit to setup auditor's tables. -Note that if (just) the exchange key changes, the -.Fl r -option should not be used again. -.Sh SEE ALSO -.Xr gnunet-ecc 1 , -.Xr taler-auditor-sign 1 , -.Xr taler.conf 5 -.Sh BUGS -Report bugs by using -.Lk https://bugs.gnunet.org -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-bank-transfer.1 b/doc/taler-bank-transfer.1 deleted file mode 100644 index 2aab13fc8..000000000 --- a/doc/taler-bank-transfer.1 +++ /dev/null @@ -1,55 +0,0 @@ -.Dd December 14, 2017 -.Dt TALER-BANK-TRANSFER 1 -.Os -.Sh NAME -.Nm taler-bank-transfer -.Nd -trigger a transfer at the bank -.Sh SYNOPSIS -.Nm -.Op Fl a Ar VALUE | Fl \-amount= Ns Ar VALUE -.Op Fl b Ar URL | Fl \-bank= Ns Ar URL -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl h | \-help -.Op Fl D Ar ACCOUNT | Fl \-debit= Ns Ar ACCOUNT -.Op Fl C Ar ACCOUNT | Fl \-credit= Ns Ar ACCOUNT -.Op Fl s Ar STRING | Fl \-subject= Ns Ar STRING -.Op Fl u Ar USERNAME | Fl \-user= Ns Ar USERNAME -.Op Fl p Ar PASSPHRASE | Fl \-pass= Ns Ar PASSPHRASE -.Op Fl v | \-version -.Sh DESCRIPTION -.Nm -is a command line tool to trigger bank transfers. -.Bl -tag -width Ds -.It Fl a Ar VALUE | Fl \-amount= Ns Ar VALUE -Amount to transfer. -Given in the Taler\-typical format of CURRENCY:VALUE.FRACTION -.It Fl b Ar URL | Fl \-bank= Ns Ar URL -URL at which the bank is operation. -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -Use the given configuration file. -.It Fl h | \-help -Print short help on options. -.It Fl D Ar ACCOUNT | Fl \-debit= Ns Ar ACCOUNT -The money should be debited from ACCOUNT. -Specifies the number of the account. -.It Fl C Ar ACCOUNT | Fl \-credit= Ns Ar ACCOUNT -The money should be credited to ACCOUNT. -Specifies the number of the account. -.It Fl s Ar STRING | Fl \-subject= Ns Ar STRING -Use STRING for the wire transfer subject. -.It Fl u Ar USERNAME | Fl \-user= Ns Ar USERNAME -Specifies the username for authentication. -.It Fl p Ar PASSPHRASE | Fl \-pass= Ns Ar PASSPHRASE -Specifies the pass phrase for authentication. -.It Fl v | \-version -Print version information. -.El -.Sh SEE ALSO -.Xr taler-bank-manage 1 , -.Xr taler.conf 5 -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org diff --git a/doc/taler-config-generate.1 b/doc/taler-config-generate.1 deleted file mode 100644 index 2410fb380..000000000 --- a/doc/taler-config-generate.1 +++ /dev/null @@ -1,74 +0,0 @@ -.Dd May 5, 2016 -.Dt TALER-CONFIG-GENERATE 1 -.Os -.Sh NAME -.Nm taler-config-generate -.Nd -tool to simplify Taler configuration generation -.Os -.Sh SYNOPSIS -.Nm -.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -.Op Fl C Ar CURRENCY | Fl \-currency= Ns Ar CURRENCY -.Op Fl e | \-exchange -.Op Fl f Ar AMOUNT | \-wirefee= Ns Ar AMOUNT -.Op Fl m | \-merchant -.Op Fl t | \-trusted -.Op Fl w Ar WIREFORMAT | Fl \-wire Ar WIREFORMAT -.Op Fl j Ar JSON | Fl \-wire-json-merchant= Ns Ar JSON -.Op Fl J Ar JSON | Fl \-wire-json-exchange= Ns Ar JSON -.Op Fl \-bank-uri -.Op Fl \-exchange-bank-account -.Op Fl \-merchant-bank-account -.Op Fl h | \-help -.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -.Op Fl v | \-version -.Sh DESCRIPTION -.Nm -can be used to generate configuration files for the Taler exchange or Taler merchants. -.Bl -tag -width Ds -.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME -Location where to write the generated configuration. -Existing file will be updated, not overwritten. -.It Fl C Ar CURRENCY | Fl \-currency= Ns Ar CURRENCY -Which currency should we use in the configuration. -.It Fl e | \-exchange -Generate configuration for a Taler exchange. -.It Fl f Ar AMOUNT | \-wirefee= Ns Ar AMOUNT -Setup wire transfer fees for the next 5 years for the exchange (for all wire methods). -.It Fl m | \-merchant -Generate configuration for a Taler merchant. -.It Fl t | \-trusted -Setup current exchange as trusted with current merchant. -Generally only useful when configuring for testcases. -.It Fl w Ar WIREFORMAT | Fl \-wire Ar WIREFORMAT -Specifies which wire format to use (i.e. "test" or "sepa") -.It Fl j Ar JSON | Fl \-wire-json-merchant= Ns Ar JSON -Wire configuration to use for the merchant. -.It Fl J Ar JSON | Fl \-wire-json-exchange= Ns Ar JSON -Wire configuration to use for the exchange. -.It Fl \-bank-uri -Alternative to specify wire configuration to use for the exchange and merchant for the "test" wire method. -Only useful if WIREFORMAT was set to "test". -Specifies the URI of the bank. -.It Fl \-exchange-bank-account -Alternative to specify wire configuration to use for the exchange for the "test" wire method. -Only useful if WIREFORMAT was set to "test". -Specifies the bank account number of the exchange. -.It Fl \-merchant-bank-account -Alternative to specify wire configuration to use for the merchant for the "test" wire method. -Only useful if WIREFORMAT was set to "test". -Specifies the bank account number of the merchant. -.It Fl h | \-help -Shows this man page. -.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL -Use LOGLEVEL for logging. -Valid values are DEBUG, INFO, WARNING and ERROR. -.It Fl v | \-version -Print GNUnet version number. -.El -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-aggregator.1 b/doc/taler-exchange-aggregator.1 deleted file mode 100644 index 481262143..000000000 --- a/doc/taler-exchange-aggregator.1 +++ /dev/null @@ -1,37 +0,0 @@ -.Dd Mar 30, 2016 -.Dt TALER-EXCHANGE-AGGREGATOR 1 -.Os -.Sh NAME -.Nm taler-exchange-aggregator -.Nd -Aggregate and execute exchange transactions -.Sh SYNOPSIS -.Nm -.Op Fl d Ar DIRNAME | Fl \-exchange-dir= Ns Ar DIRNAME -.Op Fl h | \-help -.Op Fl t | \-test -.Op Fl v | \-version -.Sh DESCRIPTION -.Nm -is a command line tool to run pending transactions from the Taler exchange. -.Bl -tag -width Ds -.It Fl d Ar DIRNAME | Fl \-exchange-dir= Ns Ar DIRNAME -Use the configuration and other resources for the exchange to operate from -.Ar DIRNAME . -.It Fl h | \-help -Print short help on options. -.It Fl t | \-test -Run in test mode and exit when idle. -.It Fl v | \-version -Print version information. -.El -.Sh SEE ALSO -.Xr taler-exchange-dbinit 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler-exchange-httpd 1 , -.Xr taler.conf 5 . -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-benchmark.1 b/doc/taler-exchange-benchmark.1 deleted file mode 100644 index fa0995711..000000000 --- a/doc/taler-exchange-benchmark.1 +++ /dev/null @@ -1,44 +0,0 @@ -.Dd July 25, 2018 -.Dt TALER-EXCHANGE-BENCHMARK 1 -.Os -.Sh NAME -.Nm taler-exchange-benchmark -.Nd -Measure exchange performance -.Sh SYNOPSIS -.Nm -.Op Fl c Ar CONFIG_FILENAME | Fl \-config= Ns Ar CONFIG_FILENAME -.Op Fl b Ar BANK_URL | Fl --bank-url= Ns Ar BANK_URL -.Op Fl n Ar HOWMANY_COINS | Fl \-coins-number= Ns Ar HOWMANY_COINS -.Op Fl l Ar LOGLEVEL | Fl \-log\-level= Ns Ar LOGLEVEL -.Op Fl h | \-help -.Sh DESCRIPTION -.Nm -is a command line tool to measure the time spent to serve withdrawals/deposits/refreshes. -It usually needs a dedicate configuration file where all the services - the exchange and the (fake)bank - listen to URLs not subject to any reverse proxy, as say Nginx. -Moreover, the benchmark runs on a "volatile" database, that means that table are always erased during a single benchmark run. -.Bl -tag -width Ds -.It Fl c Ar CONFIG_FILENAME | Fl \-config= Ns Ar CONFIG_FILENAME -(Mandatory) Use CONFIG_FILENAME. -.It Fl b Ar BANK_URL | Fl --bank-url= Ns Ar BANK_URL -(Mandatory) The URL where the fakebank listens at. -Must match the host component in the exchange's escrow account "payto" URL. -.It Fl n Ar HOWMANY_COINS | Fl \-coins-number= Ns Ar HOWMANY_COINS -Defaults to 1. -Specifies how many coins this benchmark should withdraw and spend. -After being spent, each coin will be refreshed with a REFRESH_PROBABILITY probability, which is (hardcoded as) 0.1; future versions of this tool should offer this parameter as a CLI option. -.It Fl l Ar LOGLEVEL | Fl \-log\-level= Ns Ar LOGLEVEL -GNUnet-compatible log level, takes values "ERROR/WARNING/INFO/DEBUG" -.It Fl h | \-help -Prints a compiled-in help text. -.El -.Sh SEE ALSO -.Xr taler-exchange-dbinit 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler-exchange-httpd 1 , -.Xr taler.conf 5 -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-dbinit.1 b/doc/taler-exchange-dbinit.1 deleted file mode 100644 index c534b01e7..000000000 --- a/doc/taler-exchange-dbinit.1 +++ /dev/null @@ -1,47 +0,0 @@ -.Dd May 31, 2016 -.Dt TALER-EXCHANGE-DBINIT 1 -.Os -.Sh NAME -.Nm taler-exchange-dbinit -.Nd Initialize Taler exchange database. -.Sh SYNOPSIS -.Nm -.Op Fl d Ar DIRNAME | Fl -exchange-dir= Ns Ar DIRNAME -.Op Fl h | -help -.Op Fl g | -gc -.Op Fl r | -reset -.Op Fl v | -version -.Sh DESCRIPTION -.Nm -is a command line tool to initialize the Taler exchange database. -It creates the necessary tables and indices for the Taler exchange -to operate. -.Pp -Its options are as follows: -.Bl -tag -width indent -.It Fl d Ar DIRNAME | Fl -exchange-dir= Ns Ar DIRNAME -Use the configuration and other resources for the exchange to -operate from -.Ar DIRNAME . -.It Fl h | -help -Print short help on options. -.It Fl g | -gc -Garbage collect database. -Deletes all unnecessary data in the database. -.It Fl r | -reset -Drop tables. -Dangerous, will delete all existing data in the database before -creating the tables. -.It Fl v | -version -Print version information. -.El -.Sh SEE ALSO -.Xr taler-exchange-httpd 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler-exchange-reservemod 1 , -.Xr taler.conf 5 . -.Sh BUGS -Report bugs by using -.Lk https://bugs.gnunet.org -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-httpd.1 b/doc/taler-exchange-httpd.1 deleted file mode 100644 index 9cb178abf..000000000 --- a/doc/taler-exchange-httpd.1 +++ /dev/null @@ -1,92 +0,0 @@ -.Dd April 22, 2015 -.Dt TALER-EXCHANGE-HTTPD 1 -.Os -.Sh NAME -.Nm taler-exchange-httpd -.Nd Run Taler exchange (with RESTful API) -.Sh SYNOPSIS -.Nm -.Op Fl C | -connection-close -.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME -.Op Fl f Ar FILENAME | Fl -file-input= Ns Ar FILENAME -.Op Fl h | -help -.Op Fl i | -init-db -.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL -.Op Fl t Ar SECONDS | Fl -timeout= Ns Ar SECONDS -.Op Fl v | -version -.Sh DESCRIPTION -.Nm -is a command line tool to run the Taler exchange (HTTP server). -The required configuration, keys and database must exist before -running this command. -.Pp -Its options are as follows: -.Bl -tag -width indent -.It Fl C | -connection-close -Force each HTTP connection to be closed after each request (useful -in combination with -.Fl f -to avoid having to wait for nc to time out). -.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME -Use the configuration and other resources for the merchant to operate -from FILENAME. -.It Fl h | -help -Print short help on options. -.It Fl i | -init-db -Initialize the database by creating tables and indices if necessary. -.It Fl v | -version -Print version information. -.It Fl f Ar FILENAME | Fl -file-input= Ns Ar FILENAME -This option is only available if the exchange was compiled with the -configure option --enable-developer-mode. -It is used for generating test cases against the exchange using AFL. -When this option is present, the HTTP server will -.Bl -enum -offset indent -compact -.It -terminate after the first client's HTTP connection is completed, and -.It -automatically start such a client using a helper process based on the -.Xr nc 1 -or -.Xr ncat 1 -binary using FILENAME as the standard input to the helper process. -.El -As a result, the process will effectively run with -.Ar FILENAME -as the input from an HTTP client and then immediately exit. -This is useful to test taler-exchange-httpd against many different -possible inputs in a controlled way. -.It Fl t Ar SECONDS | Fl -timeout= Ns Ar SECONDS -Specifies the number of SECONDS after which the HTTPD should -close (idle) HTTP connections. -.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL -Specifies the log level to use. -Accepted values are: DEBUG, INFO, WARNING, ERROR. -.El -.Sh SIGNALS -.Nm -responds to the following signals: -.Bl -tag -width indent -.It Dv SIGUSR1 -Sending a SIGUSR1 to the process will cause it to reload denomination -and signing keys. -.It Dv SIGTERM -Sending a SIGTERM to the process will cause it to shutdown cleanly. -.It Dv SIGHUP -Sending a SIGHUP to the process will cause it to re-execute the -taler-exchange-httpd binary in the PATH, passing it the existing -listen socket. -Then the old server process will automatically exit after it is done -handling existing client connections; the new server process will -accept and handle new client connections. -.El -.Sh SEE ALSO -.Xr taler-exchange-dbinit 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler-exchange-reservemod 1 , -.Xr taler.conf 5 . -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-keycheck.1 b/doc/taler-exchange-keycheck.1 deleted file mode 100644 index ca97c3dad..000000000 --- a/doc/taler-exchange-keycheck.1 +++ /dev/null @@ -1,39 +0,0 @@ -.Dd April 22, 2015 -.Dt TALER-EXCHANGE-KEYCHECK 1 -.Os -.Sh NAME -.Nm taler\-exchange\-keycheck -.Nd check validity of Taler signing and denomination keys -.Sh SYNOPSIS -.Nm -.Op Fl d Ar DIRNAME | Fl -exchange-dir= Ns Ar DIRNAME -.Op Fl h | -help -.Op Fl v | -version -.Sh DESCRIPTION -.Nm -can be used to check if the signing and denomination keys in the -operation directory are well-formed. -This can be useful after importing fresh keys from the -offline system to ensure that the files are correct. -.Pp -Its options are as follows: -.Bl -tag -width indent -.It Fl d Ar DIRNAME | Fl -exchange-dir= Ns Ar DIRNAME -Use the configuration and other resources for the exchange -to operate from -.Ar DIRNAME . -.It Fl h | -help -Print short help on options. -.It Fl v | -version -Print version information. -.El -.Sh SEE ALSO -.Xr taler-exchange-httpd 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler-exchange-dbinit 1 , -.Xr taler.conf 5 . -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-keyup.1 b/doc/taler-exchange-keyup.1 deleted file mode 100644 index 61cca2fe2..000000000 --- a/doc/taler-exchange-keyup.1 +++ /dev/null @@ -1,55 +0,0 @@ -.Dd April 7, 2017 -.Dt TALER\-EXCHANGE\-KEYUP 1 -.Os -.Sh NAME -.Nm taler\-exchange\-keyup -.Nd setup Taler exchange denomination and signing keys -.Sh SYNOPSIS -.Nm -.Op Fl d Ar DIRNAME | Fl -exchange-dir= Ns Ar DIRNAME -.Op Fl h | -help -.Op Fl m Ar FILE | Fl -master-key= Ns Ar FILE -.Op Fl o Ar FILE | Fl -output= Ns Ar FILE -.Op Fl r Ar DKH | Fl -revoke= Ns Ar DKH -.Op Fl t Ar TIMESTAMP | Fl -time= Ns Ar TIMESTAMP -.Op Fl v | -version -.Sh DESCRIPTION -.Nm -is a command line tool to setup Taler denomination and signing keys. -This tool requires access to the exchange's long-term offline signing -key and should be run in a secure (offline) environment under strict -controls. -The resulting keys can then be copied to the main online directory -where the Taler HTTP server operates. -.Pp -Its options are as follows: -.Bl -tag -width indent -.It Fl d Ar DIRNAME | Fl -exchange-dir= Ns Ar DIRNAME -Use the configuration and other resources for the exchange to -operate from -.Ar DIRNAME . -.It Fl h | -help -Print short help on options. -.It Fl m Ar FILE | Fl -master-key= Ns Ar FILE -Location of the private EdDSA offline master key of the exchange. -.It Fl o Ar FILE | Fl -output= Ns Ar FILE -Where to write a denomination key signing request file to be given -to the auditor. -.It Fl r Ar DKH | Fl -revoke= Ns Ar DKH -Revoke the denomination key where the denomination public key's hash is DKH. -.It Fl t Ar TIMESTAMP | Fl -time= Ns Ar TIMESTAMP -Operate as if the current time was -.Ar TIMESTAMP . -.It Fl v | -version -Print version information. -.El -.Sh SEE ALSO -.Xr taler-exchange-httpd 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler-exchange-keycheck 1 , -.Xr taler.conf 5 . -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-wire.1 b/doc/taler-exchange-wire.1 deleted file mode 100644 index d49704462..000000000 --- a/doc/taler-exchange-wire.1 +++ /dev/null @@ -1,34 +0,0 @@ -.Dd March 18, 2018 -.Dt TALER-EXCHANGE-WIRE 1 -.Os -.Sh NAME -.Nm taler-exchange-wire -.Nd create the master-key signed responses to /wire -.Sh SYNOPSIS -.Nm -.Op Fl h | -help -.Op Fl m Ar MASTERKEYFILE | Fl -master= Ns Ar MASTERKEYFILE -.Op Fl v | -version -.Sh DESCRIPTION -.Nm -is used to create the exchange's reply to a /wire request. -It converts the bank details into the appropriate signed response. -This needs to be done using the long-term offline master key. -.Pp -Its options are as follows: -.Bl -tag -width indent -.It Fl h | -help -Print short help on options. -.It Fl m Ar MASTERKEYFILE | Fl -master= Ns Ar MASTERKEYFILE -Specifies the name of the file containing the exchange's master key. -.It Fl v | -version -Print version information. -.El -.Sh SEE ALSO -.Xr taler-exchange-httpd 1 , -.Xr taler.conf 5 . -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler-exchange-wirewatch.1 b/doc/taler-exchange-wirewatch.1 deleted file mode 100644 index 447e1217b..000000000 --- a/doc/taler-exchange-wirewatch.1 +++ /dev/null @@ -1,41 +0,0 @@ -.Dd May 5, 2017 -.Dt TALER-EXCHANGE-WIREWATCH 1 -.Os -.Sh NAME -.Nm taler-exchange-wirewatch -.Nd watch for incoming wire transfers -.Sh SYNOPSIS -.Nm -.Op Fl t Ar PLUGINNAME | Fl -type= Ns Ar PLUGINNAME -.Op Fl h | -help -.Op Fl T | -test -.Op Fl r | -reset -.Op Fl v | -version -.Sh DESCRIPTION -.Nm -is a command line tool to import wire transactions into the -Taler exchange database. -.Pp -Its options are as follows: -.Bl -tag -width indent -.It Fl t Ar PLUGINNAME | Fl -type= Ns Ar PLUGINNAME -Use the specified wire plugin and its configuration to talk to the bank. -.It Fl h | -help -Print short help on options. -.It Fl T | -test -Run in test mode and exit when idle. -.It Fl r | -reset -Ignore our own database and start with transactions -from the beginning of time. -.It Fl v | -version -Print version information. -.El -.Sh SEE ALSO -.Xr taler-exchange-aggregator 1 , -.Xr taler-exchange-httpd 1 , -.Xr taler.conf 5 . -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . diff --git a/doc/taler.conf.5 b/doc/taler.conf.5 deleted file mode 100644 index 40e2d2d38..000000000 --- a/doc/taler.conf.5 +++ /dev/null @@ -1,248 +0,0 @@ -.\" -*- mode: nroff -*- -.Dd March 20, 2018 -.Dt TALER.CONF 5 -.Os -.Sh NAME -.Nm taler.conf -.Nd -Taler configuration file. -.Sh DESCRIPTION -The basic structure of the configuration file is the following. -The file is split into sections. -Every section begins with "[SECTIONNAME]" and contains a number of options of the form "OPTION=VALUE". -Empty lines and lines beginning with a "#" are treated as comments. -Files containing default values for many of the options described below are installed under $TALER\_PREFIX/share/taler/config.d/. -The configuration file given with -.Fl c -to Taler binaries overrides these defaults. -.Ss GLOBAL OPTIONS -The following options are from the "[taler]" section and used by virtually all Taler components. -.Bl -tag -width Ds -.It CURRENCY -Name of the currency, i.e. "EUR" for Euro. -.El -.Pp -The "[PATHS]" section is special in that it contains paths that can be referenced using "$" in other configuration values that specify filenames. -For Taler, it commonly contains the following paths: -.Bl -tag -width Ds -.It TALER_HOME -Home directory of the user, usually "${HOME}". -Can be overwritten by testcases by setting ${TALER_TEST_HOME}. -.It TALER_DATA_HOME -Where should Taler store its long-term data. Usually "${TALER_HOME}/.local/share/taler/" -.It TALER_CONFIG_HOME -Where is the Taler configuration kept. -Usually "${TALER_HOME}/.config/taler/" -.It TALER_CACHE_HOME -Where should Taler store cached data. -Usually "${TALER_HOME}/.cache/taler/" -.It TALER_RUNTIME_DIR -Where should Taler store system runtime data (like UNIX domain sockets). -Usually "${TMP}/taler-system-runtime". -.El -.Ss EXCHANGE OPTIONS -The following options are from the "[exchange]" section and used by most exchange tools. -.Bl -tag -width Ds -.It DB -Plugin to use for the database, i.e. "postgres" -.It PORT -Port on which the HTTP server listens, i.e. 8080. -.It MASTER_PUBLIC_KEY -Crockford Base32-encoded master public key, public version of the exchange\'s long\-time offline signing key. -.It MASTER_PRIV_FILE -Location of the master private key on disk. -Only used by tools that can be run offline (as the master key is for offline signing). -.It BASE_URL -Specifies the base URL under which the exchange can be reached. -Added to wire transfers to enable tracking by merchants. -.It SIGNKEY_DURATION -For how long is a signing key valid? -.It LEGAL_DURATION -For how long are signatures with signing keys legally valid? -.It LOOKAHEAD_SIGN -How long do we generate denomination and signing keys ahead of time? -.It LOOKAHEAD_PROVIDE -How long into the future do we provide signing and denomination keys to clients? -.El -.Ss EXCHANGE POSTGRES BACKEND DATABASE OPTIONS -The following options must be in section "[exchangedb\-postgres]" if the "postgres" plugin was selected for the database. -.Bl -tag -width Ds -.It CONFIG -How to access the database, i.e. "postgres:///taler" to use the "taler" database. -Testcases use "talercheck". -.El -.Ss MERCHANT OPTIONS -The following options are from the "[merchant]" section and used by the merchant backend. -.Bl -tag -width Ds -.It DB -Plugin to use for the database, i.e. "postgres" -.It PORT -Port on which the HTTP server listens, i.e. 8080. -.It WIRE_TRANSFER_DELAY -How quickly do we want the exchange to send us money? -Note that wire transfer fees will be higher if we ask for money to be wired often. -Given as a relative time, i.e. "5 s" -.It DEFAULT_MAX_WIRE_FEE -Maximum wire fee we are willing to accept from exchanges. -Given as a Taler amount, i.e. "EUR:0.1" -.It DEFAULT_MAX_DEPOSIT_FEE -Maximum deposit fee we are willing to cover. -Given as a Taler amount, i.e. "EUR:0.1" -.El -.Ss MERCHANT POSTGRES BACKEND DATABASE OPTIONS -The following options must be in section "[merchantdb\-postgres]" if the "postgres" plugin was selected for the database. -.Bl -tag -width Ds -.It CONFIG -How to access the database, i.e. "postgres:///taler" to use the "taler" database. -Testcases use "talercheck". -.El -.Ss MERCHANT INSTANCES -The merchant configuration must specify a set of instances, containing at least the "default" instance. -The following options must be given in each "[instance-NAME]" section. -.Bl -tag -width Ds -.It KEYFILE -Name of the file where the instance\'s private key is to be stored, i.e. "${TALER_CONFIG_HOME}/merchant/instance/name.priv" -.It NAME -Human-readable name of the instance, i.e. "Kudos Inc." -.El -Additionally, for instances that support tipping, the following options are required. -.Bl -tag -width Ds -.It TIP_EXCHANGE -Base-URL of the exchange that holds the reserve for tipping, i.e. "https://exchange.demo.taler.net/" -.It TIP_EXCHANGE_PRIV_FILENAME -Filename with the private key granting access to the reserve, i.e. "${TALER_CONFIG_HOME}/merchant/reserve/tip.priv" -.El -.Ss KNOWN EXCHANGES (for merchants and wallets) -The merchant configuration can include a list of known exchanges if the merchant wants to specify that certain exchanges are explicitly trusted. -For each trusted exchange, a section [exchange-NAME] must exist, where NAME is a merchant-given name for the exchange. -The following options must be given in each "[exchange-NAME]" section. -.Bl -tag -width Ds -.It BASE_URL -Base URL of the exchange, i.e. "https://exchange.demo.taler.net/" -.It MASTER_KEY -Crockford Base32 encoded master public key, public version of the exchange\'s long\-time offline signing key -.It CURRENCY -Name of the currency for which this exchange is trusted, i.e. "KUDOS" -.El -.Ss KNOWN AUDITORS (for merchants and wallets) -The merchant configuration can include a list of known exchanges if the merchant wants to specify that certain auditors are explicitly trusted. -For each trusted exchange, a section [auditor-NAME] must exist, where NAME is a merchant-given name for the exchange. -The following options must be given in each "[auditor-NAME]" section. -.Bl -tag -width Ds -.It BASE_URL -Base URL of the auditor, i.e. "https://auditor.demo.taler.net/" -.It AUDITOR_KEY -Crockford Base32 encoded auditor public key. -.It CURRENCY -Name of the currency for which this auditor is trusted, i.e. "KUDOS" -.El -.Ss ACCOUNT OPTIONS (for exchanges and merchants) -An exchange (or merchant) can have multiple bank accounts. -The following options are for sections named "[account-SOMETHING]". -The SOMETHING is arbitrary and should be chosen to uniquely identify the bank account for the operator. -Additional authentication options may need to be specified in the account section depending on the PLUGIN used. -.Bl -tag -width Ds -.It URL -Specifies the payto://-URL of the account. -The general format is payto://METHOD/DETAILS. -This option is used for exchanges and merchants. -.It WIRE_RESPONSE -Specifies the name of the file in which the /wire response for this account should be located. -Used by the Taler exchange service and the taler\-exchange\-wire tool and the taler\-merchant\-httpd (to generate the files). -.It PLUGIN -Name of the plugin can be used to access the account (i.e. "taler-bank" or "ebics"). -Used by the merchant backend for back office operations (i.e. to identify incoming wire transfers) and by the exchange. -.It ENABLE_DEBIT -Must be set to YES for the accounts that the taler\-exchange\-aggregator should debit. -Not used by merchants. -.It ENABLE_CREDIT -Must be set to YES for the accounts that the taler\-exchange\-wirewatch should check for credits. -It is yet uncertain if the merchant implementation may check this flag as well. -.It HONOR_instance -Must be set to YES for the instances (where "instance" is the section name of the instance) of the merchant backend that should allow incoming wire transfers for this bank account. -.It ACTIVE_instance -Must be set to YES for the instances (where "instance" is the section name of the instance) of the merchant backend that should use this bank account in new offers/contracts. -Setting ACTIVE_instance to YES requires also setting ENABLE_instance to YES. -.El -.Ss TALER-BANK AUTHENTICATION OPTIONS (for accounts) -The following authentication options are supported by the "taler-bank" wire plugin. -They must be specified in the "[account-]" section that uses the "taler-bank" plugin. -.Bl -tag -width Ds -.It TALER_BANK_AUTH_METHOD -Authentication method to use. -"none" or "basic" are currently supported. -.It USERNAME -Username to use for authentication. -Used with the "basic" authentication method. -.It PASSWORD -Password to use for authentication. -Used with the "basic" authentication method. -.Ss EBICS AUTHENTICATION OPTIONS -The following authentication options are supported by the "ebics" wire plugin. -They must be specified in the "[account-]" section that uses the "ebics" plugin. -.Bl -tag -width Ds -.It NONE -Currently the "ebics" implementation is incomplete and does not support authentication. -.El -.Ss EXCHANGE WIRE FEE OPTIONS -For each supported wire method (i.e. "x-taler-bank" or "sepa"), sections named "[fees-METHOD]" state the (aggregate) wire transfer fee and the reserve closing fees charged by the exchange. -Note that fees are specified using the name of the wire method, not by the plugin name. -You need to replace "YEAR" in the option name by the calendar year for which the fee should apply. -Usually, fees should be given for serveral years in advance. -.Bl -tag -width Ds -.It WIRE-FEE-YEAR -Aggregate wire transfer fee merchants are charged in YEAR. -Specified as a Taler amount using the usual amount syntax (CURRENCY:VALUE.FRACTION). -.It CLOSING-FEE-YEAR -Reserve closing fee customers are charged in YEAR. -Specified as a Taler amount using the usual amount syntax (CURRENCY:VALUE.FRACTION). -.El -.Ss EXCHANGE COIN OPTIONS -The following options must be in sections starting with "[coin_]" and are used by taler\-exchange\-keyup to create denomination keys. -.Bl -tag -width Ds -.It VALUE -Value of the coin, i.e. "EUR:1.50" for 1 Euro and 50 Cents (per coin). -.It DURATION_OVERLAP -How much should validity periods for these coins overlap? -.It DURATION_WITHDRAW -How long should the same key be used for clients to withdraw coins of this value? -.It DURATION_SPEND -How long do clients have to spend these coins? -.It FEE_WITHDRAW -What fee is charged for withdrawl? -.It FEE_DEPOSIT -What fee is charged for depositing? -.It FEE_REFRESH -What fee is charged for refreshing? -.It FEE_REFUND -What fee is charged for refunds? -When a coin is refunded, the deposit fee is returned. -Instead, the refund fee is charged to the customer. -.It RSA_KEYSIZE -What is the RSA keysize modulos (in bits)? -.El -.Ss AUDITOR OPTIONS -The following options must be in section "[auditor]" for the Taler auditor. -.Bl -tag -width Ds -.It DB -Plugin to use for the database, i.e. "postgres" -.It AUDITOR_PRIV_FILE -Name of the file containing the auditor's private key -.El -.Ss AUDITOR POSTGRES BACKEND DATABASE OPTIONS -The following options must be in section "[auditordb\-postgres]" if the "postgres" plugin was selected for the database. -.Bl -tag -width Ds -.It CONFIG -How to access the database, i.e. "postgres:///taler" to use the "taler" database. -Testcases use "talercheck". -.El -.Sh SEE ALSO -.Xr taler-exchange-dbinit 1 , -.Xr taler-exchange-httpd 1 , -.Xr taler-exchange-keyup 1 , -.Xr taler-exchange-wire 1 . -.Sh BUGS -Report bugs by using -.Lk https://gnunet.org/bugs/ -or by sending electronic mail to -.Aq Mt taler@gnu.org . -- cgit v1.2.3