From aa9233f81df5cd45ee0d69310e2d587517a2a46e Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 14 Dec 2020 01:57:12 -0500 Subject: move ‘.. _Using-taler_002dconfig-exchange:’ from frags/using-taler-config.rst to taler-exchange-manual.rst (its original location) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frags/using-taler-config.rst | 3 --- taler-exchange-manual.rst | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frags/using-taler-config.rst b/frags/using-taler-config.rst index d7c28b23..c15df84b 100644 --- a/frags/using-taler-config.rst +++ b/frags/using-taler-config.rst @@ -1,5 +1,3 @@ -.. _Using-taler_002dconfig-exchange: - Using taler-config ------------------ @@ -50,4 +48,3 @@ While the configuration file is typically located at ``$HOME/.config/taler.conf``, an alternative location can be specified to ``taler-merchant-httpd`` and ``taler-config`` using the ``-c`` option. - diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst index 468950b0..0aab7c02 100644 --- a/taler-exchange-manual.rst +++ b/taler-exchange-manual.rst @@ -301,6 +301,8 @@ of some of the options. .. include:: frags/configuration-format.rst +.. _Using-taler_002dconfig-exchange: + .. include:: frags/using-taler-config.rst -- cgit v1.2.3 From 22fce4576d972bbd091448092e19ea7bf259ae8e Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 14 Dec 2020 02:02:20 -0500 Subject: add Tips section to frags/README.md --- frags/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frags/README.md b/frags/README.md index 0fe7923f..5070c7f1 100644 --- a/frags/README.md +++ b/frags/README.md @@ -10,3 +10,9 @@ If the fragment includes header lines, you MUST include it at top-level Otherwise, it can be included at either top-level or indented. See . + +Tips: + +- Don't put index entries in frags/* files. + (They will result in a Sphinx warning.) + Instead, keep them in the *including* text. -- cgit v1.2.3 From ee3cb19a7dd3487e593ed3187eda75986c853964 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 14 Dec 2020 04:00:43 -0500 Subject: remove redundant mention of libsqlite3 --- taler-merchant-manual.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst index 9331c284..fda75bb8 100644 --- a/taler-merchant-manual.rst +++ b/taler-merchant-manual.rst @@ -297,8 +297,6 @@ backend: - libargon2 >= 20171227 (GNUnet 0.13 needs it to build, not actively used by GNU Taler) -- libsqlite3 >= 3.0 (GNUnet 0.13 needs it to build, not actively used by GNU Taler) - - libjansson >= 2.7 - Postgres >= 9.6, including libpq -- cgit v1.2.3 From a8c68cc744b0a59fcebdfff836368393c6fd0df4 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 14 Dec 2020 04:21:25 -0500 Subject: diction: s/make a loss/experience a financial loss/ (two instances) --- taler-auditor-manual.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taler-auditor-manual.rst b/taler-auditor-manual.rst index 34c21430..52959c89 100644 --- a/taler-auditor-manual.rst +++ b/taler-auditor-manual.rst @@ -523,11 +523,11 @@ several categories of failures of different severity: impact. - Inconsistencies in the data that show that the exchange - made an unexpected loss (such as accepting a coin for + experienced an unexpected financial loss (such as accepting a coin for deposit with an invalid signature). - Inconsistencies in the data that show that the exchange - caused some other party to make a loss (such as not wiring + caused some other party to experience a financial loss (such as not wiring the correct amount to a merchant). - Configuration issues (such was wire fees unavailable). -- cgit v1.2.3 From cf29c27e4b3155a41106316d91f5497a068b7856 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 14 Dec 2020 13:35:59 +0100 Subject: exclude README.md from sphinx build This file is always meant to be a README for the documentation writers, and not part of the documentation output. --- conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.py b/conf.py index c1de8edc..321a1c66 100644 --- a/conf.py +++ b/conf.py @@ -100,7 +100,7 @@ release = '0.8.0pre0' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build', '_exts', 'cf', 'prebuilt'] +exclude_patterns = ['_build', '_exts', 'cf', 'prebuilt', '**/README.md'] # The reST default role (used for this markup: `text`) to use for all # documents. -- cgit v1.2.3 From 1c03dae120dc47a3652b7d18a7d51511d2bf383e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 14 Dec 2020 14:01:47 +0100 Subject: guard against API change in new Sphinx version --- _exts/typescriptdomain.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/_exts/typescriptdomain.py b/_exts/typescriptdomain.py index 68777645..f9af1b01 100644 --- a/_exts/typescriptdomain.py +++ b/_exts/typescriptdomain.py @@ -405,6 +405,8 @@ class LinkingHtmlFormatter(HtmlFormatter): ): return value + if self._bridge.docname is None: + return value if xref is None: return value content = caption if caption is not None else value @@ -509,10 +511,11 @@ class MyPygmentsBridge(PygmentsBridge): def highlight_block( self, source, lang, opts=None, force=False, location=None, **kwargs ): - docname, line = location - self.line = line - self.path = self.builder.env.doc2path(docname) - self.docname = docname + if isinstance(location, tuple): + docname, line = location + self.line = line + self.path = self.builder.env.doc2path(docname) + self.docname = docname return super().highlight_block(source, lang, opts, force, location, **kwargs) -- cgit v1.2.3 From 51a5a7f9f82eae45a7a362118239f18bb0ce4f4e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 14 Dec 2020 14:13:14 +0100 Subject: re-enable highlightling for newer Sphinx --- _exts/typescriptdomain.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_exts/typescriptdomain.py b/_exts/typescriptdomain.py index f9af1b01..0f08fffe 100644 --- a/_exts/typescriptdomain.py +++ b/_exts/typescriptdomain.py @@ -8,6 +8,8 @@ TypeScript domain. import re +from pathlib import Path + from docutils import nodes from typing import List, Optional, Iterable, Dict, Tuple from typing import cast @@ -516,6 +518,10 @@ class MyPygmentsBridge(PygmentsBridge): self.line = line self.path = self.builder.env.doc2path(docname) self.docname = docname + elif isinstance(location, Element): + self.line = location.line + self.path = location.source + self.docname = Path(location.source).stem return super().highlight_block(source, lang, opts, force, location, **kwargs) -- cgit v1.2.3 From 23405a23bd2771cb4c1c22f942a974e836531f77 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 14 Dec 2020 14:21:13 +0100 Subject: address lexer API warning --- _exts/typescriptdomain.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/_exts/typescriptdomain.py b/_exts/typescriptdomain.py index 0f08fffe..83ab26c6 100644 --- a/_exts/typescriptdomain.py +++ b/_exts/typescriptdomain.py @@ -576,8 +576,12 @@ literal_reg = re.compile(r"``([^`]+)``") def setup(app): - lexer = BetterTypeScriptLexer() - lexer.add_filter(LinkFilter(app)) - app.add_lexer("tsref", lexer) + + class TsrefLexer(BetterTypeScriptLexer): + def __init__(self, **options): + super().__init__(**options) + self.add_filter(LinkFilter(app)) + + app.add_lexer("tsref", TsrefLexer) app.add_domain(TypeScriptDomain) app.add_builder(MyHtmlBuilder) -- cgit v1.2.3